1 files changed, 44 insertions, 19 deletions
diff --git a/templates/program/week_schedule_timeslot.html b/templates/program/week_schedule_timeslot.html
index a2c452e..852466b 100644
--- a/templates/program/week_schedule_timeslot.html
+++ b/templates/program/week_schedule_timeslot.html
@@ -2,28 +2,53 @@
 
 {% if forloop.first and timeslot.start != timeslot.get_previous_by_start.end %}
 <div class="timeslot bf-{{ default_show.broadcastformat.slug }}" {% duration_until timeslot.start %}>
-  <div>
-    {{ default_show.name }}
-  </div>
+    <div>{{ default_show.name }}</div>
 </div>
 {% endif %}
+
+{% if forloop.first and timeslot.start == timeslot.get_next_by_start.end and timeslot.start != "06:00" %}
 <div class="timeslot bf-{{ timeslot.show.broadcastformat.slug }}" {% duration timeslot.start timeslot.end %}>
-  <div>
-    <a href="{% url timeslot-detail timeslot.id %}">{{ timeslot.show.name }}</a>
-  </div>
-</div>
-{% if timeslot.end != timeslot.get_next_by_start.start %}
-    {% if not forloop.last %}
-<div class="timeslot bf-{{ default_show.broadcastformat.slug }}" {% duration timeslot.end timeslot.get_next_by_start.start %}>
-  <div>
-    {{ default_show.name }}
-  </div>
-</div>
-    {% else %}
-<div class="timeslot bf-{{ default_show.broadcastformat.slug }}" {% duration_since timeslot.end %}>
-  <div>
-    {{ default_show.name }}
-  </div>
+    <div><a href="{% url timeslot-detail timeslot.id %}">{{ timeslot.show.name }}</a></div>
+</div>
+{% endif %}
+
+{% if forloop.first and timeslot.start != "06:00" and timeslot.show == default_show %}
+<div class="timeslot bf-{{ timeslot.show.broadcastformat.slug }}" {% duration_until timeslot.end %}>
+    <div><a href="{% url timeslot-detail timeslot.id %}">{{ timeslot.show.name }}</a> </div>
+</div>
+{% endif %}
+
+{% if forloop.first and timeslot.start != "06:00" and timeslot.show != default_show %}
+<div class="timeslot bf-{{ timeslot.show.broadcastformat.slug }}" {% duration timeslot.start timeslot.end %}>
+    <div><a href="{% url timeslot-detail timeslot.id %}">{{ timeslot.show.name }}</a> </div>
 </div>
+{% endif %}
+
+{% if not forloop.first and not forloop.last %}
+<div class="timeslot bf-{{ timeslot.show.broadcastformat.slug }}" {% duration timeslot.start timeslot.end %}>
+    <div><a href="{% url timeslot-detail timeslot.id %}">{{ timeslot.show.name }}</a></div>
+</div>
+    {% if timeslot.end != timeslot.get_next_by_start.start %}
+    <div class="timeslot bf-{{ default_show.broadcastformat.slug }}" {% duration timeslot.end timeslot.get_next_by_start.start %}>
+        <div>{{ default_show.name }}</div>
+    </div>
     {% endif %}
 {% endif %}
+
+{% if forloop.last and timeslot.end != "06:00" and timeslot.show == default_show %}
+<div class="timeslot bf-{{ timeslot.show.broadcastformat.slug }}" {% duration_since timeslot.start %}>
+    <div><a href="{% url timeslot-detail timeslot.id %}">{{ timeslot.show.name }}</a> </div>
+</div>
+{% endif %}
+
+{% if forloop.last and timeslot.end != "06:00" and timeslot.show != default_show %}
+<div class="timeslot bf-{{ timeslot.show.broadcastformat.slug }}" {% duration timeslot.start timeslot.end %}>
+    <div><a href="{% url timeslot-detail timeslot.id %}">{{ timeslot.show.name }}</a> </div>
+</div>
+{% endif %}
+
+{% if forloop.last and timeslot.end != timeslot.get_next_by_start.start %}
+<div class="timeslot bf-{{ default_show.broadcastformat.slug }}" {% duration_since timeslot.end %}>
+    <div>{{ default_show.name }}</div>
+</div>
+{% endif  %}