From c2ec66c87e1cc650b0ae5f776173d1795cf1a558 Mon Sep 17 00:00:00 2001 From: Ernesto Rico-Schmidt Date: Sat, 2 Apr 2011 16:25:18 +0200 Subject: cleaned-up templates. diff --git a/templates/program/current_box.html b/templates/program/current_box.html index d778518..fd9cb69 100644 --- a/templates/program/current_box.html +++ b/templates/program/current_box.html @@ -15,7 +15,9 @@ {% if current.note %}
{{ current.note.title }}
{% else %} -
{{ current.show.short_description }}
+ {% if current.show.short_description != 'FIMXE' %} +
{{ current.show.short_description }}
+ {% endif %} {% endif %} diff --git a/templates/program/day_schedule.html b/templates/program/day_schedule.html index 6230314..3e7d4bc 100644 --- a/templates/program/day_schedule.html +++ b/templates/program/day_schedule.html @@ -42,7 +42,9 @@ {% if timeslot.note %}
Heute: {{ timeslot.note.title }}
{% else %} + {% if timeslot.show.short_description != 'FIXME' %}
{{ timeslot.show.short_description }}
+ {% endif %} {% endif %} diff --git a/templates/program/host_detail.html b/templates/program/host_detail.html index b780838..eff52d6 100644 --- a/templates/program/host_detail.html +++ b/templates/program/host_detail.html @@ -1,18 +1,27 @@ Host detail: {{ host.name }} +
{{ host.name }}
+
+
Sendungen
+ + {% for show in host.shows.all %} +
{{ show }}
+ {% endfor %} +
+ {% if host.email %} -
{{ host.email }}
+
E-Mail Adresse: {{ host.email }}
{% endif %} {% if host.website %} -
{{ host.website }}
+ {% endif %}
diff --git a/templates/program/host_list.html b/templates/program/host_list.html index 365154a..6497d35 100644 --- a/templates/program/host_list.html +++ b/templates/program/host_list.html @@ -1,6 +1,7 @@ Host list + diff --git a/templates/program/recommendations.html b/templates/program/recommendations.html index aa5866a..a8f5fde 100644 --- a/templates/program/recommendations.html +++ b/templates/program/recommendations.html @@ -1,18 +1,20 @@ Recomendations +
-{% for note in recommendations %} -
-
{{ note.show.broadcastformat }}
-
{{ note.timeslot.start }}
-
{{ note.show.name }}
-
{{ note.show.short_description }}
-
{{ note.title }}
-
{{ note.content }}
+{% for recommendation in recommendations %} +
+
{{ recommendation.timeslot.start|date:"d.m.Y H:i" }} - {{ recommendation.timeslot.end|date:"H:i" }}
+
{{ recommendation.show.name }}
+ {% if recommendation.show.short_description != 'FIXME' %} +
{{ recommendation.show.short_description }}
+ {% endif %} +
{{ recommendation.title }}
+
{{ recommendation.content|safe}}
{% endfor %}
diff --git a/templates/program/recommendations_box.html b/templates/program/recommendations_box.html index 94a55dd..b40bf0e 100644 --- a/templates/program/recommendations_box.html +++ b/templates/program/recommendations_box.html @@ -5,7 +5,7 @@ -
+
Programmhinweise
{% for recommendation in recommendations %}
diff --git a/templates/program/show_detail.html b/templates/program/show_detail.html index 05e678c..9cd2d8e 100644 --- a/templates/program/show_detail.html +++ b/templates/program/show_detail.html @@ -39,9 +39,11 @@ {% endfor %}
+ {% if show.short_description != 'FIXME' %}
{{ show.short_description }}
+ {% endif %} -
{{ show.description }}
+
{{ show.description|safe }}
{% if show.email %} diff --git a/templates/program/show_list.html b/templates/program/show_list.html index 7643087..1f061d0 100644 --- a/templates/program/show_list.html +++ b/templates/program/show_list.html @@ -1,72 +1,87 @@ Show list + -
-{% for topic in showtopics %} -
- {{ topic.abbrev }} - {{ topic }} +
+
Filter
+ +
+
Thema/Schwerpunkt
+ {% for topic in showtopics %} +
+ {{ topic.abbrev }} + {{ topic }} +
+ {% endfor %}
-{% endfor %} -
-
-{% for information in showinformations %} -
- {{ information.abbrev }} - {{ information }} +
+
+ {% for information in showinformations %} +
+ {{ information.abbrev }} + {{ information }} +
+ {% endfor %}
-{% endfor %} -
-
-{% for focus in musicfoci %} -
- {{ focus.abbrev }} - {{ focus }} +
+
Musiktendenz
+ {% for focus in musicfoci %} +
+ {{ focus.abbrev }} + {{ focus }} +
+ {% endfor %}
-{% endfor %}
-
+
{% for show in shows %}
-
- {% for topic in show.showtopic.all %} +
  + {% for topic in show.showtopic.all %} {{ topic.abbrev }} - {% endfor %} + {% endfor %} - {% for information in show.showinformation.all %} + {% for information in show.showinformation.all %} {{ information.abbrev }} - {% endfor %} + {% endfor %} - {% for focus in show.musicfocus.all %} + {% for focus in show.musicfocus.all %} {{ focus.abbrev }} - {% endfor %} + {% endfor %} {{ show.broadcastformat.abbrev }}
-
{{ show.name }}
+
+
{{ show.name }}
-
- {% for slot in show.programslots.all %} -
{{ slot }}
- {% endfor %} -
+
+ {% for slot in show.programslots.all %} +
{{ slot }}
+ {% endfor %} +
-
{{ show.short_description }}
+ {% if show.short_description != 'FIXME' %} +
{{ show.short_description }}
+ {% endif %} +
{% endfor %}
-
-{% for format in broadcastformats %} -
{{ format }}
-{% endfor %} +
+
Legende
+ {% for broadcastformat in broadcastformats %} +
+ {{ broadcastformat.format }} +
+ {% endfor %}
diff --git a/templates/program/timeslot_detail.html b/templates/program/timeslot_detail.html index f445f5d..f8dee29 100644 --- a/templates/program/timeslot_detail.html +++ b/templates/program/timeslot_detail.html @@ -1,13 +1,12 @@ Timeslot detail: {{ timeslot }} + -
-
-
{{ timeslot.show.name }}
+
{{ timeslot.show.name }}
{% for topic in timeslot.show.showtopic.all %} @@ -35,19 +34,21 @@
{% for host in timeslot.show.hosts.all %} -
{{ host }}
+
{{ host }}
{% endfor %}
+ {% if timeslot.show.short_description != 'FIXME' %}
{{ timeslot.show.short_description }}
+ {% endif %} -
{{ timeslot.show.description }}
+
{{ timeslot.show.description|safe }}
{% if timeslot.note %}
{{ timeslot.note.title }}
-
{{ timeslot.note.content }}
+
{{ timeslot.note.content|safe }}
{% endif %}
diff --git a/templates/program/week_schedule.html b/templates/program/week_schedule.html index 2969d28..f6e8f57 100644 --- a/templates/program/week_schedule.html +++ b/templates/program/week_schedule.html @@ -1,38 +1,12 @@ Week schedule +
-
-
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
-
-
{{ monday|date:"l d.m.Y" }}
{% for timeslot in monday_timeslots %} -- cgit v0.10.2