Merge branch 'new-homepage' into stable

1 files changed, 53 insertions, 56 deletions

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>