diff options
| author | Johannes Raggam <raggam-nl@adm.at> | 2011-06-27 17:56:18 (GMT) |
|---|---|---|
| committer | Johannes Raggam <raggam-nl@adm.at> | 2011-06-27 17:56:18 (GMT) |
| commit | bbf4db68ee298868674e538f53998e3417514036 (patch) | |
| tree | a0673951ce20a8576b7b1606c5e8fbf548452d14 /templates | |
| parent | ae5a132ce233ac3f5845db3daf94f09656d45954 (diff) | |
week schedule layout optimization
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/program/week_schedule.html | 37 | ||||
| -rw-r--r-- | templates/program/week_schedule_timeslot.html | 16 |
2 files changed, 45 insertions, 8 deletions
diff --git a/templates/program/week_schedule.html b/templates/program/week_schedule.html index 238b191..dcecac7 100644 --- a/templates/program/week_schedule.html +++ b/templates/program/week_schedule.html @@ -6,8 +6,8 @@ <body> <div id="content-main" class="week-schedule"> - <div id="weekday-starts"> - <div style="height: 47px;"> </div> + <div class="weekday-starts"> + <div style="height: 43px;"> </div> <div style="height: 61px;">06:00</div> <div style="height: 61px;">07:00</div> <div style="height: 61px;">08:00</div> @@ -33,7 +33,7 @@ <div style="height: 61px;">04:00</div> <div style="height: 61px;">05:00</div> </div> - <div id="monday" class="weekday"> + <div id="monday" class="weekday weekday-first"> <h2>{{ monday|date:"l d.m.Y" }}</h2> {% for timeslot in monday_timeslots %} {% include "program/week_schedule_timeslot.html" %} @@ -75,12 +75,41 @@ {% endfor %} </div> - <div id="sunday" class="weekday"> + <div id="sunday" class="weekday weekday-last"> <h2>{{ sunday|date:"l d.m.Y" }}</h2> {% for timeslot in sunday_timeslots %} {% include "program/week_schedule_timeslot.html" %} {% endfor %} </div> + + <div class="weekday-starts"> + <div style="height: 43px;"> </div> + <div style="height: 61px;">06:00</div> + <div style="height: 61px;">07:00</div> + <div style="height: 61px;">08:00</div> + <div style="height: 61px;">09:00</div> + <div style="height: 61px;">10:00</div> + <div style="height: 61px;">11:00</div> + <div style="height: 61px;">12:00</div> + <div style="height: 61px;">13:00</div> + <div style="height: 61px;">14:00</div> + <div style="height: 61px;">15:00</div> + <div style="height: 61px;">16:00</div> + <div style="height: 61px;">17:00</div> + <div style="height: 61px;">18:00</div> + <div style="height: 61px;">19:00</div> + <div style="height: 61px;">20:00</div> + <div style="height: 61px;">21:00</div> + <div style="height: 61px;">22:00</div> + <div style="height: 61px;">23:00</div> + <div style="height: 61px;">00:00</div> + <div style="height: 61px;">01:00</div> + <div style="height: 61px;">02:00</div> + <div style="height: 61px;">03:00</div> + <div style="height: 61px;">04:00</div> + <div style="height: 61px;">05:00</div> + </div> + </div> </body> diff --git a/templates/program/week_schedule_timeslot.html b/templates/program/week_schedule_timeslot.html index 7b0f800..a2c452e 100644 --- a/templates/program/week_schedule_timeslot.html +++ b/templates/program/week_schedule_timeslot.html @@ -2,20 +2,28 @@ {% if forloop.first and timeslot.start != timeslot.get_previous_by_start.end %} <div class="timeslot bf-{{ default_show.broadcastformat.slug }}" {% duration_until timeslot.start %}> -{{ default_show.name }} + <div> + {{ default_show.name }} + </div> </div> {% endif %} <div class="timeslot bf-{{ timeslot.show.broadcastformat.slug }}" {% duration timeslot.start timeslot.end %}> - <a href="{% url timeslot-detail timeslot.id %}">{{ timeslot.show.name }}</a> + <div> + <a href="{% url timeslot-detail timeslot.id %}">{{ timeslot.show.name }}</a> + </div> </div> {% if timeslot.end != timeslot.get_next_by_start.start %} {% if not forloop.last %} <div class="timeslot bf-{{ default_show.broadcastformat.slug }}" {% duration timeslot.end timeslot.get_next_by_start.start %}> -{{ default_show.name }} + <div> + {{ default_show.name }} + </div> </div> {% else %} <div class="timeslot bf-{{ default_show.broadcastformat.slug }}" {% duration_since timeslot.end %}> -{{ default_show.name }} + <div> + {{ default_show.name }} + </div> </div> {% endif %} {% endif %} |