From 41eca6ea975d8092ad9efea8b15a054086a0c4bc Mon Sep 17 00:00:00 2001 From: Johannes Raggam Date: Thu, 14 Apr 2011 14:26:13 +0200 Subject: aligning show_list with day_schedule diff --git a/templates/program/day_schedule.html b/templates/program/day_schedule.html index 72c9560..88f743e 100644 --- a/templates/program/day_schedule.html +++ b/templates/program/day_schedule.html @@ -3,7 +3,6 @@ Day schedule: {{ day|date:"l, d.m.Y" }} -
@@ -40,7 +39,7 @@ {{ musicfocus.abbrev }} {% endfor %} -
+

{{ timeslot.show.name }}

{% if timeslot.note %}

Heute: {{ timeslot.note.title }}

diff --git a/templates/program/show_list.html b/templates/program/show_list.html index 6fe6525..2b0cb9c 100644 --- a/templates/program/show_list.html +++ b/templates/program/show_list.html @@ -19,39 +19,37 @@
-{% for show in show_list %} -
-
  - {% for topic in show.showtopic.all %} - {{ topic.abbrev }} - {% endfor %} - - {% for information in show.showinformation.all %} - {{ information.abbrev }} - {% endfor %} - - {% for focus in show.musicfocus.all %} - {{ focus.abbrev }} - {% endfor %} - - {{ show.broadcastformat.abbrev }} +

Sendungen

+ +
+ {% for show in show_list %} +
+
+ {% for showinformation in show.showinformation.all %} + {{ showinformation.abbrev }} + {% endfor %} + {% for showtopic in show.showtopic.all %} + {{ showtopic.abbrev }} + {% endfor %} + {% for musicfocus in show.musicfocus.all %} + {{ musicfocus.abbrev }} + {% endfor %}
- -
-
{{ show.name }}
- -
+
+

{{ show.name }}

+
{% for slot in show.programslots.all %} -
{{ slot }}
+

{{ slot }}

{% endfor %}
- {% if show.short_description != 'FIXME' %} -
{{ show.short_description }}
+

{{ show.short_description }}

{% endif %}
-{% endfor %} + {% endfor %} +
+
-- cgit v0.10.2