From a5913f48176214eaf9a5c6a851701e57a2d9609d Mon Sep 17 00:00:00 2001 From: Ernesto Rico Schmidt Date: Wed, 9 Sep 2020 18:12:24 -0400 Subject: Fix week schedule, remove dead code diff --git a/program/templates/week_schedule_timeslot.html b/program/templates/week_schedule_timeslot.html index 532f750..693f5f9 100644 --- a/program/templates/week_schedule_timeslot.html +++ b/program/templates/week_schedule_timeslot.html @@ -6,12 +6,6 @@ {% endif %} -{% if forloop.first and timeslot.start == timeslot.get_next_by_start.end and timeslot.start != "06:00" %} -
-
{{ timeslot.show.name }}
-
-{% endif %} - {% if forloop.first and timeslot.start != "06:00" and timeslot.show == default_show %}
{{ timeslot.show.name }}
@@ -19,21 +13,24 @@ {% endif %} {% if forloop.first and timeslot.start != "06:00" and timeslot.show != default_show %} + {% if timeslot.end.hour > timeslot.start.hour %} -{% endif %} - -{% if forloop.first and timeslot.end != timeslot.get_next_by_start.start %} -
-
{{ default_show.name }}
+ {% else %} + + {% endif %} {% endif %} - {% if not forloop.first and not forloop.last %}
+ {% if timeslot.show == default_show %} +
{{ default_show.name }}
+ {% else %}
{{ timeslot.show.name }}
+ {% endif %}
{% if timeslot.end != timeslot.get_next_by_start.start %}
@@ -44,14 +41,20 @@ {% if forloop.last and timeslot.end != "06:00" and timeslot.show == default_show %}
- +
{{ default_show.name }}
{% endif %} {% if forloop.last and timeslot.end != "06:00" and timeslot.show != default_show %} + {% if timeslot.end.hour < timeslot.start.hour %} + + {% else %} + {% endif %} {% endif %} {% if forloop.last and timeslot.end != timeslot.get_next_by_start.start %} -- cgit v0.10.2