Merge branch 'new-homepage' into stable

1 files changed, 55 insertions, 61 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>