summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorChristian Pointner <equinox@helsinki.at>2021-03-10 16:12:17 (GMT)
committerChristian Pointner <equinox@helsinki.at>2021-03-10 16:12:17 (GMT)
commit6ae0dfcd8caa8225cc196abda79c0275cf2e41c3 (patch)
tree8903f878fc9ed60f72c66396ee6024500cce92f5 /program
parent8c09d6f7c5d114c4ab381025025583293280abf3 (diff)
parent79ac160f239937bb4beb982e2cab2020d4eac9d1 (diff)
Merge branch 'new-homepage' into stable
Diffstat (limited to 'program')
-rw-r--r--program/templates/v2/day_schedule.html33
-rw-r--r--program/templates/v2/host_detail.html4
-rw-r--r--program/templates/v2/host_list.html2
-rw-r--r--program/templates/v2/recommendation_list.html13
-rw-r--r--program/templates/v2/show_detail.html17
-rw-r--r--program/templates/v2/show_list.html11
-rw-r--r--program/templates/v2/timeslot_detail.html8
7 files changed, 54 insertions, 34 deletions
diff --git a/program/templates/v2/day_schedule.html b/program/templates/v2/day_schedule.html
index 605d326..e97d5ad 100644
--- a/program/templates/v2/day_schedule.html
+++ b/program/templates/v2/day_schedule.html
@@ -12,15 +12,18 @@
{% 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">
+ <div class="show-categories">
{% for si in default_show.showinformation.all %}
- <span title="{{ si.information }}" class="abbrev 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 default_show.showtopic.all %}
- <span title="{{ st.topic }}" class="abbrev 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 default_show.musicfocus.all %}
- <span title="{{ mf.focus }}" class="abbrev 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 default_show.language.all %}
+ <span title="{{ lang.name }}/{{ lang.native_name }}" class="catetory category-lang lang-{{ lang.slug }}"><span>{{ lang.slug }}</span></span>
{% endfor %}
</div>
<div class="show-detail">
@@ -31,15 +34,18 @@
{% endif %}
<div class="timeslot bf-{{ timeslot.show.broadcastformat.slug }}">
<div class="show-start">{{ timeslot.start|date:"H:i" }}</div>
- <div class="show-abbrevs">
+ <div class="show-categories">
{% for si in timeslot.show.showinformation.all %}
- <span title="{{ si.information }}" class="abbrev 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 timeslot.show.showtopic.all %}
- <span title="{{ st.topic }}" class="abbrev 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 timeslot.show.musicfocus.all %}
- <span title="{{ mf.focus }}" class="abbrev 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 timeslot.show.language.all %}
+ <span title="{{ lang.name }}/{{ lang.native_name }}" class="catetory category-lang lang-{{ lang.slug }}"><span>{{ lang.slug }}</span></span>
{% endfor %}
</div>
<div class="show-detail">
@@ -54,15 +60,18 @@
{% 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">
+ <div class="show-categories">
{% for si in default_show.showinformation.all %}
- <span title="{{ si.information }}" class="abbrev 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 default_show.showtopic.all %}
- <span title="{{ st.topic }}" class="abbrev 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 default_show.musicfocus.all %}
- <span title="{{ mf.focus }}" class="abbrev 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 default_show.language.all %}
+ <span title="{{ lang.name }}/{{ lang.native_name }}" class="catetory category-lang lang-{{ lang.slug }}"><span>{{ lang.slug }}</span></span>
{% endfor %}
</div>
<div class="show-detail">
diff --git a/program/templates/v2/host_detail.html b/program/templates/v2/host_detail.html
index 792a0a3..0dff882 100644
--- a/program/templates/v2/host_detail.html
+++ b/program/templates/v2/host_detail.html
@@ -5,12 +5,12 @@
<body>
<div id="content-main" class="host-detail">
- <div id="name">{{ host.name }}</div>
+ <h1>{{ host.name }}</h1>
<div id="shows">
<div id="shows-title">Sendungen</div>
{% for show in host.active_shows %}
- <div class="show {{ show.broadcastformat.slug }}"><a href="/program/shows/{{ show.slug }}"> {{ show.name }}</a></div>
+ <div class="show bf-{{ show.broadcastformat.slug }}"><a href="/program/shows/{{ show.slug }}"> {{ show.name }}</a></div>
{% endfor %}
</div>
{% if host.email %}
diff --git a/program/templates/v2/host_list.html b/program/templates/v2/host_list.html
index 03b7c47..b2c1542 100644
--- a/program/templates/v2/host_list.html
+++ b/program/templates/v2/host_list.html
@@ -6,7 +6,7 @@
<div id="content-main" class="host-list">
<h1>Sendungsmachende A-Z</h1>
- <div class="host-list">
+ <div id="hosts">
{% for host in host_list %}
<div class="host"><a href="/program/hosts/{{ host.id }}">{{ host.name }}</a></div>
{% endfor %}
diff --git a/program/templates/v2/recommendation_list.html b/program/templates/v2/recommendation_list.html
index f668949..a2b6b54 100644
--- a/program/templates/v2/recommendation_list.html
+++ b/program/templates/v2/recommendation_list.html
@@ -4,20 +4,23 @@
</head>
<body>
-<div id="content-main" class="recommendations">
+<div id="content-main" class="recommendation-list">
<h1>Programmhinweise</h1>
<div id="shows">
{% for recommendation in recommendation_list %}
<div class="show recommendation bf-{{ recommendation.show.broadcastformat.slug }}">
- <div class="show-abbrevs">
+ <div class="show-categories">
{% for si in recommendation.show.showinformation.all %}
- <span title="{{ si.information }}" class="abbrev 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 recommendation.show.showtopic.all %}
- <span title="{{ st.topic }}" class="abbrev 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 recommendation.show.musicfocus.all %}
- <span title="{{ mf.focus }}" class="abbrev 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 recommendation.show.language.all %}
+ <span title="{{ lang.name }}/{{ lang.native_name }}" class="catetory category-lang lang-{{ lang.slug }}"><span>{{ lang.slug }}</span></span>
{% endfor %}
</div>
<div class="show-detail">
diff --git a/program/templates/v2/show_detail.html b/program/templates/v2/show_detail.html
index d0ac5a8..ded171e 100644
--- a/program/templates/v2/show_detail.html
+++ b/program/templates/v2/show_detail.html
@@ -6,9 +6,10 @@
<div id="content-main" class="show-detail">
+ <h1>{{ show.name }}</h1>
+
<div class="show-detail-header bf-{{ show.broadcastformat.slug }}">
<div class="show-details">
- <h1 id="name">{{ show.name }}</h1>
{% if show.id != 1 %}
<p id="programslots">
{% for slot in show.active_programslots %}
@@ -18,18 +19,22 @@
{% endif %}
</div>
- <div class="show-categorization">
- <p id="broadcastformat">{{ show.broadcastformat.format }}</p>
+ <div class="show-categories">
{% for si in show.showinformation.all %}
- <span title="{{ si.information }}" class="abbrev 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="abbrev 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="abbrev 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="catetory category-lang lang-{{ lang.slug }}"><span>{{ lang.slug }}</span></span>
{% endfor %}
</div>
+
+ <div id="broadcastformat">{{ show.broadcastformat.format }}</div>
</div>
<div id="short-description" class="documentDescription">{{ show.short_description }}</div>
diff --git a/program/templates/v2/show_list.html b/program/templates/v2/show_list.html
index eacb608..466cf77 100644
--- a/program/templates/v2/show_list.html
+++ b/program/templates/v2/show_list.html
@@ -10,15 +10,18 @@
<div id="shows">
{% for show in show_list %}
<div class="show bf-{{ show.broadcastformat.slug }}">
- <div class="show-abbrevs">
+ <div class="show-categories">
{% for si in show.showinformation.all %}
- <span title="{{ si.information }}" class="abbrev si-{{ si.abbrev }}"><span>{{ si.abbrev }}</span></span>
+ <span title="{{ si.information }}" class="category categor-si si-{{ si.abbrev }}"><span>{{ si.abbrev }}</span></span>
{% endfor %}
{% for st in show.showtopic.all %}
- <span title="{{ st.topic }}" class="abbrev st-{{ st.abbrev }}"><span>{{ st.abbrev }}</span></span>
+ <span title="{{ st.topic }}" class="category categor-st st-{{ st.abbrev }}"><span>{{ st.abbrev }}</span></span>
{% endfor %}
{% for mf in show.musicfocus.all %}
- <span title="{{ mf.focus }}" class="abbrev mf-{{ mf.abbrev }}"><span>{{ mf.abbrev }}</span></span>
+ <span title="{{ mf.focus }}" class="category categor-mf mf-{{ mf.abbrev }}"><span>{{ mf.abbrev }}</span></span>
+{% endfor %}
+{% for lang in show.language.all %}
+ <span title="{{ lang.name }}/{{ lang.native_name }}" class="catetory category-lang lang-{{ lang.slug }}"><span>{{ lang.slug }}</span></span>
{% endfor %}
</div>
<div class="show-detail">
diff --git a/program/templates/v2/timeslot_detail.html b/program/templates/v2/timeslot_detail.html
index 2d43fa8..d4ac952 100644
--- a/program/templates/v2/timeslot_detail.html
+++ b/program/templates/v2/timeslot_detail.html
@@ -16,16 +16,16 @@
<div class="show-categories">
{% for si in timeslot.show.showinformation.all %}
- <span title="{{ si.information }}" class="catetory si-{{ si.abbrev }}"><span>{{ si.abbrev }}</span></span>
+ <span title="{{ si.information }}" class="catetory catetory-si si-{{ si.abbrev }}"><span>{{ si.abbrev }}</span></span>
{% endfor %}
{% for st in timeslot.show.showtopic.all %}
- <span title="{{ st.topic }}" class="catetory st-{{ st.abbrev }}"><span>{{ st.abbrev }}</span></span>
+ <span title="{{ st.topic }}" class="catetory catetory-st st-{{ st.abbrev }}"><span>{{ st.abbrev }}</span></span>
{% endfor %}
{% for mf in timeslot.show.musicfocus.all %}
- <span title="{{ mf.focus }}" class="catetory mf-{{ mf.abbrev }}"><span>{{ mf.abbrev }}</span></span>
+ <span title="{{ mf.focus }}" class="catetory catetory-mf mf-{{ mf.abbrev }}"><span>{{ mf.abbrev }}</span></span>
{% endfor %}
{% for lang in timeslot.show.language.all %}
- <span title="{{ lang.name }}/{{ lang.native_name }}" class="catetory lang-{{ lang.slug }}"><span>{{ lang.slug }}</span></span>
+ <span title="{{ lang.name }}/{{ lang.native_name }}" class="catetory catetory-lang lang-{{ lang.slug }}"><span>{{ lang.slug }}</span></span>
{% endfor %}
</div>