From 7525ab4a03bfe3fa638f9998cdee93fbfe364853 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Wed, 3 Mar 2021 17:46:20 +0100 Subject: v2/templates: whitespace fixes 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 @@

{{ day|date:"l, d.m.Y" }}

- {% for timeslot in timeslots %} - {% if forloop.first and timeslot.start != timeslot.get_previous_by_start.end %} -
-
{{ timeslot.get_previous_by_start.end|date:"H:i" }}
-
- {% for si in default_show.showinformation.all %} - {{ si.abbrev }} - {% endfor %} - {% for st in default_show.showtopic.all %} - {{ st.abbrev }} - {% endfor %} - {% for mf in default_show.musicfocus.all %} - {{ mf.abbrev }} - {% endfor %} -
-
-

{{ default_show.name }}

-

{{ default_show.short_description }}

-
+{% for timeslot in timeslots %} +{% if forloop.first and timeslot.start != timeslot.get_previous_by_start.end %} +
+
{{ timeslot.get_previous_by_start.end|date:"H:i" }}
+
+{% for si in default_show.showinformation.all %} + {{ si.abbrev }} +{% endfor %} +{% for st in default_show.showtopic.all %} + {{ st.abbrev }} +{% endfor %} +{% for mf in default_show.musicfocus.all %} + {{ mf.abbrev }} +{% endfor %} +
+
+

{{ default_show.name }}

+

{{ default_show.short_description }}

- {% endif %} +
+{% endif %}
{{ timeslot.start|date:"H:i" }}
- {% for si in timeslot.show.showinformation.all %} - {{ si.abbrev }} - {% endfor %} - {% for st in timeslot.show.showtopic.all %} - {{ st.abbrev }} - {% endfor %} - {% for mf in timeslot.show.musicfocus.all %} - {{ mf.abbrev }} - {% endfor %} +{% for si in timeslot.show.showinformation.all %} + {{ si.abbrev }} +{% endfor %} +{% for st in timeslot.show.showtopic.all %} + {{ st.abbrev }} +{% endfor %} +{% for mf in timeslot.show.musicfocus.all %} + {{ mf.abbrev }} +{% endfor %}
-

{{ timeslot.show.name }}

- {% if timeslot.note %} -

Heute: {{ timeslot.note.title }}

- {% else %} -

{{ timeslot.show.short_description }}

- {% endif %} +

{{ timeslot.show.name }}

+{% if timeslot.note %} +

Heute: {{ timeslot.note.title }}

+{% else %} +

{{ timeslot.show.short_description }}

+{% endif %}
- {% if timeslot.end != timeslot.get_next_by_start.start %} -
-
{{ timeslot.end|date:"H:i" }}
-
- {% for si in default_show.showinformation.all %} - {{ si.abbrev }} - {% endfor %} - {% for st in default_show.showtopic.all %} - {{ st.abbrev }} - {% endfor %} - {% for mf in default_show.musicfocus.all %} - {{ mf.abbrev }} - {% endfor %} -
-
-

{{ default_show.name }}

-

{{ default_show.short_description }}

-
+{% if timeslot.end != timeslot.get_next_by_start.start %} +
+
{{ timeslot.end|date:"H:i" }}
+
+{% for si in default_show.showinformation.all %} + {{ si.abbrev }} +{% endfor %} +{% for st in default_show.showtopic.all %} + {{ st.abbrev }} +{% endfor %} +{% for mf in default_show.musicfocus.all %} + {{ mf.abbrev }} +{% endfor %} +
+
+

{{ default_show.name }}

+

{{ default_show.short_description }}

- {% endif %} - {% endfor %} +
+{% endif %} +{% endfor %}
diff --git a/program/templates/v2/host_detail.html b/program/templates/v2/host_detail.html index a224635..792a0a3 100644 --- a/program/templates/v2/host_detail.html +++ b/program/templates/v2/host_detail.html @@ -9,18 +9,16 @@
Sendungen
- {% for show in host.active_shows %} - - {% endfor %} +{% for show in host.active_shows %} + +{% endfor %}
- - {% if host.email %} -
E-Mail Adresse: {{ host.email }}
- {% endif %} - - {% if host.website %} - - {% endif %} +{% if host.email %} +
E-Mail Adresse: {{ host.email }}
+{% endif %} +{% if host.website %} + +{% endif %}
diff --git a/program/templates/v2/host_list.html b/program/templates/v2/host_list.html index 3d4663d..03b7c47 100644 --- a/program/templates/v2/host_list.html +++ b/program/templates/v2/host_list.html @@ -7,11 +7,9 @@

Sendungsmachende A-Z

- {% for host in host_list %} - - {% endfor %} +{% for host in host_list %} + +{% endfor %}
diff --git a/program/templates/v2/recommendation_list.html b/program/templates/v2/recommendation_list.html index c4da031..f668949 100644 --- a/program/templates/v2/recommendation_list.html +++ b/program/templates/v2/recommendation_list.html @@ -7,37 +7,34 @@

Programmhinweise

- {% for recommendation in recommendation_list %} -
-
- {% for si in recommendation.show.showinformation.all %} - {{ si.abbrev }} - {% endfor %} - {% for st in recommendation.show.showtopic.all %} - {{ st.abbrev }} - {% endfor %} - {% for mf in recommendation.show.musicfocus.all %} - {{ mf.abbrev }} - {% endfor %} -
-
-

- {{ recommendation.show.name }}
- vom {{ recommendation.start|date:"d.m. H:i" }}-{{ recommendation.end|date:"H:i" }} -

-

- {% if recommendation.note %} - {{ recommendation.note.title }} - {% else %} - {{ recommendation.show.broadcastformat.format }} - {% endif %} -

-
+{% for recommendation in recommendation_list %} +
+
+{% for si in recommendation.show.showinformation.all %} + {{ si.abbrev }} +{% endfor %} +{% for st in recommendation.show.showtopic.all %} + {{ st.abbrev }} +{% endfor %} +{% for mf in recommendation.show.musicfocus.all %} + {{ mf.abbrev }} +{% endfor %}
- {% endfor %} +
+

+ {{ recommendation.show.name }}
+ vom {{ recommendation.start|date:"d.m. H:i" }}-{{ recommendation.end|date:"H:i" }} +

+

+{% if recommendation.note %} + {{ recommendation.note.title }} +{% else %} + {{ recommendation.show.broadcastformat.format }} +{% endif %} +

+
+
+{% endfor %}
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 @@

{{ show.name }}

- {% if show.id != 1 %} -

- {% for slot in show.active_programslots %} - {{ slot }}
- {% endfor %} -

- {% endif %} +{% if show.id != 1 %} +

+{% for slot in show.active_programslots %} + {{ slot }}
+{% endfor %} +

+{% endif %}

{{ show.broadcastformat.format }}

- {% for si in show.showinformation.all %} - {{ si.abbrev }} - {% endfor %} - {% for st in show.showtopic.all %} - {{ st.abbrev }} - {% endfor %} - {% for mf in show.musicfocus.all %} - {{ mf.abbrev }} - {% endfor %} +{% for si in show.showinformation.all %} + {{ si.abbrev }} +{% endfor %} +{% for st in show.showtopic.all %} + {{ st.abbrev }} +{% endfor %} +{% for mf in show.musicfocus.all %} + {{ mf.abbrev }} +{% endfor %}
-
{{ show.short_description }}
- {% if show.description %} -
{{ show.description|safe }}
- {% endif %} +{% if show.description %} +
{{ show.description|safe }}
+{% endif %} - {% if show.image and show.image_enabled %} -
image
- {% endif %} +{% if show.image and show.image_enabled %} +
image
+{% endif %}

- {% for host in show.hosts.all %} - {{ host }}
- {% endfor %} - {% if show.email %} - Email: {{ show.email }}
- {% endif %} - {% if show.website %} - Website: {{ show.website }}
- {% endif %} +{% for host in show.hosts.all %} + {{ host }}
+{% endfor %} +{% if show.email %} + Email: {{ show.email }}
+{% endif %} +{% if show.website %} + Website: {{ show.website }}
+{% endif %}

- {% if show.notes.all %} -
-

Sendungstipps

-
diff --git a/program/templates/v2/show_list.html b/program/templates/v2/show_list.html index 56ecd21..eacb608 100644 --- a/program/templates/v2/show_list.html +++ b/program/templates/v2/show_list.html @@ -8,35 +8,31 @@

Sendungen A-Z

- {% for show in show_list %} -
-
- {% for si in show.showinformation.all %} - {{ si.abbrev }} - {% endfor %} - {% for st in show.showtopic.all %} - {{ st.abbrev }} - {% endfor %} - {% for mf in show.musicfocus.all %} - {{ mf.abbrev }} - {% endfor %} -
-
-

{{ show.name }}

-
    - {% for programslot in show.active_program_slots %} -
  • {{ programslot }}
  • - {% endfor %} -
-

{{ show.short_description }}

-
+{% for show in show_list %} +
+
+{% for si in show.showinformation.all %} + {{ si.abbrev }} +{% endfor %} +{% for st in show.showtopic.all %} + {{ st.abbrev }} +{% endfor %} +{% for mf in show.musicfocus.all %} + {{ mf.abbrev }} +{% endfor %}
- {% endfor %} +
+

{{ show.name }}

+
    +{% for programslot in show.active_program_slots %} +
  • {{ programslot }}
  • +{% endfor %} +
+

{{ show.short_description }}

+
+
+{% endfor %}
-
diff --git a/program/templates/v2/timeslot_detail.html b/program/templates/v2/timeslot_detail.html index b959b50..c56d797 100644 --- a/program/templates/v2/timeslot_detail.html +++ b/program/templates/v2/timeslot_detail.html @@ -10,46 +10,46 @@

{{ timeslot.show.name }}

- {% if timeslot.note %} -

{{ timeslot.note.title }}

- {% endif %} +{% if timeslot.note %} +

{{ timeslot.note.title }}

+{% endif %} Sendung am {{ timeslot.start|date:"d.m.Y H:i" }} bis {{ timeslot.end|date:"H:i" }}
- {% for si in timeslot.show.showinformation.all %} - {{ si.abbrev }} - {% endfor %} - {% for st in timeslot.show.showtopic.all %} - {{ st.abbrev }} - {% endfor %} - {% for mf in timeslot.show.musicfocus.all %} - {{ mf.abbrev }} - {% endfor %} +{% for si in timeslot.show.showinformation.all %} + {{ si.abbrev }} +{% endfor %} +{% for st in timeslot.show.showtopic.all %} + {{ st.abbrev }} +{% endfor %} +{% for mf in timeslot.show.musicfocus.all %} + {{ mf.abbrev }} +{% endfor %}

{{ timeslot.show.broadcastformat.format }}

- {% if timeslot.note %} -

{{ timeslot.note.content|safe }}

- {% endif %} +{% if timeslot.note %} +

{{ timeslot.note.content|safe }}

+{% endif %}
{{ timeslot.show.short_description }}
- {% if timeslot.show.description %} -
{{ timeslot.show.description|safe }}
- {% endif %} +{% if timeslot.show.description %} +
{{ timeslot.show.description|safe }}
+{% endif %}

- {% for host in timeslot.show.hosts.all %} - {{ host }}
- {% endfor %} - {% if timeslot.show.email %} - Email: {{ timeslot.show.email }}
- {% endif %} - {% if timeslot.show.website %} - Website: {{ timeslot.show.website }}
- {% endif %} +{% for host in timeslot.show.hosts.all %} + {{ host }}
+{% endfor %} +{% if timeslot.show.email %} + Email: {{ timeslot.show.email }}
+{% endif %} +{% if timeslot.show.website %} + Website: {{ timeslot.show.website }}
+{% endif %}

-- cgit v0.10.2