5 files changed, 35 insertions, 31 deletions
diff --git a/helsinki/program/templates/program/box_broadcastformats.html b/helsinki/program/templates/program/box_broadcastformat.html
index aff4f05..aff4f05 100644
--- a/helsinki/program/templates/program/box_broadcastformats.html
+++ b/helsinki/program/templates/program/box_broadcastformat.html
diff --git a/helsinki/program/templates/program/box_musicfocus.html b/helsinki/program/templates/program/box_musicfocus.html
new file mode 100644
index 0000000..cd91002
--- /dev/null
+++ b/helsinki/program/templates/program/box_musicfocus.html
@@ -0,0 +1,10 @@
+{% if musicfoci %}
+<dl id="box_musicfocus" class="portlet">
+  <dt class="portletHeader"><span>Musiktendenz<span></dt>
+  {% for item in musicfoci %}
+  <dd class="portletItem musicfocus mf-{{ item.abbrev }}">
+    <a href="?musicfocus={{ item.slug }}">{{ item }}</a>
+  </dd>
+  {% endfor %}
+</dl>
+{% endif %}
diff --git a/helsinki/program/templates/program/box_showinformation.html b/helsinki/program/templates/program/box_showinformation.html
new file mode 100644
index 0000000..deef73c
--- /dev/null
+++ b/helsinki/program/templates/program/box_showinformation.html
@@ -0,0 +1,10 @@
+{% if showinformations %}
+<dl id="box_showinformation" class="portlet">
+  <dt class="portletHeader"><span>Schwerpunkt<span></dt>
+  {% for item in showinformations %}
+  <dd class="portletItem showinformation mf-{{ item.abbrev }}">
+    <a href="?showinformation={{ item.slug }}">{{ item }}</a>
+  </dd>
+  {% endfor %}
+</dl>
+{% endif %}
diff --git a/helsinki/program/templates/program/box_showtopic.html b/helsinki/program/templates/program/box_showtopic.html
new file mode 100644
index 0000000..abeed2d
--- /dev/null
+++ b/helsinki/program/templates/program/box_showtopic.html
@@ -0,0 +1,10 @@
+{% if showtopics %}
+<dl id="box_showtopic" class="portlet">
+  <dt class="portletHeader"><span>Thema / Schwerpunkt<span></dt>
+  {% for item in showtopics %}
+  <dd class="portletItem showtopic st-{{ item.abbrev }}">
+    <a href="?showtopic={{ item.slug }}">{{ item }}</a>
+  </dd>
+  {% endfor %}
+</dl>
+{% endif %}
diff --git a/helsinki/program/templates/program/show_list.html b/helsinki/program/templates/program/show_list.html
index f938410..629b670 100644
--- a/helsinki/program/templates/program/show_list.html
+++ b/helsinki/program/templates/program/show_list.html
@@ -5,41 +5,15 @@
 </head>
 <body>
 
-{% load content_boxes %}
-{% broadcastformats %}
-
 <div id="filter">
     <div id="filter-title">Filter</div>
 
-    <div id="showtopics">
-        <div id="showtopics-title">Thema/Schwerpunkt</div>
-        {% for topic in showtopics %}
-        <div class="showtopic">
-            <span class="abbrev">{{ topic.abbrev }}</span>
-            <span class="topic"><a href="?showtopic={{ topic.slug }}">{{ topic }}</a></span>
-        </div>
-        {% endfor %}
-    </div>
-
-    <div id="showinformations">
-        <div id="showinformations-title"></div>
-        {% for information in showinformations %}
-        <div class="showinformation">
-            <span class="abbrev">{{ information.abbrev }}</span>
-            <span class="information"><a href="?showinformation={{ information.slug }}">{{ information }}</a></span>
-        </div>
-        {% endfor %}
-    </div>
+{% load content_boxes %}
+{% broadcastformat %}
+{% musicfocus %}
+{% showinformation %}
+{% showtopic %}
 
-    <div id="musicfoci">
-        <div id="musicfoci-title">Musiktendenz</div>
-        {% for focus in musicfoci %}
-        <div class="musicfocus">
-            <span class="abbrev">{{ focus.abbrev }}</span>
-            <span class="focus"><a href="?musicfocus={{ focus.slug }}">{{ focus }}</a></span>
-        </div>
-    {% endfor %}
-    </div>
 </div>
 
 <div id="shows">