From c547dce30366b3a6097008086cbc0b917c6a2f85 Mon Sep 17 00:00:00 2001
From: Ernesto Rico-Schmidt <e.rico.schmidt@gmail.com>
Date: Wed, 6 Jan 2016 20:03:56 +0100
Subject: formated templates and updated templatetags
diff --git a/program/templates/boxes/broadcastformat.html b/program/templates/boxes/broadcastformat.html
index 76ee382..c12e635 100644
--- a/program/templates/boxes/broadcastformat.html
+++ b/program/templates/boxes/broadcastformat.html
@@ -1,10 +1,11 @@
{% if broadcastformats %}
-<dl id="broadcastformat" class="portlet">
- <dt class="portletHeader"><span>Legende<span></dt>
- {% for broadcastformat in broadcastformats %}
- <dd class="portletItem bcformat bf-{{ broadcastformat.slug }}">
- <a title="Sendungen mit dem Sendungsformat {{broadcastformat.format}} anzeigen." href="?broadcastformat={{ broadcastformat.slug }}">{{ broadcastformat.format }}</a>
- </dd>
- {% endfor %}
-</dl>
+ <dl id="broadcastformat" class="portlet">
+ <dt class="portletHeader"><span>Legende</span></dt>
+ {% for bf in broadcastformat_list %}
+ <dd class="portletItem bcformat bf-{{ bf.slug }}">
+ <a title="Sendungen mit dem Sendungsformat {{ bf.format }} anzeigen."
+ href="?broadcastformat={{ bf.slug }}">{{ bf.format }}</a>
+ </dd>
+ {% endfor %}
+ </dl>
{% endif %}
diff --git a/program/templates/boxes/current.html b/program/templates/boxes/current.html
index ba1df21..4f81906 100644
--- a/program/templates/boxes/current.html
+++ b/program/templates/boxes/current.html
@@ -1,60 +1,65 @@
<!doctype html>
<html>
<head>
- <meta charset="utf-8"/>
- <title>Current program box</title>
+ <meta charset="utf-8"/>
+ <title>Current program box</title>
</head>
<body>
-
- {% if previous or current or next or after_next %}
- <dl id="program-current-box" class="portlet program-box">
- <dt class="portletHeader">Programm derzeit</dt>
- <dd class="portletItem">
- <table>
- <tr class="previous">
- <td class="start">{{ previous.start|date:"H:i" }}</td>
- <td class="format bf-{{ previous.show.broadcastformat.slug }}"
- title="{{ previous.show.broadcastformat.format }}"> </td>
- <td class="show">
- <h3><a href="{% url timeslot-detail previous.id %}">{{ previous.show.name }}</a></h3>
- </td>
- <td class="show"></td>
- </tr>
- <tr class="current">
- <td class="start">{{ current.start|date:"H:i" }}</td>
- <td class="format bf-{{ current.show.broadcastformat.slug }}"
- title="{{ current.show.broadcastformat.format }}">▶</td>
- <td class="show">
- <h3><a href="{% url timeslot-detail current.id %}">{{ current.show.name }}</a></h3>
- {% if current.note %}
- <p>{{ current.note.title }}</p>
- {% else %}
- <p>{{ current.show.short_description }}</p>
- {% endif %}
- </td>
- </tr>
- <tr class="next">
- <td class="start">{{ next.start|date:"H:i" }}</td>
- <td class="format bf-{{ next.show.broadcastformat.slug }}"
- title="{{ next.show.broadcastformat.format }}"> </td>
- <td class="show">
- <h3><a href="{% url timeslot-detail next.id %}">{{ next.show.name }}</a></h3>
- </td>
- <td class="show"></td>
- </tr>
- <tr class="after_next">
- <td class="start">{{ after_next.start|date:"H:i" }}</td>
- <td class="format bf-{{ after_next.show.broadcastformat.slug }}"
- title="{{ after_next.show.broadcastformat.format }}"> </td>
- <td class="show">
- <h3><a href="{% url timeslot-detail after_next.id %}">{{ after_next.show.name }}</a></h3>
- </td>
- <td class="show"></td>
- </tr>
- </table>
- </dd>
- </dl>
- {% endif %}
-
+{% if previous_timeslot or current_timeslot or next_timeslot or after_next_timeslot %}
+ <dl id="program-current-box" class="portlet program-box">
+ <dt class="portletHeader">Programm derzeit</dt>
+ <dd class="portletItem">
+ <table>
+ <tr class="previous">
+ <td class="start">{{ previous_timeslot.start|date:"H:i" }}</td>
+ <td class="format bf-{{ previous_timeslot.show.broadcastformat.slug }}"
+ title="{{ previoustimeslot.show.broadcastformat.format }}"> </td>
+ <td class="show">
+ <h3>
+ <a href="{% url "timeslot-detail" previuos_timeslot.id %}">{{ previous_timeslot.show.name }}</a>
+ </h3>
+ </td>
+ <td class="show"></td>
+ </tr>
+ <tr class="current">
+ <td class="start">{{ current_timeslot.start|date:"H:i" }}</td>
+ <td class="format bf-{{ current_timeslot.show.broadcastformat.slug }}"
+ title="{{ current_timeslot.show.broadcastformat.format }}">▶</td>
+ <td class="show">
+ <h3>
+ <a href="{% url "timeslot-detail" current_timeslot.id %}">{{ current_timeslot.show.name }}</a>
+ </h3>
+ {% if current_timeslot.note %}
+ <p>{{ current_timeslot.note.title }}</p>
+ {% else %}
+ <p>{{ current_timeslot.show.short_description }}</p>
+ {% endif %}
+ </td>
+ </tr>
+ <tr class="next">
+ <td class="start">{{ next_timeslot.start|date:"H:i" }}</td>
+ <td class="format bf-{{ next_timeslot.show.broadcastformat.slug }}"
+ title="{{ next_timeslot.show.broadcastformat.format }}"> </td>
+ <td class="show">
+ <h3><a href="{% url "timeslot-detail" next_timeslot.id %}">{{ next_timeslot.show.name }}</a>
+ </h3>
+ </td>
+ <td class="show"></td>
+ </tr>
+ <tr class="after_next">
+ <td class="start">{{ after_next_timeslot.start|date:"H:i" }}</td>
+ <td class="format bf-{{ after_next_timeslot.show.broadcastformat.slug }}"
+ title="{{ after_next_timeslot.show.broadcastformat.format }}"> </td>
+ <td class="show">
+ <h3>
+ <a href="{% url "timeslot-detail" after_next_timeslot.id %}">{{ after_next_timeslot.show.name }}</a>
+ </h3>
+ </td>
+ <td class="show"></td>
+ </tr>
+ </table>
+ </dd>
+ </dl>
+{% endif %}
</body>
</html>
diff --git a/program/templates/boxes/musicfocus.html b/program/templates/boxes/musicfocus.html
index 01fffae..292cea0 100644
--- a/program/templates/boxes/musicfocus.html
+++ b/program/templates/boxes/musicfocus.html
@@ -1,14 +1,15 @@
{% if musicfoci %}
-<dl id="filterbox_musicfocus" class="portlet filterbox">
- <dt class="portletHeader"><span>Musiktendenz<span></dt>
- <dd class="portletItem">
- <ul>
- {% for item in musicfoci %}
- <li>
- <a title="Sendungen mit der Musiktendenz {{item.focus}} anzeigen." class="abbrev mf-{{ item.abbrev }}" href="?musicfocus={{ item.slug }}">{{ item }}</a>
- </li>
- {% endfor %}
- </ul>
- </dd>
-</dl>
+ <dl id="filterbox_musicfocus" class="portlet filterbox">
+ <dt class="portletHeader"><span>Musiktendenz<span></dt>
+ <dd class="portletItem">
+ <ul>
+ {% for mf in musicfocus_list %}
+ <li>
+ <a title="Sendungen mit der Musiktendenz {{ mf.focus }} anzeigen."
+ class="abbrev mf-{{ mf.abbrev }}" href="?musicfocus={{ mf.slug }}">{{ mf.focus }}</a>
+ </li>
+ {% endfor %}
+ </ul>
+ </dd>
+ </dl>
{% endif %}
diff --git a/program/templates/boxes/recommendation.html b/program/templates/boxes/recommendation.html
index d2bb7d2..3f4429e 100644
--- a/program/templates/boxes/recommendation.html
+++ b/program/templates/boxes/recommendation.html
@@ -1,40 +1,39 @@
<!doctype html>
<html>
<head>
- <meta charset="utf-8"/>
- <title>Recomendations box</title>
+ <meta charset="utf-8"/>
+ <title>Recomendations box</title>
</head>
<body>
- {% if recommendation_list %}
- <dl id="recommendations" class="portlet program-box">
- <dt class="portletHeader">Programmhinweise</dt>
- <dd class="portletItem">
- <table>
- {% for item in recommendation_list %}
- <tr>
- <td class="start"> </td>
- <td class="format bf-{{ item.show.broadcastformat.slug }}"
- title="{{ item.show.broadcastformat.format }}"> </td>
- <td class="show">
- {{ item.start|date:"d.m. H:i" }} -
- {{ item.end|date:"H:i" }}<br />
- <h3>
- <a href="{% url "timeslot-detail" item.id %}">{{ item.show.name }}</a>
- </h3>
- <p class="note-title">
- {% if item.note %}
- {{ item.note.title }}<br />
- {% else %}
- {{ item.show.broadcastformat.format }}<br />
- {% endif %}
- <a href="{% url "timeslot-detail" item.id %}">[weiter]</a>
- </p>
- </td>
- </tr>
- {% endfor %}
- </table>
- </dd>
- </dl>
- {% endif %}
+{% if recommendation_list %}
+ <dl id="recommendations" class="portlet program-box">
+ <dt class="portletHeader">Programmhinweise</dt>
+ <dd class="portletItem">
+ <table>
+ {% for recommendation in recommendation_list %}
+ <tr>
+ <td class="start"> </td>
+ <td class="format bf-{{ recommendation.show.broadcastformat.slug }}"
+ title="{{ recommendation.show.broadcastformat.format }}"> </td>
+ <td class="show">
+ {{ recommendation.start|date:"d.m. H:i" }} - {{ recommendation.end|date:"H:i" }}<br/>
+ <h3>
+ <a href="{% url "timeslot-detail" recommendation.id %}">{{ recommendation.show.name }}</a>
+ </h3>
+ <p class="note-title">
+ {% if recommendation.note %}
+ {{ recommendation.note.title }}<br/>
+ {% else %}
+ {{ recommendation.show.broadcastformat.format }}<br/>
+ {% endif %}
+ <a href="{% url "timeslot-detail" recommendation.id %}">[weiter]</a>
+ </p>
+ </td>
+ </tr>
+ {% endfor %}
+ </table>
+ </dd>
+ </dl>
+{% endif %}
</body>
</html>
diff --git a/program/templates/boxes/showinformation.html b/program/templates/boxes/showinformation.html
index ac4dc2c..52c40e0 100644
--- a/program/templates/boxes/showinformation.html
+++ b/program/templates/boxes/showinformation.html
@@ -1,14 +1,16 @@
{% if showinformations %}
-<dl id="filterbox_showinformation" class="portlet filterbox">
- <dt class="portletHeader"><span>Sendungsinfo<span></dt>
- <dd class="portletItem">
- <ul>
- {% for item in showinformations %}
- <li>
- <a title="Sendungen mit der Information {{item.information}} anzeigen." class="abbrev si-{{ item.abbrev }}" href="?showinformation={{ item.slug }}">{{ item }}</a>
- </li>
- {% endfor %}
- </ul>
- </dd>
-</dl>
+ <dl id="filterbox_showinformation" class="portlet filterbox">
+ <dt class="portletHeader"><span>Sendungsinfo<span></dt>
+ <dd class="portletItem">
+ <ul>
+ {% for si in showinformation_list %}
+ <li>
+ <a title="Sendungen mit der Information {{ si.information }} anzeigen."
+ class="abbrev si-{{ si.abbrev }}"
+ href="?showinformation={{ si.slug }}">{{ si.information }}</a>
+ </li>
+ {% endfor %}
+ </ul>
+ </dd>
+ </dl>
{% endif %}
diff --git a/program/templates/boxes/showtopic.html b/program/templates/boxes/showtopic.html
index 3a1938d..8561343 100644
--- a/program/templates/boxes/showtopic.html
+++ b/program/templates/boxes/showtopic.html
@@ -1,14 +1,16 @@
{% if showtopics %}
-<dl id="filterbox_showtopic" class="portlet filterbox">
- <dt class="portletHeader"><span>Thema / Schwerpunkt<span></dt>
- <dd class="portletItem">
- <ul>
- {% for item in showtopics %}
- <li>
- <a title="Sendungen mit dem Schwerpunkt {{item.topic}} anzeigen." class="abbrev st-{{ item.abbrev }}" href="?showtopic={{ item.slug }}">{{ item }}</a>
- </li>
- {% endfor %}
- </ul>
- </dd>
-</dl>
+ <dl id="filterbox_showtopic" class="portlet filterbox">
+ <dt class="portletHeader"><span>Thema / Schwerpunkt<span></dt>
+ <dd class="portletItem">
+ <ul>
+ {% for showtopic in showtopic_list %}
+ <li>
+ <a title="Sendungen mit dem Schwerpunkt {{ showtopic.topic }} anzeigen."
+ class="abbrev st-{{ showtopic.abbrev }}"
+ href="?showtopic={{ showtopic.slug }}">{{ showtopic.topic }}</a>
+ </li>
+ {% endfor %}
+ </ul>
+ </dd>
+ </dl>
{% endif %}
diff --git a/program/templates/day_schedule.html b/program/templates/day_schedule.html
index f338940..7a371e6 100644
--- a/program/templates/day_schedule.html
+++ b/program/templates/day_schedule.html
@@ -1,43 +1,42 @@
<html>
<head>
- <title>Tagesansicht {{ day|date:"l, d.m.Y" }} — Radio Helsinki - Freies Radio Graz</title>
- <link type="text/css" href="/program/static/js/jqueryui/jquery-ui.css" rel="stylesheet" />
-
- <script type="text/javascript" src="/program/static/js/jquery/jquery.min.js"></script>
- <script type="text/javascript" src="/program/static/js/jqueryui/jquery-ui.min.js"></script>
- <script type="text/javascript" src="/program/static/js/jqueryui/ui/jquery.ui.datepicker.min.js"></script>
- <script type="text/javascript">
-jQuery(document).ready(function() {
- jQuery("#calendar").datepicker({
- dateFormat: "yy.mm.dd",
- monthNames: [ "Jänner", "Februar", "März", "April", "Mai", "Juni", "Juli", "August", "September", "Oktober", "November", "Dezember" ],
- monthNamesShort: [ "Jän", "Feb", "Mär", "Apr", "Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dez" ],
- dayNames: [ "Sonntag", "Montag", "Dienstag", "Mittwoch", "Donnerstag", "Freitag", "Samstag" ],
- dayNamesMin: [ "So", "Mo", "Di", "Mi", "Do", "Fr", "Sa" ],
- dayNamesShort: [ "Son", "Mon", "Die", "Mit", "Don", "Fre", "Sam" ],
- firstDay: 1,
- nextText: "Weiter",
- prevText: "Zurück",
- defaultDate: location.href.split('/').slice(4, 7).join('.'),
- onSelect: function(dateText, inst) {
- location = '/programm/' + dateText.split('.').join('/');
- }
- });
-});
- </script>
+ <title>Tagesansicht {{ day|date:"l, d.m.Y" }} — Radio Helsinki - Freies Radio Graz</title>
+ <link type="text/css" href="/program/static/js/jqueryui/jquery-ui.css" rel="stylesheet"/>
+ <script type="text/javascript" src="/program/static/js/jquery/jquery.min.js"></script>
+ <script type="text/javascript" src="/program/static/js/jqueryui/jquery-ui.min.js"></script>
+ <script type="text/javascript" src="/program/static/js/jqueryui/ui/jquery.ui.datepicker.min.js"></script>
+ <script type="text/javascript">
+ jQuery(document).ready(function () {
+ jQuery("#calendar").datepicker({
+ dateFormat: "yy.mm.dd",
+ monthNames: ["Jänner", "Februar", "März", "April", "Mai", "Juni", "Juli", "August", "September", "Oktober", "November", "Dezember"],
+ monthNamesShort: ["Jän", "Feb", "Mär", "Apr", "Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dez"],
+ dayNames: ["Sonntag", "Montag", "Dienstag", "Mittwoch", "Donnerstag", "Freitag", "Samstag"],
+ dayNamesMin: ["So", "Mo", "Di", "Mi", "Do", "Fr", "Sa"],
+ dayNamesShort: ["Son", "Mon", "Die", "Mit", "Don", "Fre", "Sam"],
+ firstDay: 1,
+ nextText: "Weiter",
+ prevText: "Zurück",
+ defaultDate: location.href.split('/').slice(4, 7).join('.'),
+ onSelect: function (dateText, inst) {
+ location = '/programm/' + dateText.split('.').join('/');
+ }
+ });
+ });
+ </script>
</head>
<body>
<dl id="box_calendar" class="portlet calendar">
- <dt class="portletHeader"><span>Kalender<span></dt>
- <dd class="portletItem">
- <div id="calendar"></div>
- </dd>
+ <dt class="portletHeader"><span>Kalender<span></dt>
+ <dd class="portletItem">
+ <div id="calendar"></div>
+ </dd>
</dl>
{% load content_boxes %}
<div id="filter-format">
-{% broadcastformat %}
+ {% broadcastformat %}
</div>
{% comment %}
@@ -56,70 +55,76 @@ jQuery(document).ready(function() {
<h1 id="date">{{ day|date:"l, d.m.Y" }}</h1>
<div id="timeslots">
- {% for timeslot in timeslots %}
- {% if forloop.first and timeslot.start != timeslot.get_previous_by_start.end %}
- <div class="timeslot bf-{{ default_show.broadcastformat.slug }}">
- <div class="show-start">{{ timeslot.get_previous_by_start.end|date:"H:i" }}</div>
- <div class="show-abbrevs">
- {% for item in default_show.showinformation.all %}
- <span title="{{item.information}}" class="abbrev si-{{ item.abbrev }}"><span>{{ item.abbrev }}</span></span>
- {% endfor %}
- {% for item in default_show.showtopic.all %}
- <span title="{{item.topic}}" class="abbrev st-{{ item.abbrev }}"><span>{{ item.abbrev }}</span></span>
- {% endfor %}
- {% for item in default_show.musicfocus.all %}
- <span title="{{item.focus}}" class="abbrev mf-{{ item.abbrev }}"><span>{{ item.abbrev }}</span></span>
- {% endfor %}
- </div>
- <div class="show-detail">
- <h3 class="show-title">{{ default_show.name }}</h3>
- <p class="show-description">{{ default_show.short_description }}</p>
- </div>
- </div>
- {% endif %}
- <div class="timeslot bf-{{ timeslot.show.broadcastformat.slug }}">
- <div class="show-start">{{ timeslot.start|date:"H:i" }}</div>
- <div class="show-abbrevs">
- {% for item in timeslot.show.showinformation.all %}
- <span title="{{item.information}}" class="abbrev si-{{ item.abbrev }}"><span>{{ item.abbrev }}</span></span>
- {% endfor %}
- {% for item in timeslot.show.showtopic.all %}
- <span title="{{item.topic}}" class="abbrev st-{{ item.abbrev }}"><span>{{ item.abbrev }}</span></span>
- {% endfor %}
- {% for item in timeslot.show.musicfocus.all %}
- <span title="{{item.focus}}" class="abbrev mf-{{ item.abbrev }}"><span>{{ item.abbrev }}</span></span>
- {% endfor %}
- </div>
- <div class="show-detail">
- <h3 class="show-title"><a href="{% url timeslot-detail timeslot.id %}">{{ timeslot.show.name }}</a></h3>
- {% if timeslot.note %}
- <p class="note-title"><strong>Heute:</strong> {{ timeslot.note.title }}</p>
- {% else %}
- <p class="show-description">{{ timeslot.show.short_description }}</p>
+ {% for timeslot in timeslots %}
+ {% if forloop.first and timeslot.start != timeslot.get_previous_by_start.end %}
+ <div class="timeslot bf-{{ default_show.broadcastformat.slug }}">
+ <div class="show-start">{{ timeslot.get_previous_by_start.end|date:"H:i" }}</div>
+ <div class="show-abbrevs">
+ {% for si in default_show.showinformation.all %}
+ <span title="{{ si.information }}"
+ class="abbrev si-{{ si.abbrev }}"><span>{{ si.abbrev }}</span></span>
+ {% endfor %}
+ {% for st in default_show.showtopic.all %}
+ <span title="{{ st.topic }}" class="abbrev st-{{ st.abbrev }}"><span>{{ st.abbrev }}</span></span>
+ {% endfor %}
+ {% for mf in default_show.musicfocus.all %}
+ <span title="{{ mf.focus }}" class="abbrev mf-{{ mf.abbrev }}"><span>{{ mf.abbrev }}</span></span>
+ {% endfor %}
+ </div>
+ <div class="show-detail">
+ <h3 class="show-title">{{ default_show.name }}</h3>
+ <p class="show-description">{{ default_show.short_description }}</p>
+ </div>
+ </div>
{% endif %}
- </div>
- </div>
- {% if timeslot.end != timeslot.get_next_by_start.start %}
- <div class="timeslot bf-{{ default_show.broadcastformat.slug }}">
- <div class="show-start">{{ timeslot.end|date:"H:i" }}</div>
+ <div class="timeslot bf-{{ timeslot.show.broadcastformat.slug }}">
+ <div class="show-start">{{ timeslot.start|date:"H:i" }}</div>
<div class="show-abbrevs">
- {% for item in default_show.showinformation.all %}
- <span title="{{item.information}}" class="abbrev si-{{ item.abbrev }}"><span>{{ item.abbrev }}</span></span>
- {% endfor %}
- {% for item in default_show.showtopic.all %}
- <span title="{{item.topic}}" class="abbrev st-{{ item.abbrev }}"><span>{{ item.abbrev }}</span></span>
- {% endfor %}
- {% for item in default_show.musicfocus.all %}
- <span title="{{item.focus}}" class="abbrev mf-{{ item.abbrev }}"><span>{{ item.abbrev }}</span></span>
- {% endfor %}
+ {% for si in timeslot.show.showinformation.all %}
+ <span title="{{ si.information }}"
+ class="abbrev si-{{ si.abbrev }}"><span>{{ si.abbrev }}</span></span>
+ {% endfor %}
+ {% for st in timeslot.show.showtopic.all %}
+ <span title="{{ st.topic }}"
+ class="abbrev st-{{ st.abbrev }}"><span>{{ st.abbrev }}</span></span>
+ {% endfor %}
+ {% for mf in timeslot.show.musicfocus.all %}
+ <span title="{{ mf.focus }}"
+ class="abbrev mf-{{ mf.abbrev }}"><span>{{ mf.abbrev }}</span></span>
+ {% endfor %}
</div>
<div class="show-detail">
- <h3 class="show-title">{{ default_show.name }}</h3>
- <p class="show-description">{{ default_show.short_description }}</p>
+ <h3 class="show-title"><a
+ href="{% url "timeslot-detail" timeslot.id %}">{{ timeslot.show.name }}</a></h3>
+ {% if timeslot.note %}
+ <p class="note-title"><strong>Heute:</strong> {{ timeslot.note.title }}</p>
+ {% else %}
+ <p class="show-description">{{ timeslot.show.short_description }}</p>
+ {% endif %}
</div>
</div>
- {% endif %}
- {% endfor %}
+ {% if timeslot.end != timeslot.get_next_by_start.start %}
+ <div class="timeslot bf-{{ default_show.broadcastformat.slug }}">
+ <div class="show-start">{{ timeslot.end|date:"H:i" }}</div>
+ <div class="show-abbrevs">
+ {% for si in default_show.showinformation.all %}
+ <span title="{{ si.information }}"
+ class="abbrev si-{{ si.abbrev }}"><span>{{ si.abbrev }}</span></span>
+ {% endfor %}
+ {% for st in default_show.showtopic.all %}
+ <span title="{{ st.topic }}" class="abbrev st-{{ st.abbrev }}"><span>{{ st.abbrev }}</span></span>
+ {% endfor %}
+ {% for mf in default_show.musicfocus.all %}
+ <span title="{{ mf.focus }}" class="abbrev mf-{{ mf.abbrev }}"><span>{{ mf.abbrev }}</span></span>
+ {% endfor %}
+ </div>
+ <div class="show-detail">
+ <h3 class="show-title">{{ default_show.name }}</h3>
+ <p class="show-description">{{ default_show.short_description }}</p>
+ </div>
+ </div>
+ {% endif %}
+ {% endfor %}
</div>
</div>
diff --git a/program/templates/host_detail.html b/program/templates/host_detail.html
index 3d8e862..73182d6 100644
--- a/program/templates/host_detail.html
+++ b/program/templates/host_detail.html
@@ -9,22 +9,22 @@
<div id="shows">
<div id="shows-title">Sendungen</div>
-
- {% for show in host.shows.all %}
- {% if show.has_active_programslots %}
- <div class="show {{ show.broadcastformat.slug }}"><a href="{% url show-detail show.slug %}">{{ show }}</a></div>
- {% else %}
- <div class="show {{ show.broadcastformat.slug }}">{{ show }}</div>
- {% endif %}
- {% endfor %}
+ {% for show in host.shows.all %}
+ {% if show.is_active %}
+ <div class="show {{ show.broadcastformat.slug }}"><a
+ href="{% url "show-detail" show.slug %}">{{ show }}</a></div>
+ {% else %}
+ <div class="show {{ show.broadcastformat.slug }}">{{ show }}</div>
+ {% endif %}
+ {% endfor %}
</div>
{% if host.email %}
- <div id="email">E-Mail Adresse: <a href="{{ host.email }}">{{ host.email }}</a></div>
+ <div id="email">E-Mail Adresse: <a href="{{ host.email }}">{{ host.email }}</a></div>
{% endif %}
{% if host.website %}
- <div id="website">Website: <a href="{{ host.website }}">{{ host.website }}</a></div>
+ <div id="website">Website: <a href="{{ host.website }}">{{ host.website }}</a></div>
{% endif %}
</div>
diff --git a/program/templates/host_list.html b/program/templates/host_list.html
index d1c8427..ada9bf1 100644
--- a/program/templates/host_list.html
+++ b/program/templates/host_list.html
@@ -5,14 +5,14 @@
<body>
<div id="content-main">
- <h1>Sendungsmachende A-Z</h1>
- <div class="host-list">
-{% for host in host_list %}
- <div class="host">
- <a href="{% url host-detail host.id %}">{{ host.name }}</a>
+ <h1>Sendungsmachende A-Z</h1>
+ <div class="host-list">
+ {% for host in host_list %}
+ <div class="host">
+ <a href="{% url "host-detail" host.id %}">{{ host.name }}</a>
+ </div>
+ {% endfor %}
</div>
-{% endfor %}
- </div>
</div>
</body>
diff --git a/program/templates/recommendation_list.html b/program/templates/recommendation_list.html
index 3836a35..8070b29 100644
--- a/program/templates/recommendation_list.html
+++ b/program/templates/recommendation_list.html
@@ -5,40 +5,41 @@
<body>
<div id="content-main" class="recommendations">
- <h1>Programmhinweise</h1>
- <div id="shows">
-{% for recommendation in recommendation_list %}
- <div class="show recommendation bf-{{ recommendation.show.broadcastformat.slug }}">
- <div class="show-abbrevs">
- {% for si in recommendation.show.showinformation.all %}
- <span title="{{ si.information }}" class="abbrev si-{{ si.abbrev }}"><span>{{ si.abbrev }}</span></span>
+ <h1>Programmhinweise</h1>
+ <div id="shows">
+ {% for recommendation in recommendation_list %}
+ <div class="show recommendation bf-{{ recommendation.show.broadcastformat.slug }}">
+ <div class="show-abbrevs">
+ {% for si in recommendation.show.showinformation.all %}
+ <span title="{{ si.information }}"
+ class="abbrev si-{{ si.abbrev }}"><span>{{ si.abbrev }}</span></span>
+ {% endfor %}
+ {% for st in recommendation.show.showtopic.all %}
+ <span title="{{ st.topic }}"
+ class="abbrev st-{{ st.abbrev }}"><span>{{ st.abbrev }}</span></span>
+ {% endfor %}
+ {% for mf in recommendation.show.musicfocus.all %}
+ <span title="{{ mf.focus }}"
+ class="abbrev mf-{{ mf.abbrev }}"><span>{{ mf.abbrev }}</span></span>
+ {% endfor %}
+ </div>
+ <div class="show-detail">
+ <h4>
+ <a href="{% url "show-detail" recommendation.show.slug %}">{{ recommendation.show.name }}</a><br/>
+ vom {{ recommendation.start|date:"d.m. H:i" }}-{{ recommendation.end|date:"H:i" }}</h4>
+ {% if recommendation.note %}
+ <h3 class="show-title"></h3>
+ <a href="{% url "timeslot-detail" recommendation.id %}">{{ recommendation.note.title }}</a></h3>
+ <div class="note-content">{{ recommendation.note.content|safe }}</div>
+ {% else %}
+ <h3 class="show-title"><a
+ href="{% url "timeslot-detail" recommendation.id %}">{{ recommendation.show.broadcastformat.format }}</a>
+ </h3>
+ {% endif %}
+ </div>
+ </div>
{% endfor %}
- {% for st in recommendation.show.showtopic.all %}
- <span title="{{ st.topic }}" class="abbrev st-{{ st.abbrev }}"><span>{{ st.abbrev }}</span></span>
- {% endfor %}
- {% for mf in recommendation.show.musicfocus.all %}
- <span title="{{ mf.focus }}" class="abbrev mf-{{ mf.abbrev }}"><span>{{ mf.abbrev }}</span></span>
- {% endfor %}
- </div>
- <div class="show-detail">
- <h4>
- <a href="{% url "show-detail" recommendation.show.slug %}">{{ recommendation.show.name }}</a><br />
- vom {{ recommendation.start|date:"d.m. H:i" }}-{{ recommendation.end|date:"H:i" }}
- </h4>
- {% if recommendation.note %}
- <h3 class="show-title">
- <a href="{% url "timeslot-detail" recommendation.id %}">{{ recommendation.note.title }}</a>
- </h3>
- <div class="note-content">{{ recommendation.note.content|safe}}</div>
- {% else %}
- <h3 class="show-title">
- <a href="{% url "timeslot-detail" recommendation.id %}">{{ recommendation.show.broadcastformat.format }}</a>
- </h3>
- {% endif %}
- </div>
</div>
-{% endfor %}
- </div>
</div>
</body>
diff --git a/program/templates/show_detail.html b/program/templates/show_detail.html
index 0f4b302..3ab80ed 100644
--- a/program/templates/show_detail.html
+++ b/program/templates/show_detail.html
@@ -8,72 +8,73 @@
<div id="content-main" class="show-detail">
- <div class="show-detail-header bf-{{show.broadcastformat.slug}}">
- <div class="show-details">
- <h1 id="name">{{ show.name }}</h1>
- {% if show.id != 1 %}
- <p id="programslots">
- {% for slot in show.programslots.all %}
- {% if slot.has_active_timeslot %}
- <span class="programslot">{{ slot }}</span><br />
- {% endif %}
- {% endfor %}
- </p>
- {% endif %}
- </div>
+ <div class="show-detail-header bf-{{ show.broadcastformat.slug }}">
+ <div class="show-details">
+ <h1 id="name">{{ show.name }}</h1>
+ {% if show.id != 1 %}
+ <p id="programslots">
+ {% for slot in show.programslots.all %}
+ {% if slot.is_active %}
+ <span class="programslot">{{ slot }}</span><br/>
+ {% endif %}
+ {% endfor %}
+ </p>
+ {% endif %}
+ </div>
- <div class="show-categorization">
- <p id="broadcastformat">{{ show.broadcastformat.format }}</p>
- {% for item in show.showinformation.all %}
- <span title="{{item.information}}" class="abbrev si-{{ item.abbrev }}"><span>{{ item.abbrev }}</span></span>
- {% endfor %}
- {% for item in show.showtopic.all %}
- <span title="{{item.topic}}" class="abbrev st-{{ item.abbrev }}"><span>{{ item.abbrev }}</span></span>
- {% endfor %}
- {% for item in show.musicfocus.all %}
- <span title="{{item.focus}}" class="abbrev mf-{{ item.abbrev }}"><span>{{ item.abbrev }}</span></span>
- {% endfor %}
- </div>
+ <div class="show-categorization">
+ <p id="broadcastformat">{{ show.broadcastformat.format }}</p>
+ {% for item in show.showinformation.all %}
+ <span title="{{ item.information }}" class="abbrev si-{{ item.abbrev }}"><span>{{ item.abbrev }}</span></span>
+ {% endfor %}
+ {% for item in show.showtopic.all %}
+ <span title="{{ item.topic }}" class="abbrev st-{{ item.abbrev }}"><span>{{ item.abbrev }}</span></span>
+ {% endfor %}
+ {% for item in show.musicfocus.all %}
+ <span title="{{ item.focus }}" class="abbrev mf-{{ item.abbrev }}"><span>{{ item.abbrev }}</span></span>
+ {% endfor %}
+ </div>
- </div>
+ </div>
<div id="short-description" class="documentDescription">{{ show.short_description }}</div>
{% if show.description %}
- <div id="description">{{ show.description|safe }}</div>
+ <div id="description">{{ show.description|safe }}</div>
{% endif %}
{% if show.image and show.image_enabled %}
- <div id="image" style="float: right;"><img src="/program/static/{{ show.image }}" width="200" alt="image"></div>
+ <div id="image" style="float: right;"><img src="/program/static/{{ show.image }}" width="200" alt="image"></div>
{% endif %}
<p>
- {% for host in show.hosts.all %}
- <a href="{% url host-detail host.id %}">{{ host }}</a><br />
- {% endfor %}
- {% if show.email %}
- <strong>Email:</strong> <a href="mailto:{{ show.email }}">{{ show.email }}</a><br />
- {% endif %}
- {% if show.website %}
- <strong>Website:</strong> <a href="{{ show.website }}">{{ show.website }}</a><br />
- {% endif %}
- {% if show.cba_series_id %}
- <strong>CBA-Link:</strong> <a href="http://cba.fro.at/series/{{ show.cba_series_id }}">CBA</a><br />
- {% endif %}
+ {% for host in show.hosts.all %}
+ <a href="{% url "host-detail" host.id %}">{{ host }}</a><br/>
+ {% endfor %}
+ {% if show.email %}
+ <strong>Email:</strong> <a href="mailto:{{ show.email }}">{{ show.email }}</a><br/>
+ {% endif %}
+ {% if show.website %}
+ <strong>Website:</strong> <a href="{{ show.website }}">{{ show.website }}</a><br/>
+ {% endif %}
+ {% if show.cba_series_id %}
+ <strong>CBA-Link:</strong> <a href="http://cba.fro.at/series/{{ show.cba_series_id }}">CBA</a><br/>
+ {% endif %}
</p>
{% if show.notes.all %}
- <br />
- <h2>Sendungstipps</h2>
- <ul class="recommendations-list">
- {% for note in show.notes.all reversed %}
- <li>
- <a href="{% url timeslot-detail note.timeslot.id %}" title="{{ note.title }}">{{ note.start|date:"d. M Y" }}:</a>
- <div class="title">{{ note.title }}</div>
- </li>
- {% endfor %}
- </ul>
- {% endif %}
+ <br/>
+ <h2>Sendungstipps</h2>
+ <ul class="recommendations-list">
+ {% for note in show.notes.all reversed %}
+ <li>
+ <a href="{% url "timeslot-detail" note.timeslot.id %}"
+ title="{{ note.title }}">{{ note.start|date:"d. M Y" }}:</a>
+ <div class="title">{{ note.title }}</div>
+ </li>
+ {% endfor %}
+ </ul>
+ {% endif %}
</div>
diff --git a/program/templates/show_list.html b/program/templates/show_list.html
index 167a470..136930d 100644
--- a/program/templates/show_list.html
+++ b/program/templates/show_list.html
@@ -6,48 +6,51 @@
{% load content_boxes %}
<div id="filter-format">
-{% broadcastformat %}
+ {% broadcastformat %}
</div>
<div id="filter-topic">
- <dl id="filter-header" class="portlet">
- <dt class="portletHeader"><span>Filter<span></dt>
- </dl>
-{% musicfocus %}
-{% showinformation %}
-{% showtopic %}
+ <dl id="filter-header" class="portlet">
+ <dt class="portletHeader"><span>Filter<span></dt>
+ </dl>
+ {% musicfocus %}
+ {% showinformation %}
+ {% showtopic %}
</div>
<div id="content-main" class="show-list">
- <h1>Sendungen A-Z</h1>
+ <h1>Sendungen A-Z</h1>
- <div id="shows">
- {% for show in show_list %}
- <div class="show bf-{{ show.broadcastformat.slug }}">
- <div class="show-abbrevs">
- {% for item in show.showinformation.all %}
- <span title="{{item.information}}" class="abbrev si-{{ item.abbrev }}"><span>{{ item.abbrev }}</span></span>
+ <div id="shows">
+ {% for show in show_list %}
+ <div class="show bf-{{ show.broadcastformat.slug }}">
+ <div class="show-abbrevs">
+ {% for item in show.showinformation.all %}
+ <span title="{{ item.information }}"
+ class="abbrev si-{{ item.abbrev }}"><span>{{ item.abbrev }}</span></span>
+ {% endfor %}
+ {% for item in show.showtopic.all %}
+ <span title="{{ item.topic }}"
+ class="abbrev st-{{ item.abbrev }}"><span>{{ item.abbrev }}</span></span>
+ {% endfor %}
+ {% for item in show.musicfocus.all %}
+ <span title="{{ item.focus }}"
+ class="abbrev mf-{{ item.abbrev }}"><span>{{ item.abbrev }}</span></span>
+ {% endfor %}
+ </div>
+ <div class="show-detail">
+ <h3 class="show-title"><a href="{% url "show-detail" show.slug %}">{{ show.name }}</a></h3>
+ <ul class="show-programslots">
+ {% for slot in show.programslots.all %}
+ {% if slot.has_active_timeslot %}
+ <li class="show-programslot">{{ slot }}</li>
+ {% endif %}
+ {% endfor %}
+ </ul>
+ <p class="show-description">{{ show.short_description }}</p>
+ </div>
+ </div>
{% endfor %}
- {% for item in show.showtopic.all %}
- <span title="{{item.topic}}" class="abbrev st-{{ item.abbrev }}"><span>{{ item.abbrev }}</span></span>
- {% endfor %}
- {% for item in show.musicfocus.all %}
- <span title="{{item.focus}}" class="abbrev mf-{{ item.abbrev }}"><span>{{ item.abbrev }}</span></span>
- {% endfor %}
- </div>
- <div class="show-detail">
- <h3 class="show-title"><a href="{% url show-detail show.slug %}">{{ show.name }}</a></h3>
- <ul class="show-programslots">
- {% for slot in show.programslots.all %}
- {% if slot.has_active_timeslot %}
- <li class="show-programslot">{{ slot }}</li>
- {% endif %}
- {% endfor %}
- </ul>
- <p class="show-description">{{ show.short_description }}</p>
- </div>
</div>
- {% endfor %}
- </div>
</div>
diff --git a/program/templates/styles.css b/program/templates/styles.css
index 2934a7f..395be34 100644
--- a/program/templates/styles.css
+++ b/program/templates/styles.css
@@ -6,10 +6,12 @@
.mf-{{ mf.abbrev }} { background-image:url({{ mf.button_url }}); }
.filterbox .mf-{{ mf.abbrev }}:hover { background-image:url({{ mf.button_hover_url }}); }
{% endfor %}
+
{% for si in showinformation %}
.si-{{ si.abbrev }} { background-image:url({{ si.button_url }}); }
.filterbox .si-{{ si.abbrev }}:hover { background-image:url({{ si.button_hover_url }}); }
{% endfor %}
+
{% for st in showtopic %}
.st-{{ st.abbrev }} { background-image:url({{ st.button_url }}); }
.filterbox .st-{{ st.abbrev }}:hover { background-image:url({{ st.button_hover_url }}); }
@@ -18,9 +20,11 @@
{% for mf in musicfocus %}
.show-detail-header .mf-{{ mf.abbrev }} { background-image:url({{ mf.big_button_url }}); }
{% endfor %}
+
{% for si in showinformation %}
.show-detail-header .si-{{ si.abbrev }} { background-image:url({{ si.big_button_url }}); }
{% endfor %}
+
{% for st in showtopic %}
.show-detail-header .st-{{ st.abbrev }} { background-image:url({{ st.big_button_url }}); }
{% endfor %}
diff --git a/program/templates/timeslot_detail.html b/program/templates/timeslot_detail.html
index 856aef3..c899c32 100644
--- a/program/templates/timeslot_detail.html
+++ b/program/templates/timeslot_detail.html
@@ -6,53 +6,53 @@
<div id="content-main" class="timeslot-detail">
- <div class="show-detail-header bf-{{timeslot.show.broadcastformat.slug}}">
- <h1 id="name">
- <a href="{% url show-detail timeslot.show.slug %}">{{ timeslot.show.name }}</a>
- </h1>
- {% if timeslot.note %}
- <h2>{{ timeslot.note.title }}</h2>
- {% endif %}
- <strong>Sendung am {{ timeslot.start|date:"d.m. H:i" }} bis {{ timeslot.end|date:"H:i" }}</strong>
-
- <div class="show-abbrevs">
- {% for item in timeslot.show.showinformation.all %}
- <span title="{{item.information}}" class="abbrev si-{{ item.abbrev }}"><span>{{ item.abbrev }}</span></span>
- {% endfor %}
- {% for item in timeslot.show.showtopic.all %}
- <span title="{{item.topic}}" class="abbrev st-{{ item.abbrev }}"><span>{{ item.abbrev }}</span></span>
- {% endfor %}
- {% for item in timeslot.show.musicfocus.all %}
- <span title="{{item.focus}}" class="abbrev mf-{{ item.abbrev }}"><span>{{ item.abbrev }}</span></span>
- {% endfor %}
- </div>
-
- <p id="broadcastformat">{{ timeslot.show.broadcastformat.format }}</p>
+ <div class="show-detail-header bf-{{ timeslot.show.broadcastformat.slug }}">
+ <h1 id="name">
+ <a href="{% url "show-detail" timeslot.show.slug %}">{{ timeslot.show.name }}</a>
+ </h1>
+ {% if timeslot.note %}
+ <h2>{{ timeslot.note.title }}</h2>
+ {% endif %}
+ <strong>Sendung am {{ timeslot.start|date:"d.m. H:i" }} bis {{ timeslot.end|date:"H:i" }}</strong>
+
+ <div class="show-abbrevs">
+ {% for si in timeslot.show.showinformation.all %}
+ <span title="{{ si.information }}" class="abbrev si-{{ si.abbrev }}"><span>{{ si.abbrev }}</span></span>
+ {% endfor %}
+ {% for st in timeslot.show.showtopic.all %}
+ <span title="{{ st.topic }}" class="abbrev st-{{ st.abbrev }}"><span>{{ st.abbrev }}</span></span>
+ {% endfor %}
+ {% for mf in timeslot.show.musicfocus.all %}
+ <span title="{{ mf.focus }}" class="abbrev mf-{{ mf.abbrev }}"><span>{{ mf.abbrev }}</span></span>
+ {% endfor %}
+ </div>
+
+ <p id="broadcastformat">{{ timeslot.show.broadcastformat.format }}</p>
</div>
{% if timeslot.note %}
- <p class="timeslot-note">{{ timeslot.note.content|safe }}</p>
+ <p class="timeslot-note">{{ timeslot.note.content|safe }}</p>
{% endif %}
<div id="short-description" class="documentDescription">{{ timeslot.show.short_description }}</div>
{% if timeslot.show.description %}
- <div id="description">{{ timeslot.show.description|safe }}</div>
+ <div id="description">{{ timeslot.show.description|safe }}</div>
{% endif %}
<p>
- {% for host in timeslot.show.hosts.all %}
- <a href="{% url host-detail host.id %}">{{ host }}</a><br />
- {% endfor %}
- {% if timeslot.show.email %}
- <strong>Email:</strong> <a href="mailto:{{ timeslot.show.email }}">{{ timeslot.show.email }}</a><br />
- {% endif %}
- {% if timeslot.show.website %}
- <strong>Website:</strong> <a href="{{ timeslot.show.website }}">{{ timeslot.show.website }}</a><br />
- {% endif %}
- {% if timeslot.show.cba_series_id %}
- <strong>CBA-Link:</strong> <a href="http://cba.fro.at/series/{{ timeslot.show.cba_series_id }}">CBA</a><br />
- {% endif %}
+ {% for host in timeslot.show.hosts.all %}
+ <a href="{% url "host-detail" host.id %}">{{ host }}</a><br/>
+ {% endfor %}
+ {% if timeslot.show.email %}
+ <strong>Email:</strong> <a href="mailto:{{ timeslot.show.email }}">{{ timeslot.show.email }}</a><br/>
+ {% endif %}
+ {% if timeslot.show.website %}
+ <strong>Website:</strong> <a href="{{ timeslot.show.website }}">{{ timeslot.show.website }}</a><br/>
+ {% endif %}
+ {% if timeslot.show.cba_series_id %}
+ <strong>CBA-Link:</strong> <a href="http://cba.fro.at/series/{{ timeslot.show.cba_series_id }}">CBA</a><br/>
+ {% endif %}
</p>
diff --git a/program/templates/week_schedule.html b/program/templates/week_schedule.html
index a10a4c1..ad6b012 100644
--- a/program/templates/week_schedule.html
+++ b/program/templates/week_schedule.html
@@ -6,17 +6,17 @@
<body>
<div id="content-main" class="week-schedule">
- <table class="week-navigation">
- <tr>
- <td><a href="/program/{{ last_w }}"><--</a></td>
- <td class="current">{{ cur_w }}</td>
- <td><a href="/program/{{ next_w1 }}">{{ next_w1 }}</a></td>
- <td><a href="/program/{{ next_w2 }}">{{ next_w2 }}</a></td>
- <td><a href="/program/{{ next_w3 }}">{{ next_w3 }}</a></td>
- <td><a href="/program/{{ next_w4 }}">{{ next_w4 }}</a></td>
- <td><a href="/program/{{ next_w1 }}">--></a></td>
- </tr>
- </table>
+ <table class="week-navigation">
+ <tr>
+ <td><a href="/program/{{ last_w }}"><--</a></td>
+ <td class="current">{{ cur_w }}</td>
+ <td><a href="/program/{{ next_w1 }}">{{ next_w1 }}</a></td>
+ <td><a href="/program/{{ next_w2 }}">{{ next_w2 }}</a></td>
+ <td><a href="/program/{{ next_w3 }}">{{ next_w3 }}</a></td>
+ <td><a href="/program/{{ next_w4 }}">{{ next_w4 }}</a></td>
+ <td><a href="/program/{{ next_w1 }}">--></a></td>
+ </tr>
+ </table>
<div class="weekday-starts weekday-starts-left">
<div style="height: 43px;"> </div>
<div style="height: 60px;">06:00</div>
@@ -119,8 +119,8 @@
<div style="height: 60px;">03:00</div>
<div style="height: 60px;">04:00</div>
<div style="height: 60px;">05:00</div>
- </div>
-
+ </div>
+
</div>
</body>
diff --git a/program/templates/week_schedule_timeslot.html b/program/templates/week_schedule_timeslot.html
index 852466b..8942327 100644
--- a/program/templates/week_schedule_timeslot.html
+++ b/program/templates/week_schedule_timeslot.html
@@ -1,54 +1,54 @@
{% load timeslots %}
{% if forloop.first and timeslot.start != timeslot.get_previous_by_start.end %}
-<div class="timeslot bf-{{ default_show.broadcastformat.slug }}" {% duration_until timeslot.start %}>
- <div>{{ default_show.name }}</div>
-</div>
+ <div class="timeslot bf-{{ default_show.broadcastformat.slug }}" {% duration_until timeslot.start %}>
+ <div>{{ default_show.name }}</div>
+ </div>
{% endif %}
{% if forloop.first and timeslot.start == timeslot.get_next_by_start.end and timeslot.start != "06:00" %}
-<div class="timeslot bf-{{ timeslot.show.broadcastformat.slug }}" {% duration timeslot.start timeslot.end %}>
- <div><a href="{% url timeslot-detail timeslot.id %}">{{ timeslot.show.name }}</a></div>
-</div>
+ <div class="timeslot bf-{{ timeslot.show.broadcastformat.slug }}" {% duration timeslot.start timeslot.end %}>
+ <div><a href="{% url "timeslot-detail" timeslot.id %}">{{ timeslot.show.name }}</a></div>
+ </div>
{% endif %}
{% if forloop.first and timeslot.start != "06:00" and timeslot.show == default_show %}
-<div class="timeslot bf-{{ timeslot.show.broadcastformat.slug }}" {% duration_until timeslot.end %}>
- <div><a href="{% url timeslot-detail timeslot.id %}">{{ timeslot.show.name }}</a> </div>
-</div>
+ <div class="timeslot bf-{{ timeslot.show.broadcastformat.slug }}" {% duration_until timeslot.end %}>
+ <div><a href="{% url "timeslot-detail" timeslot.id %}">{{ timeslot.show.name }}</a></div>
+ </div>
{% endif %}
{% if forloop.first and timeslot.start != "06:00" and timeslot.show != default_show %}
-<div class="timeslot bf-{{ timeslot.show.broadcastformat.slug }}" {% duration timeslot.start timeslot.end %}>
- <div><a href="{% url timeslot-detail timeslot.id %}">{{ timeslot.show.name }}</a> </div>
-</div>
+ <div class="timeslot bf-{{ timeslot.show.broadcastformat.slug }}" {% duration timeslot.start timeslot.end %}>
+ <div><a href="{% url "timeslot-detail" timeslot.id %}">{{ timeslot.show.name }}</a></div>
+ </div>
{% endif %}
{% if not forloop.first and not forloop.last %}
-<div class="timeslot bf-{{ timeslot.show.broadcastformat.slug }}" {% duration timeslot.start timeslot.end %}>
- <div><a href="{% url timeslot-detail timeslot.id %}">{{ timeslot.show.name }}</a></div>
-</div>
- {% if timeslot.end != timeslot.get_next_by_start.start %}
- <div class="timeslot bf-{{ default_show.broadcastformat.slug }}" {% duration timeslot.end timeslot.get_next_by_start.start %}>
- <div>{{ default_show.name }}</div>
+ <div class="timeslot bf-{{ timeslot.show.broadcastformat.slug }}" {% duration timeslot.start timeslot.end %}>
+ <div><a href="{% url "timeslot-detail" timeslot.id %}">{{ timeslot.show.name }}</a></div>
</div>
+ {% if timeslot.end != timeslot.get_next_by_start.start %}
+ <div class="timeslot bf-{{ default_show.broadcastformat.slug }}" {% duration timeslot.end timeslot.get_next_by_start.start %}>
+ <div>{{ default_show.name }}</div>
+ </div>
{% endif %}
{% endif %}
{% if forloop.last and timeslot.end != "06:00" and timeslot.show == default_show %}
-<div class="timeslot bf-{{ timeslot.show.broadcastformat.slug }}" {% duration_since timeslot.start %}>
- <div><a href="{% url timeslot-detail timeslot.id %}">{{ timeslot.show.name }}</a> </div>
-</div>
+ <div class="timeslot bf-{{ timeslot.show.broadcastformat.slug }}" {% duration_since timeslot.start %}>
+ <div><a href="{% url "timeslot-detail" timeslot.id %}">{{ timeslot.show.name }}</a></div>
+ </div>
{% endif %}
{% if forloop.last and timeslot.end != "06:00" and timeslot.show != default_show %}
-<div class="timeslot bf-{{ timeslot.show.broadcastformat.slug }}" {% duration timeslot.start timeslot.end %}>
- <div><a href="{% url timeslot-detail timeslot.id %}">{{ timeslot.show.name }}</a> </div>
-</div>
+ <div class="timeslot bf-{{ timeslot.show.broadcastformat.slug }}" {% duration timeslot.start timeslot.end %}>
+ <div><a href="{% url "timeslot-detail" timeslot.id %}">{{ timeslot.show.name }}</a></div>
+ </div>
{% endif %}
{% if forloop.last and timeslot.end != timeslot.get_next_by_start.start %}
-<div class="timeslot bf-{{ default_show.broadcastformat.slug }}" {% duration_since timeslot.end %}>
- <div>{{ default_show.name }}</div>
-</div>
-{% endif %}
+ <div class="timeslot bf-{{ default_show.broadcastformat.slug }}" {% duration_since timeslot.end %}>
+ <div>{{ default_show.name }}</div>
+ </div>
+{% endif %}
diff --git a/program/templatetags/content_boxes.py b/program/templatetags/content_boxes.py
index 6e2b6c7..7f176c6 100644
--- a/program/templatetags/content_boxes.py
+++ b/program/templatetags/content_boxes.py
@@ -8,23 +8,19 @@ from program.models import BroadcastFormat, MusicFocus, ShowInformation, ShowTop
@register.inclusion_tag('boxes/broadcastformat.html')
def broadcastformat():
- broadcastformats = BroadcastFormat.objects.filter(enabled=True)
- return {'broadcastformats': broadcastformats}
+ return {'broadcastformat_list': BroadcastFormat.objects.filter(enabled=True)}
@register.inclusion_tag('boxes/musicfocus.html')
def musicfocus():
- musicfoci = MusicFocus.objects.all()
- return {'musicfoci': musicfoci}
+ return {'musicfocus_list': MusicFocus.objects.all()}
@register.inclusion_tag('boxes/showinformation.html')
def showinformation():
- showinformations = ShowInformation.objects.all()
- return {'showinformations': showinformations}
+ return {'showinformation_list': ShowInformation.objects.all()}
@register.inclusion_tag('boxes/showtopic.html')
def showtopic():
- showtopics = ShowTopic.objects.all()
- return {'showtopics': showtopics}
+ return {'showtopic_list': ShowTopic.objects.all()}
--
cgit v0.10.2