From bbf4db68ee298868674e538f53998e3417514036 Mon Sep 17 00:00:00 2001 From: Johannes Raggam Date: Mon, 27 Jun 2011 19:56:18 +0200 Subject: week schedule layout optimization 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 @@
-
-
 
+
+
 
06:00
07:00
08:00
@@ -33,7 +33,7 @@
04:00
05:00
-
+

{{ monday|date:"l d.m.Y" }}

{% for timeslot in monday_timeslots %} {% include "program/week_schedule_timeslot.html" %} @@ -75,12 +75,41 @@ {% endfor %}
-
+

{{ sunday|date:"l d.m.Y" }}

{% for timeslot in sunday_timeslots %} {% include "program/week_schedule_timeslot.html" %} {% endfor %}
+ +
+
 
+
06:00
+
07:00
+
08:00
+
09:00
+
10:00
+
11:00
+
12:00
+
13:00
+
14:00
+
15:00
+
16:00
+
17:00
+
18:00
+
19:00
+
20:00
+
21:00
+
22:00
+
23:00
+
00:00
+
01:00
+
02:00
+
03:00
+
04:00
+
05:00
+
+
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 %}
-{{ default_show.name }} +
+ {{ default_show.name }} +
{% endif %}
- {{ timeslot.show.name }} +
{% if timeslot.end != timeslot.get_next_by_start.start %} {% if not forloop.last %}
-{{ default_show.name }} +
+ {{ default_show.name }} +
{% else %}
-{{ default_show.name }} +
+ {{ default_show.name }} +
{% endif %} {% endif %} -- cgit v0.10.2