Merge branch 'new-homepage' into stable

1 files changed, 36 insertions, 34 deletions

diff --git a/program/templates/v2/show_detail.html b/program/templates/v2/show_detail.html
index 0041cfa..55f7f3b 100644
--- a/program/templates/v2/show_detail.html
+++ b/program/templates/v2/show_detail.html
@@ -7,80 +7,82 @@
 <div id="content-main" class="show-detail">
     <h1>{{ show.name }}</h1>
 
-    <div class="show-detail-header bf-{{ show.broadcastformat.slug }}">
-        <div class="show-details">
+    <div class="show">
+        <div class="show-detail-header bf-{{ show.broadcastformat.slug }}">
+            <div class="show-details">
 {% if show.id != 1 %}
-            <p id="programslots">
+                <p id="programslots">
 {%   for slot in show.active_programslots %}
-               <span class="programslot">{{ slot }}</span><br/>
+                   <span class="programslot">{{ slot }}</span><br/>
 {%   endfor %}
-            </p>
+                </p>
 {% endif %}
-        </div>
+            </div>
 
-        <div class="show-categories">
+            <div class="show-categories">
 {% for si in show.showinformation.all %}
-            <span title="{{ si.information }}" class="category category-si si-{{ si.abbrev }}"><span>{{ si.abbrev }}</span></span>
+                <span title="{{ si.information }}" class="category category-si si-{{ si.abbrev }}"><span>{{ si.abbrev }}</span></span>
 {% endfor %}
 {% for st in show.showtopic.all %}
-            <span title="{{ st.topic }}" class="category category-st st-{{ st.abbrev }}"><span>{{ st.abbrev }}</span></span>
+                <span title="{{ st.topic }}" class="category category-st st-{{ st.abbrev }}"><span>{{ st.abbrev }}</span></span>
 {% endfor %}
 {% for mf in show.musicfocus.all %}
-            <span title="{{ mf.focus }}" class="category category-mf mf-{{ mf.abbrev }}"><span>{{ mf.abbrev }}</span></span>
+                <span title="{{ mf.focus }}" class="category category-mf mf-{{ mf.abbrev }}"><span>{{ mf.abbrev }}</span></span>
 {% endfor %}
 {% for lang in show.language.all %}
-            <span title="{{ lang.name }}/{{ lang.native_name }}" class="category category-lang lang-{{ lang.slug }}"><span>{{ lang.slug }}</span></span>
+                <span title="{{ lang.name }}/{{ lang.native_name }}" class="category category-lang lang-{{ lang.slug }}"><span>{{ lang.slug }}</span></span>
 {% endfor %}
-        </div>
+            </div>
 
-        <div id="broadcastformat">{{ show.broadcastformat.format }}</div>
-    </div>
+            <div id="broadcastformat">{{ show.broadcastformat.format }}</div>
+        </div>
 
-    <div id="short-description" class="documentDescription">{{ show.short_description }}</div>
+        <div id="short-description" class="documentDescription">{{ show.short_description }}</div>
 
 {% if show.description %}
-    <div id="description">{{ show.description|safe }}</div>
+        <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>
+        <div id="image" style="float: right;"><img src="/program/static/{{ show.image }}" width="200" alt="image"></div>
 {% endif %}
 
-    <p>
+        <p>
 {% for host in show.hosts.all %}
-        <a href="/program/hosts/{{ host.id }}">{{ host }}</a><br/>
+            <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/>
+            <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/>
+            <strong>Website:</strong> <a href="{{ show.website }}">{{ show.website }}</a><br/>
 {% endif %}
-    </p>
+        </p>
 
 {% if show.notes.all %}
-    <br/>
-    <h2>Sendungstipps</h2>
-    <ul class="recommendations-list">
+        <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>
+            <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>
+            <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>
+            <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 %}
+    </div>
 </div>
 
 </body>