Merge branch 'new-homepage' into stable

7 files changed, 197 insertions, 217 deletions

diff --git a/program/templates/v2/day_schedule.html b/program/templates/v2/day_schedule.html
index 8fef31d..64908db 100644
--- a/program/templates/v2/day_schedule.html
+++ b/program/templates/v2/day_schedule.html
@@ -9,76 +9,70 @@
     <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 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>
+{% 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>
-            {% endif %}
+            </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 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 %}
+{%   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"><a
-                            href="/program/{{ 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 %}
+                    <h3 class="show-title"><a href="/program/{{ 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>
-            {% 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>
+{%   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>
-            {% endif %}
-        {% endfor %}
+            </div>
+{%   endif %}
+{% endfor %}
     </div>
 </div>
 
diff --git a/program/templates/v2/host_detail.html b/program/templates/v2/host_detail.html
index a224635..792a0a3 100644
--- a/program/templates/v2/host_detail.html
+++ b/program/templates/v2/host_detail.html
@@ -9,18 +9,16 @@
 
     <div id="shows">
         <div id="shows-title">Sendungen</div>
-        {% for show in host.active_shows %}
-            <div class="show {{ show.broadcastformat.slug }}"><a href="/program/shows/{{ show.slug }}"> {{ show.name }}</a></div>
-        {% endfor %}
+{% for show in host.active_shows %}
+        <div class="show {{ show.broadcastformat.slug }}"><a href="/program/shows/{{ show.slug }}"> {{ show.name }}</a></div>
+{% endfor %}
     </div>
-
-    {% if host.email %}
-        <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>
-    {% endif %}
+{% if host.email %}
+    <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>
+{% endif %}
 </div>
 
 </body>
diff --git a/program/templates/v2/host_list.html b/program/templates/v2/host_list.html
index 3d4663d..03b7c47 100644
--- a/program/templates/v2/host_list.html
+++ b/program/templates/v2/host_list.html
@@ -7,11 +7,9 @@
 <div id="content-main" class="host-list">
     <h1>Sendungsmachende A-Z</h1>
     <div class="host-list">
-        {% for host in host_list %}
-            <div class="host">
-                <a href="/program/hosts/{{ host.id }}">{{ host.name }}</a>
-            </div>
-        {% endfor %}
+{% for host in host_list %}
+        <div class="host"><a href="/program/hosts/{{ host.id }}">{{ host.name }}</a></div>
+{% endfor %}
     </div>
 </div>
 
diff --git a/program/templates/v2/recommendation_list.html b/program/templates/v2/recommendation_list.html
index c4da031..f668949 100644
--- a/program/templates/v2/recommendation_list.html
+++ b/program/templates/v2/recommendation_list.html
@@ -7,37 +7,34 @@
 <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>
-                    {% 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="/program/shows/{{ recommendation.show.slug }}">{{ recommendation.show.name }}</a><br/>
-                        vom {{ recommendation.start|date:"d.m. H:i" }}-{{ recommendation.end|date:"H:i" }}
-                    </h4>
-                    <h3 class="show-title">
-                    {% if recommendation.note %}
-                       <a href="/program/{{ recommendation.id }}">{{ recommendation.note.title }}</a>
-                    {% else %}
-                       <a href="/program/{{ recommendation.id }}">{{ recommendation.show.broadcastformat.format }}</a>
-                    {% endif %}
-                    </h3>
-                </div>
+{% 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>
-        {% endfor %}
+            <div class="show-detail">
+                <h4>
+                    <a href="/program/shows/{{ recommendation.show.slug }}">{{ recommendation.show.name }}</a><br/>
+                    vom {{ recommendation.start|date:"d.m. H:i" }}-{{ recommendation.end|date:"H:i" }}
+                </h4>
+                <h3 class="show-title">
+{%   if recommendation.note %}
+                   <a href="/program/{{ recommendation.id }}">{{ recommendation.note.title }}</a>
+{%   else %}
+                   <a href="/program/{{ recommendation.id }}">{{ recommendation.show.broadcastformat.format }}</a>
+{%   endif %}
+                </h3>
+            </div>
+        </div>
+{% endfor %}
     </div>
 </div>
 
diff --git a/program/templates/v2/show_detail.html b/program/templates/v2/show_detail.html
index 56f1a84..d0ac5a8 100644
--- a/program/templates/v2/show_detail.html
+++ b/program/templates/v2/show_detail.html
@@ -9,77 +9,74 @@
     <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.active_programslots %}
-                        <span class="programslot">{{ slot }}</span><br/>
-                    {% endfor %}
-                </p>
-            {% endif %}
+{% if show.id != 1 %}
+            <p id="programslots">
+{%   for slot in show.active_programslots %}
+               <span class="programslot">{{ slot }}</span><br/>
+{%   endfor %}
+            </p>
+{% endif %}
         </div>
 
         <div class="show-categorization">
             <p id="broadcastformat">{{ show.broadcastformat.format }}</p>
-            {% for si in show.showinformation.all %}
-                <span title="{{ si.information }}" class="abbrev si-{{ si.abbrev }}"><span>{{ si.abbrev }}</span></span>
-            {% endfor %}
-            {% for st in show.showtopic.all %}
-                <span title="{{ st.topic }}" class="abbrev st-{{ st.abbrev }}"><span>{{ st.abbrev }}</span></span>
-            {% endfor %}
-            {% for mf in show.musicfocus.all %}
-                <span title="{{ mf.focus }}" class="abbrev mf-{{ mf.abbrev }}"><span>{{ mf.abbrev }}</span></span>
-            {% endfor %}
+{% for si in show.showinformation.all %}
+            <span title="{{ si.information }}" class="abbrev si-{{ si.abbrev }}"><span>{{ si.abbrev }}</span></span>
+{% endfor %}
+{% for st in show.showtopic.all %}
+            <span title="{{ st.topic }}" class="abbrev st-{{ st.abbrev }}"><span>{{ st.abbrev }}</span></span>
+{% endfor %}
+{% for mf in show.musicfocus.all %}
+            <span title="{{ mf.focus }}" class="abbrev mf-{{ mf.abbrev }}"><span>{{ mf.abbrev }}</span></span>
+{% endfor %}
         </div>
-
     </div>
 
     <div id="short-description" class="documentDescription">{{ show.short_description }}</div>
 
-    {% if show.description %}
-        <div id="description">{{ show.description|safe }}</div>
-    {% endif %}
+{% if show.description %}
+    <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>
-    {% 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>
+{% endif %}
 
     <p>
-        {% for host in show.hosts.all %}
-            <a href="/program/hosts/{{ 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 %}
+{% for host in show.hosts.all %}
+        <a href="/program/hosts/{{ 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 %}
     </p>
 
-    {% if show.notes.all %}
-        <br/>
-        <h2>Sendungstipps</h2>
-        <ul class="recommendations-list">
-            {% for note in show.notes.all reversed %}
-                <li>
-                    <a href="/program/{{ note.timeslot.id }}"
-                       title="{{ note.title }}">{{ note.start|date:"d. M Y" }}:</a>
-                    <div class="title">{{ note.title }}</div>
-                </li>
-            {% endfor %}
-            {% if show.predecessor and show.predecessor.notes.all %}
-                {% if show.name != show.predecessor.name %}
-                    <h3>Davor als <a href="/program/shows/{{ show.predecessor.slug }}">{{ show.predecessor.name }}</a></h3>
-                {%  endif %}
-                {% for note in show.predecessor.notes.all reversed %}
-                    <li>
-                        <a href="/program/{{ note.timeslot.id }}"
-                           title="{{ note.title }}">{{ note.start|date:"d. M Y" }}:</a>
-                        <div class="title">{{ note.title }}</div>
-                    </li>
-                {% endfor %}
-            {% endif %}
+{% if show.notes.all %}
+    <br/>
+    <h2>Sendungstipps</h2>
+    <ul class="recommendations-list">
+{%   for note in show.notes.all reversed %}
+        <li>
+            <a href="/program/{{ note.timeslot.id }}" title="{{ note.title }}">{{ note.start|date:"d. M Y" }}:</a>
+            <div class="title">{{ note.title }}</div>
+        </li>
+{%   endfor %}
+{%   if show.predecessor and show.predecessor.notes.all %}
+{%     if show.name != show.predecessor.name %}
+        <h3>Davor als <a href="/program/shows/{{ show.predecessor.slug }}">{{ show.predecessor.name }}</a></h3>
+{%     endif %}
+{%     for note in show.predecessor.notes.all reversed %}
+        <li>
+            <a href="/program/{{ note.timeslot.id }}" title="{{ note.title }}">{{ note.start|date:"d. M Y" }}:</a>
+            <div class="title">{{ note.title }}</div>
+        </li>
+{%     endfor %}
+{%   endif %}
         </ul>
-    {% endif %}
+{% endif %}
 </div>
 
 </body>
diff --git a/program/templates/v2/show_list.html b/program/templates/v2/show_list.html
index 56ecd21..eacb608 100644
--- a/program/templates/v2/show_list.html
+++ b/program/templates/v2/show_list.html
@@ -8,35 +8,31 @@
     <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 si in show.showinformation.all %}
-                        <span title="{{ si.information }}"
-                              class="abbrev si-{{ si.abbrev }}"><span>{{ si.abbrev }}</span></span>
-                    {% endfor %}
-                    {% for st in show.showtopic.all %}
-                        <span title="{{ st.topic }}"
-                              class="abbrev st-{{ st.abbrev }}"><span>{{ st.abbrev }}</span></span>
-                    {% endfor %}
-                    {% for mf in 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"><a href="/program/shows/{{ show.slug }}">{{ show.name }}</a></h3>
-                    <ul class="show-programslots">
-                        {% for programslot in show.active_program_slots %}
-                            <li class="show-programslot">{{ programslot }}</li>
-                        {% endfor %}
-                    </ul>
-                    <p class="show-description">{{ show.short_description }}</p>
-                </div>
+{% for show in show_list %}
+        <div class="show bf-{{ show.broadcastformat.slug }}">
+            <div class="show-abbrevs">
+{% for si in show.showinformation.all %}
+                <span title="{{ si.information }}" class="abbrev si-{{ si.abbrev }}"><span>{{ si.abbrev }}</span></span>
+{% endfor %}
+{% for st in show.showtopic.all %}
+                <span title="{{ st.topic }}" class="abbrev st-{{ st.abbrev }}"><span>{{ st.abbrev }}</span></span>
+{% endfor %}
+{% for mf in show.musicfocus.all %}
+                <span title="{{ mf.focus }}" class="abbrev mf-{{ mf.abbrev }}"><span>{{ mf.abbrev }}</span></span>
+{% endfor %}
             </div>
-        {% endfor %}
+            <div class="show-detail">
+                <h3 class="show-title"><a href="/program/shows/{{ show.slug }}">{{ show.name }}</a></h3>
+                <ul class="show-programslots">
+{% for programslot in show.active_program_slots %}
+                    <li class="show-programslot">{{ programslot }}</li>
+{% endfor %}
+                </ul>
+                <p class="show-description">{{ show.short_description }}</p>
+            </div>
+        </div>
+{% endfor %}
     </div>
-
 </div>
 
 </body>
diff --git a/program/templates/v2/timeslot_detail.html b/program/templates/v2/timeslot_detail.html
index b959b50..c56d797 100644
--- a/program/templates/v2/timeslot_detail.html
+++ b/program/templates/v2/timeslot_detail.html
@@ -10,46 +10,46 @@
         <h1 id="name">
             <a href="/program/shows/{{ timeslot.show.slug }}">{{ timeslot.show.name }}</a>
         </h1>
-        {% if timeslot.note %}
-            <h2>{{ timeslot.note.title }}</h2>
-        {% endif %}
+{% if timeslot.note %}
+        <h2>{{ timeslot.note.title }}</h2>
+{% endif %}
         <strong>Sendung am {{ timeslot.start|date:"d.m.Y 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 %}
+{% 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>
-    {% endif %}
+{% if timeslot.note %}
+    <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>
-    {% endif %}
+{% if timeslot.show.description %}
+    <div id="description">{{ timeslot.show.description|safe }}</div>
+{% endif %}
 
     <p>
-        {% for host in timeslot.show.hosts.all %}
-            <a href="/program/hosts/{{ 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 %}
+{% for host in timeslot.show.hosts.all %}
+        <a href="/program/hosts/{{ 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 %}
     </p>
 </div>