diff options
author | Christian Pointner <equinox@helsinki.at> | 2021-03-10 16:29:39 (GMT) |
---|---|---|
committer | Christian Pointner <equinox@helsinki.at> | 2021-03-10 16:29:39 (GMT) |
commit | c1eb263c6831f2cbb18c665d4d0a07da3c219470 (patch) | |
tree | 23109a4ff7cca2503cf70263f15fffe23d5e83c4 /program | |
parent | 6ae0dfcd8caa8225cc196abda79c0275cf2e41c3 (diff) | |
parent | ecc2c7362fb0517654e79e11deb80539d4395652 (diff) |
Merge branch 'new-homepage' into stable
Diffstat (limited to 'program')
-rw-r--r-- | program/templates/v2/day_schedule.html | 8 | ||||
-rw-r--r-- | program/templates/v2/host_list.html | 1 | ||||
-rw-r--r-- | program/templates/v2/recommendation_list.html | 3 | ||||
-rw-r--r-- | program/templates/v2/show_detail.html | 3 | ||||
-rw-r--r-- | program/templates/v2/show_list.html | 2 | ||||
-rw-r--r-- | program/templates/v2/timeslot_detail.html | 9 |
6 files changed, 13 insertions, 13 deletions
diff --git a/program/templates/v2/day_schedule.html b/program/templates/v2/day_schedule.html index e97d5ad..113705d 100644 --- a/program/templates/v2/day_schedule.html +++ b/program/templates/v2/day_schedule.html @@ -5,7 +5,7 @@ <body> <div id="content-main" class="day-schedule"> - <h1 id="date">{{ day|date:"l, d.m.Y" }}</h1> + <h1>{{ day|date:"l, d.m.Y" }}</h1> <div id="timeslots"> {% for timeslot in timeslots %} @@ -23,7 +23,7 @@ <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> + <span title="{{ lang.name }}/{{ lang.native_name }}" class="category category-lang lang-{{ lang.slug }}"><span>{{ lang.slug }}</span></span> {% endfor %} </div> <div class="show-detail"> @@ -45,7 +45,7 @@ <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> + <span title="{{ lang.name }}/{{ lang.native_name }}" class="category category-lang lang-{{ lang.slug }}"><span>{{ lang.slug }}</span></span> {% endfor %} </div> <div class="show-detail"> @@ -71,7 +71,7 @@ <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> + <span title="{{ lang.name }}/{{ lang.native_name }}" class="category category-lang lang-{{ lang.slug }}"><span>{{ lang.slug }}</span></span> {% endfor %} </div> <div class="show-detail"> diff --git a/program/templates/v2/host_list.html b/program/templates/v2/host_list.html index b2c1542..b8a4677 100644 --- a/program/templates/v2/host_list.html +++ b/program/templates/v2/host_list.html @@ -6,6 +6,7 @@ <div id="content-main" class="host-list"> <h1>Sendungsmachende A-Z</h1> + <div id="hosts"> {% for host in host_list %} <div class="host"><a href="/program/hosts/{{ host.id }}">{{ host.name }}</a></div> diff --git a/program/templates/v2/recommendation_list.html b/program/templates/v2/recommendation_list.html index a2b6b54..c98cd72 100644 --- a/program/templates/v2/recommendation_list.html +++ b/program/templates/v2/recommendation_list.html @@ -6,6 +6,7 @@ <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 }}"> @@ -20,7 +21,7 @@ <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> + <span title="{{ lang.name }}/{{ lang.native_name }}" class="category 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 ded171e..0041cfa 100644 --- a/program/templates/v2/show_detail.html +++ b/program/templates/v2/show_detail.html @@ -5,7 +5,6 @@ <body> <div id="content-main" class="show-detail"> - <h1>{{ show.name }}</h1> <div class="show-detail-header bf-{{ show.broadcastformat.slug }}"> @@ -30,7 +29,7 @@ <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> + <span title="{{ lang.name }}/{{ lang.native_name }}" class="category category-lang lang-{{ lang.slug }}"><span>{{ lang.slug }}</span></span> {% endfor %} </div> diff --git a/program/templates/v2/show_list.html b/program/templates/v2/show_list.html index 466cf77..8455425 100644 --- a/program/templates/v2/show_list.html +++ b/program/templates/v2/show_list.html @@ -21,7 +21,7 @@ <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> + <span title="{{ lang.name }}/{{ lang.native_name }}" class="category 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 d4ac952..cbb3559 100644 --- a/program/templates/v2/timeslot_detail.html +++ b/program/templates/v2/timeslot_detail.html @@ -5,7 +5,6 @@ <body> <div id="content-main" class="timeslot-detail"> - <h1><a href="/program/shows/{{ timeslot.show.slug }}">{{ timeslot.show.name }}</a></h1> <div class="show-detail-header bf-{{ timeslot.show.broadcastformat.slug }}"> @@ -16,16 +15,16 @@ <div class="show-categories"> {% for si in timeslot.show.showinformation.all %} - <span title="{{ si.information }}" class="catetory catetory-si 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="catetory catetory-st 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="catetory catetory-mf 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 catetory-lang lang-{{ lang.slug }}"><span>{{ lang.slug }}</span></span> + <span title="{{ lang.name }}/{{ lang.native_name }}" class="category category-lang lang-{{ lang.slug }}"><span>{{ lang.slug }}</span></span> {% endfor %} </div> |