summaryrefslogtreecommitdiff
path: root/program/templates/boxes
diff options
context:
space:
mode:
authorChristian Pointner <equinox@helsinki.at>2016-04-15 18:41:03 (GMT)
committerChristian Pointner <equinox@helsinki.at>2016-04-15 18:41:03 (GMT)
commit17f110df8c14ea258d9227d08471a4a82bfa4657 (patch)
treef2aaf3e4bbf132fa3d0fbbbafca88a420f8225a7 /program/templates/boxes
parent1d521e1c65babb8412b4959bd476596e0aa36aa6 (diff)
parent179a462bf561dc0cb4d19133e7e3684055278296 (diff)
merged master into stable after new deployment
Diffstat (limited to 'program/templates/boxes')
-rw-r--r--program/templates/boxes/broadcastformat.html19
-rw-r--r--program/templates/boxes/current.html111
-rw-r--r--program/templates/boxes/musicfocus.html27
-rw-r--r--program/templates/boxes/recommendation.html39
-rw-r--r--program/templates/boxes/recommendations.html40
-rw-r--r--program/templates/boxes/showinformation.html28
-rw-r--r--program/templates/boxes/showtopic.html28
7 files changed, 151 insertions, 141 deletions
diff --git a/program/templates/boxes/broadcastformat.html b/program/templates/boxes/broadcastformat.html
index 76ee382..8118cdb 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>
+{% if broadcastformat_list %}
+ <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..0ac5179 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 }}">&nbsp;</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 }}">&#x25B6;</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 }}">&nbsp;</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 }}">&nbsp;</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="{{ previous_timeslot.show.broadcastformat.format }}">&nbsp;</td>
+ <td class="show">
+ <h3>
+ <a href="{% url "timeslot-detail" previous_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 }}">&#x25B6;</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 }}">&nbsp;</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 }}">&nbsp;</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..021185b 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>
+{% if musicfocus_list %}
+ <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
new file mode 100644
index 0000000..3f4429e
--- /dev/null
+++ b/program/templates/boxes/recommendation.html
@@ -0,0 +1,39 @@
+<!doctype html>
+<html>
+<head>
+ <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 recommendation in recommendation_list %}
+ <tr>
+ <td class="start">&nbsp;</td>
+ <td class="format bf-{{ recommendation.show.broadcastformat.slug }}"
+ title="{{ recommendation.show.broadcastformat.format }}">&nbsp;</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/recommendations.html b/program/templates/boxes/recommendations.html
deleted file mode 100644
index 2174654..0000000
--- a/program/templates/boxes/recommendations.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!doctype html>
-<html>
-<head>
- <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">&nbsp;</td>
- <td class="format bf-{{ item.show.broadcastformat.slug }}"
- title="{{ item.show.broadcastformat.format }}">&nbsp;</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 %}
-</body>
-</html>
diff --git a/program/templates/boxes/showinformation.html b/program/templates/boxes/showinformation.html
index ac4dc2c..dbbe60d 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>
+{% if showinformation_list %}
+ <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..93e873a 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>
+{% if showtopic_list %}
+ <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 %}
generated by cgit v0.10.2 at 2024-11-28 10:24:27 (GMT)