From aa9fda01e894ccef8fcb2e0967aa175362607387 Mon Sep 17 00:00:00 2001 From: Johannes Raggam Date: Thu, 14 Apr 2011 16:54:42 +0200 Subject: show detail diff --git a/templates/program/show_detail.html b/templates/program/show_detail.html index 7614496..60a109b 100644 --- a/templates/program/show_detail.html +++ b/templates/program/show_detail.html @@ -8,55 +8,50 @@
-

{{ show.name }}

+
+

{{ show.name }}

+

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

+ +
+ {% for item in show.showinformation.all %} + {{ item.abbrev }} + {% endfor %} + {% for item in show.showtopic.all %} + {{ item.abbrev }} + {% endfor %} + {% for item in show.musicfocus.all %} + {{ item.abbrev }} + {% endfor %} +
+ +

{{ show.broadcastformat.format }}

+
{% if show.short_description != 'FIXME' %}
{{ show.short_description }}
{% endif %} -
- {% 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 }} -
- -
- {% for slot in show.programslots.all %} -
{{ slot }}
- {% endfor %} -
- -
{{ show.broadcastformat.format }}
- -
- {% for host in show.hosts.all %} -
{{ host }}
- {% endfor %} -
-
{{ show.description|safe }}
- {% if show.email %} - - {% endif %} +

+ {% for host in show.hosts.all %} + {{ host }}
+ {% endfor %} + {% if show.email %} + Email: {{ show.email }}
+ {% endif %} + {% if show.website %} + Website: {{ show.website }}
+ {% endif %} + {% if show.cba_series_id %} + CBA-Link: CBA
+ {% endif %} +

- {% if show.website %} - - {% endif %} - - {% if show.cba_series_id %} - - {% endif %}
diff --git a/templates/program/timeslot_detail.html b/templates/program/timeslot_detail.html index 04d56c2..55819c8 100644 --- a/templates/program/timeslot_detail.html +++ b/templates/program/timeslot_detail.html @@ -6,52 +6,52 @@
-

{{ timeslot.show.name }}

+ +
+

{{ timeslot.show.name }}

+ +
+ {% for item in timeslot.show.showinformation.all %} + {{ item.abbrev }} + {% endfor %} + {% for item in timeslot.show.showtopic.all %} + {{ item.abbrev }} + {% endfor %} + {% for item in timeslot.show.musicfocus.all %} + {{ item.abbrev }} + {% endfor %} +
+ +

{{ timeslot.show.broadcastformat.format }}

+
+ + {% if timeslot.note %} +

{{ timeslot.note.title }}

+

{{ timeslot.note.content|safe }}

+ {% endif %} {% if timeslot.show.short_description != 'FIXME' %}
{{ timeslot.show.short_description }}
{% endif %} -
- {% for topic in timeslot.show.showtopic.all %} - {{ topic.abbrev }} - {% endfor %} - - {% for information in timeslot.show.showinformation.all %} - {{ information.abbrev }} - {% endfor %} - - {% for focus in timeslot.show.musicfocus.all %} - {{ focus.abbrev }} - {% endfor %} - - {{ timeslot.show.broadcastformat.abbrev }} -
- -
- {% for slot in timeslot.show.programslots.all %} -
{{ slot }}
- {% endfor %} -
+
{{ timeslot.show.description|safe }}
-
{{ timeslot.show.broadcastformat.format }}
+

+ {% for host in timeslot.show.hosts.all %} + {{ host }}
+ {% endfor %} + {% if timeslot.show.email %} + Email: {{ timeslot.show.email }}
+ {% endif %} + {% if timeslot.show.website %} + Website: {{ timeslot.show.website }}
+ {% endif %} + {% if timeslot.show.cba_series_id %} + CBA-Link: CBA
+ {% endif %} +

-
- {% for host in timeslot.show.hosts.all %} -
{{ host }}
- {% endfor %} -
-
{{ timeslot.show.description|safe }}
- -
- {% if timeslot.note %} -
-
{{ timeslot.note.title }}
-
{{ timeslot.note.content|safe }}
-
- {% endif %} -
-- cgit v0.10.2