Merge branch 'new-homepage' into stable

1 files changed, 27 insertions, 27 deletions

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>