merged master into stable after new deployment

1 files changed, 15 insertions, 13 deletions

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 %}