7 files changed, 13 insertions, 24 deletions
diff --git a/program/templates/v2/day_schedule.html b/program/templates/v2/day_schedule.html
index 4a36bdb..a4e1bde 100644
--- a/program/templates/v2/day_schedule.html
+++ b/program/templates/v2/day_schedule.html
@@ -5,14 +5,8 @@
 <body>
 
 {% load filters %}
-<div id="filter-format">
-    {% broadcastformatV2 %}
-</div>
-
-<div id="filter-topic">
-  <dl id="filter-header" class="portlet">
-    <dt class="portletHeader"><span>Filter</span></dt>
-  </dl>
+<div id="filter">
+{% broadcastformatV2 %}
 {% musicfocusV2 %}
 {% showinformationV2 %}
 {% showtopicV2 %}
diff --git a/program/templates/v2/filters/broadcastformat.html b/program/templates/v2/filters/broadcastformat.html
index 922c99c..4081323 100644
--- a/program/templates/v2/filters/broadcastformat.html
+++ b/program/templates/v2/filters/broadcastformat.html
@@ -1,6 +1,6 @@
 {% if broadcastformat_list %}
     <ul id="filter_broadcastformat">
 {%   for bf in broadcastformat_list %}
-      <li><a title="Sendungen mit dem Sendungsformat {{ bf.format }} anzeigen." href="?broadcastformat={{ bf.slug }}">{{ bf.format }}</a></li>{% endfor %}
+        <li><a title="Sendungen mit dem Sendungsformat {{ bf.format }} anzeigen." class="bf-{{ bf.slug }}" href="?broadcastformat={{ bf.slug }}">{{ bf.format }}</a></li>{% endfor %}
     </ul>
 {% endif %}
diff --git a/program/templates/v2/filters/language.html b/program/templates/v2/filters/language.html
index c79122f..75a2d89 100644
--- a/program/templates/v2/filters/language.html
+++ b/program/templates/v2/filters/language.html
@@ -1,6 +1,6 @@
 {% if language_list %}
     <ul id="filter_language">
 {%   for language in language_list %}
-       <li><a title="Sendungen auf {{ language.name }} anzeigen." href="?language={{ language.slug }}">{{ language.name }}/{{ language.native_name }}</a></li>{% endfor %}
+        <li><a title="Sendungen auf {{ language.name }} anzeigen." class="lang-{{ language.slug }}" href="?language={{ language.slug }}">{{ language.name }}/{{ language.native_name }}</a></li>{% endfor %}
     </ul>
 {% endif %}
diff --git a/program/templates/v2/filters/musicfocus.html b/program/templates/v2/filters/musicfocus.html
index 99bbb20..b2897e2 100644
--- a/program/templates/v2/filters/musicfocus.html
+++ b/program/templates/v2/filters/musicfocus.html
@@ -1,6 +1,6 @@
 {% if musicfocus_list %}
     <ul id="filter_musicfocus">
 {%   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 %}
+        <li><a title="Sendungen mit der Musiktendenz {{ mf.focus }} anzeigen." class="mf-{{ mf.abbrev }}" href="?musicfocus={{ mf.slug }}">{{ mf.focus }}</a></li>{% endfor %}
     </ul>
 {% endif %}
diff --git a/program/templates/v2/filters/showinformation.html b/program/templates/v2/filters/showinformation.html
index bcd6cb1..75c5c78 100644
--- a/program/templates/v2/filters/showinformation.html
+++ b/program/templates/v2/filters/showinformation.html
@@ -1,6 +1,6 @@
 {% if showinformation_list %}
     <ul id="filter_showinformation">
 {%   for si in showinformation_list %}
-      <li><a title="Sendungen mit der Information {{ si.information }} anzeigen." href="?showinformation={{ si.slug }}">{{ si.information }}</a></li>{% endfor %}
+        <li><a title="Sendungen mit der Information {{ si.information }} anzeigen." class="si-{{ si.abbrev }}" href="?showinformation={{ si.slug }}">{{ si.information }}</a></li>{% endfor %}
     </ul>
 {% endif %}
diff --git a/program/templates/v2/filters/showtopic.html b/program/templates/v2/filters/showtopic.html
index 070d82a..6ecdb34 100644
--- a/program/templates/v2/filters/showtopic.html
+++ b/program/templates/v2/filters/showtopic.html
@@ -1,6 +1,6 @@
 {% if showtopic_list %}
     <ul id="filter_showtopic">
 {%   for showtopic in showtopic_list %}
-       <li><a title="Sendungen mit dem Schwerpunkt {{ showtopic.topic }} anzeigen." href="?showtopic={{ showtopic.slug }}">{{ showtopic.topic }}</a></li>{% endfor %}
+        <li><a title="Sendungen mit dem Schwerpunkt {{ showtopic.topic }} anzeigen." class="st-{{ showtopic.abbrev }}" href="?showtopic={{ showtopic.slug }}">{{ showtopic.topic }}</a></li>{% endfor %}
     </ul>
 {% endif %}
diff --git a/program/templates/v2/show_list.html b/program/templates/v2/show_list.html
index 50cae57..c4d123b 100644
--- a/program/templates/v2/show_list.html
+++ b/program/templates/v2/show_list.html
@@ -5,17 +5,12 @@
 <body>
 
 {% load filters %}
-<div id="filter-format">
-    {% broadcastformatV2 %}
-</div>
-<div id="filter-topic">
-    <dl id="filter-header" class="portlet">
-        <dt class="portletHeader"><span>Filter</span></dt>
-    </dl>
-    {% musicfocusV2 %}
-    {% showinformationV2 %}
-    {% showtopicV2 %}
-    {% languageV2 %}
+<div id="filter">
+{% broadcastformatV2 %}
+{% musicfocusV2 %}
+{% showinformationV2 %}
+{% showtopicV2 %}
+{% languageV2 %}
 </div>
 
 <div id="content-main" class="show-list">