diff options
19 files changed, 166 insertions, 228 deletions
diff --git a/program/templates/v2/boxes/broadcastformat.html b/program/templates/v2/boxes/broadcastformat.html deleted file mode 100644 index 8118cdb..0000000 --- a/program/templates/v2/boxes/broadcastformat.html +++ /dev/null @@ -1,11 +0,0 @@ -{% if broadcastformat_list %} - <dl id="broadcastformat" class="portlet"> - <dt class="portletHeader"><span>Legende</span></dt> - {% for bf in broadcastformat_list %} - <dd class="portletItem bcformat bf-{{ bf.slug }}"> - <a title="Sendungen mit dem Sendungsformat {{ bf.format }} anzeigen." - href="?broadcastformat={{ bf.slug }}">{{ bf.format }}</a> - </dd> - {% endfor %} - </dl> -{% endif %} diff --git a/program/templates/v2/boxes/current.html b/program/templates/v2/boxes/current.html deleted file mode 100644 index 0ac5179..0000000 --- a/program/templates/v2/boxes/current.html +++ /dev/null @@ -1,65 +0,0 @@ -<!doctype html> -<html> -<head> - <meta charset="utf-8"/> - <title>Current program box</title> -</head> -<body> -{% if previous_timeslot or current_timeslot or next_timeslot or after_next_timeslot %} - <dl id="program-current-box" class="portlet program-box"> - <dt class="portletHeader">Programm derzeit</dt> - <dd class="portletItem"> - <table> - <tr class="previous"> - <td class="start">{{ previous_timeslot.start|date:"H:i" }}</td> - <td class="format bf-{{ previous_timeslot.show.broadcastformat.slug }}" - title="{{ previous_timeslot.show.broadcastformat.format }}"> </td> - <td class="show"> - <h3> - <a href="{% url "timeslot-detail" previous_timeslot.id %}">{{ previous_timeslot.show.name }}</a> - </h3> - </td> - <td class="show"></td> - </tr> - <tr class="current"> - <td class="start">{{ current_timeslot.start|date:"H:i" }}</td> - <td class="format bf-{{ current_timeslot.show.broadcastformat.slug }}" - title="{{ current_timeslot.show.broadcastformat.format }}">▶</td> - <td class="show"> - <h3> - <a href="{% url "timeslot-detail" current_timeslot.id %}">{{ current_timeslot.show.name }}</a> - </h3> - {% if current_timeslot.note %} - <p>{{ current_timeslot.note.title }}</p> - {% else %} - <p>{{ current_timeslot.show.short_description }}</p> - {% endif %} - </td> - </tr> - <tr class="next"> - <td class="start">{{ next_timeslot.start|date:"H:i" }}</td> - <td class="format bf-{{ next_timeslot.show.broadcastformat.slug }}" - title="{{ next_timeslot.show.broadcastformat.format }}"> </td> - <td class="show"> - <h3><a href="{% url "timeslot-detail" next_timeslot.id %}">{{ next_timeslot.show.name }}</a> - </h3> - </td> - <td class="show"></td> - </tr> - <tr class="after_next"> - <td class="start">{{ after_next_timeslot.start|date:"H:i" }}</td> - <td class="format bf-{{ after_next_timeslot.show.broadcastformat.slug }}" - title="{{ after_next_timeslot.show.broadcastformat.format }}"> </td> - <td class="show"> - <h3> - <a href="{% url "timeslot-detail" after_next_timeslot.id %}">{{ after_next_timeslot.show.name }}</a> - </h3> - </td> - <td class="show"></td> - </tr> - </table> - </dd> - </dl> -{% endif %} -</body> -</html> diff --git a/program/templates/v2/boxes/language.html b/program/templates/v2/boxes/language.html deleted file mode 100644 index 050c342..0000000 --- a/program/templates/v2/boxes/language.html +++ /dev/null @@ -1,15 +0,0 @@ -{% if language_list %} - <dl id="filterbox_language" class="portlet filterbox"> - <dt class="portletHeader"><span>Sprache<span></dt> - <dd class="portletItem"> - <ul> - {% for language in language_list %} - <li> - <a title="Sendungen auf {{ language.name }} anzeigen." - href="?language={{ language.slug }}">{{ language.name }}/{{ language.native_name }}</a> - </li> - {% endfor %} - </ul> - </dd> - </dl> -{% endif %} diff --git a/program/templates/v2/boxes/musicfocus.html b/program/templates/v2/boxes/musicfocus.html deleted file mode 100644 index 021185b..0000000 --- a/program/templates/v2/boxes/musicfocus.html +++ /dev/null @@ -1,15 +0,0 @@ -{% if musicfocus_list %} - <dl id="filterbox_musicfocus" class="portlet filterbox"> - <dt class="portletHeader"><span>Musiktendenz<span></dt> - <dd class="portletItem"> - <ul> - {% for mf in musicfocus_list %} - <li> - <a title="Sendungen mit der Musiktendenz {{ mf.focus }} anzeigen." - class="abbrev mf-{{ mf.abbrev }}" href="?musicfocus={{ mf.slug }}">{{ mf.focus }}</a> - </li> - {% endfor %} - </ul> - </dd> - </dl> -{% endif %} diff --git a/program/templates/v2/boxes/recommendation.html b/program/templates/v2/boxes/recommendation.html deleted file mode 100644 index 3f4429e..0000000 --- a/program/templates/v2/boxes/recommendation.html +++ /dev/null @@ -1,39 +0,0 @@ -<!doctype html> -<html> -<head> - <meta charset="utf-8"/> - <title>Recomendations box</title> -</head> -<body> -{% if recommendation_list %} - <dl id="recommendations" class="portlet program-box"> - <dt class="portletHeader">Programmhinweise</dt> - <dd class="portletItem"> - <table> - {% for recommendation in recommendation_list %} - <tr> - <td class="start"> </td> - <td class="format bf-{{ recommendation.show.broadcastformat.slug }}" - title="{{ recommendation.show.broadcastformat.format }}"> </td> - <td class="show"> - {{ recommendation.start|date:"d.m. H:i" }} - {{ recommendation.end|date:"H:i" }}<br/> - <h3> - <a href="{% url "timeslot-detail" recommendation.id %}">{{ recommendation.show.name }}</a> - </h3> - <p class="note-title"> - {% if recommendation.note %} - {{ recommendation.note.title }}<br/> - {% else %} - {{ recommendation.show.broadcastformat.format }}<br/> - {% endif %} - <a href="{% url "timeslot-detail" recommendation.id %}">[weiter]</a> - </p> - </td> - </tr> - {% endfor %} - </table> - </dd> - </dl> -{% endif %} -</body> -</html> diff --git a/program/templates/v2/boxes/showinformation.html b/program/templates/v2/boxes/showinformation.html deleted file mode 100644 index dbbe60d..0000000 --- a/program/templates/v2/boxes/showinformation.html +++ /dev/null @@ -1,16 +0,0 @@ -{% if showinformation_list %} - <dl id="filterbox_showinformation" class="portlet filterbox"> - <dt class="portletHeader"><span>Sendungsinfo<span></dt> - <dd class="portletItem"> - <ul> - {% for si in showinformation_list %} - <li> - <a title="Sendungen mit der Information {{ si.information }} anzeigen." - class="abbrev si-{{ si.abbrev }}" - href="?showinformation={{ si.slug }}">{{ si.information }}</a> - </li> - {% endfor %} - </ul> - </dd> - </dl> -{% endif %} diff --git a/program/templates/v2/boxes/showtopic.html b/program/templates/v2/boxes/showtopic.html deleted file mode 100644 index 93e873a..0000000 --- a/program/templates/v2/boxes/showtopic.html +++ /dev/null @@ -1,16 +0,0 @@ -{% if showtopic_list %} - <dl id="filterbox_showtopic" class="portlet filterbox"> - <dt class="portletHeader"><span>Thema / Schwerpunkt<span></dt> - <dd class="portletItem"> - <ul> - {% for showtopic in showtopic_list %} - <li> - <a title="Sendungen mit dem Schwerpunkt {{ showtopic.topic }} anzeigen." - class="abbrev st-{{ showtopic.abbrev }}" - href="?showtopic={{ showtopic.slug }}">{{ showtopic.topic }}</a> - </li> - {% endfor %} - </ul> - </dd> - </dl> -{% endif %} diff --git a/program/templates/v2/current_show.html b/program/templates/v2/current_show.html new file mode 100644 index 0000000..3ffe8c4 --- /dev/null +++ b/program/templates/v2/current_show.html @@ -0,0 +1,56 @@ +<!doctype html> +<html> +<head> + <meta charset="utf-8"/> + <title>Current program box</title> +</head> +<body> + <ul> +{% if previous_timeslot %} + <li id="previous" class="bf-{{ previous_timeslot.show.broadcastformat.slug }}"> + <div class="time">{{ previous_timeslot.start|date:"H:i" }}</div> + <div class="show-name"> + <a href="{% url "timeslot-detail" previous_timeslot.id %}">{{ previous_timeslot.show.name }}</a> + </div> + <div class="show-content"> + </div> + </li> +{% endif %} +{% if current_timeslot %} + <li id="current" class="bf-{{ current_timeslot.show.broadcastformat.slug }}"> + <div class="time">{{ current_timeslot.start|date:"H:i" }}</div> + <div class="show-name"> + <a href="{% url "timeslot-detail" current_timeslot.id %}">{{ current_timeslot.show.name }}</a> + </div> + <div class="show-content"> +{% if current_timeslot.note %} + {{ current_timeslot.note.title }} +{% else %} + {{ current_timeslot.show.short_description }} +{% endif %} + </div> + </li> +{% endif %} +{% if next_timeslot %} + <li id="next" class="bf-{{ next_timeslot.show.broadcastformat.slug }}"> + <div class="time">{{ next_timeslot.start|date:"H:i" }}</div> + <div class="show-name"> + <a href="{% url "timeslot-detail" next_timeslot.id %}">{{ next_timeslot.show.name }}</a> + </div> + <div class="show-content"> + </div> + </li> +{% endif %} +{% if after_next_timeslot %} + <li id="after_next" class="bf-{{ after_next_timeslot.show.broadcastformat.slug }}"> + <div class="timer">{{ after_next_timeslot.start|date:"H:i" }}</div> + <div class="show-name"> + <a href="{% url "timeslot-detail" after_next_timeslot.id %}">{{ after_next_timeslot.show.name }}</a> + </div> + <div class="show-content"> + </div> + </li> +{% endif %} + </ul> +</body> +</html> diff --git a/program/templates/v2/day_schedule.html b/program/templates/v2/day_schedule.html index 7bab98e..ceb0bee 100644 --- a/program/templates/v2/day_schedule.html +++ b/program/templates/v2/day_schedule.html @@ -4,7 +4,7 @@ </head> <body> -{% load content_boxes %} +{% load filters %} <div id="filter-format"> {% broadcastformatV2 %} </div> diff --git a/program/templates/v2/filters/broadcastformat.html b/program/templates/v2/filters/broadcastformat.html new file mode 100644 index 0000000..922c99c --- /dev/null +++ b/program/templates/v2/filters/broadcastformat.html @@ -0,0 +1,6 @@ +{% if broadcastformat_list %} + <ul id="filter_broadcastformat"> +{% for bf in broadcastformat_list %} + <li><a title="Sendungen mit dem Sendungsformat {{ bf.format }} anzeigen." href="?broadcastformat={{ bf.slug }}">{{ bf.format }}</a></li>{% endfor %} + </ul> +{% endif %} diff --git a/program/templates/v2/filters/language.html b/program/templates/v2/filters/language.html new file mode 100644 index 0000000..c79122f --- /dev/null +++ b/program/templates/v2/filters/language.html @@ -0,0 +1,6 @@ +{% if language_list %} + <ul id="filter_language"> +{% for language in language_list %} + <li><a title="Sendungen auf {{ language.name }} anzeigen." href="?language={{ language.slug }}">{{ language.name }}/{{ language.native_name }}</a></li>{% endfor %} + </ul> +{% endif %} diff --git a/program/templates/v2/filters/musicfocus.html b/program/templates/v2/filters/musicfocus.html new file mode 100644 index 0000000..99bbb20 --- /dev/null +++ b/program/templates/v2/filters/musicfocus.html @@ -0,0 +1,6 @@ +{% if musicfocus_list %} + <ul id="filter_musicfocus"> +{% for mf in musicfocus_list %} + <li><a title="Sendungen mit der Musiktendenz {{ mf.focus }} anzeigen." class="abbrev mf-{{ mf.abbrev }}" href="?musicfocus={{ mf.slug }}">{{ mf.focus }}</a></li>{% endfor %} + </ul> +{% endif %} diff --git a/program/templates/v2/filters/showinformation.html b/program/templates/v2/filters/showinformation.html new file mode 100644 index 0000000..bcd6cb1 --- /dev/null +++ b/program/templates/v2/filters/showinformation.html @@ -0,0 +1,6 @@ +{% if showinformation_list %} + <ul id="filter_showinformation"> +{% for si in showinformation_list %} + <li><a title="Sendungen mit der Information {{ si.information }} anzeigen." href="?showinformation={{ si.slug }}">{{ si.information }}</a></li>{% endfor %} + </ul> +{% endif %} diff --git a/program/templates/v2/filters/showtopic.html b/program/templates/v2/filters/showtopic.html new file mode 100644 index 0000000..070d82a --- /dev/null +++ b/program/templates/v2/filters/showtopic.html @@ -0,0 +1,6 @@ +{% if showtopic_list %} + <ul id="filter_showtopic"> +{% for showtopic in showtopic_list %} + <li><a title="Sendungen mit dem Schwerpunkt {{ showtopic.topic }} anzeigen." href="?showtopic={{ showtopic.slug }}">{{ showtopic.topic }}</a></li>{% endfor %} + </ul> +{% endif %} diff --git a/program/templates/v2/recommendation.html b/program/templates/v2/recommendation.html new file mode 100644 index 0000000..36b7c02 --- /dev/null +++ b/program/templates/v2/recommendation.html @@ -0,0 +1,28 @@ +<!doctype html> +<html> +<head> + <meta charset="utf-8"/> + <title>Recomendations box</title> +</head> +<body> + <ul> +{% for recommendation in recommendation_list %} + <li class="bf-{{ recommendation.show.broadcastformat.slug }}"> + <div class="time">{{ recommendation.start|date:"d.m. H:i" }} - {{ recommendation.end|date:"H:i" }}</td> + <div class="show-name"> + <a href="{% url "timeslot-detail" recommendation.id %}">{{ recommendation.show.name }}</a> + </div> + <div class="show-content"> +{% if recommendation.note %} + {{ recommendation.note.title }} +{% else %} + {{ recommendation.show.short_description }} +{% endif %} + <br/> + <a href="{% url "timeslot-detail" recommendation.id %}">[weiter]</a> + </div> + </li> +{% endfor %} + </ul> +</body> +</html> diff --git a/program/templates/v2/show_list.html b/program/templates/v2/show_list.html index 1115a41..6d9d35d 100644 --- a/program/templates/v2/show_list.html +++ b/program/templates/v2/show_list.html @@ -4,7 +4,7 @@ </head> <body> -{% load content_boxes %} +{% load filters %} <div id="filter-format"> {% broadcastformatV2 %} </div> diff --git a/program/templatetags/content_boxes.py b/program/templatetags/content_boxes.py index f979ca2..ece466b 100644 --- a/program/templatetags/content_boxes.py +++ b/program/templatetags/content_boxes.py @@ -5,8 +5,6 @@ from program.models import BroadcastFormat, MusicFocus, ShowInformation, ShowTop register = template.Library() -# Legacy Tags for Homepage until 2021 - @register.inclusion_tag('boxes/broadcastformat.html') def broadcastformat(): return {'broadcastformat_list': BroadcastFormat.objects.filter(enabled=True)} @@ -30,30 +28,3 @@ def showtopic(): @register.inclusion_tag('boxes/language.html') def language(): return {'language_list': Language.objects.all()} - - -# V2 Tags added for new Homepage 2021 - -@register.inclusion_tag('v2/boxes/broadcastformat.html') -def broadcastformatV2(): - return {'broadcastformat_list': BroadcastFormat.objects.filter(enabled=True)} - - -@register.inclusion_tag('v2/boxes/musicfocus.html') -def musicfocusV2(): - return {'musicfocus_list': MusicFocus.objects.all()} - - -@register.inclusion_tag('v2/boxes/showinformation.html') -def showinformationV2(): - return {'showinformation_list': ShowInformation.objects.all()} - - -@register.inclusion_tag('v2/boxes/showtopic.html') -def showtopicV2(): - return {'showtopic_list': ShowTopic.objects.all()} - - -@register.inclusion_tag('v2/boxes/language.html') -def languageV2(): - return {'language_list': Language.objects.all()} diff --git a/program/templatetags/filters.py b/program/templatetags/filters.py new file mode 100644 index 0000000..811216b --- /dev/null +++ b/program/templatetags/filters.py @@ -0,0 +1,30 @@ +from django import template + +from program.models import BroadcastFormat, MusicFocus, ShowInformation, ShowTopic, Language + +register = template.Library() + + +@register.inclusion_tag('v2/filters/broadcastformat.html') +def broadcastformatV2(): + return {'broadcastformat_list': BroadcastFormat.objects.filter(enabled=True)} + + +@register.inclusion_tag('v2/filters/musicfocus.html') +def musicfocusV2(): + return {'musicfocus_list': MusicFocus.objects.all()} + + +@register.inclusion_tag('v2/filters/showinformation.html') +def showinformationV2(): + return {'showinformation_list': ShowInformation.objects.all()} + + +@register.inclusion_tag('v2/filters/showtopic.html') +def showtopicV2(): + return {'showtopic_list': ShowTopic.objects.all()} + + +@register.inclusion_tag('v2/filters/language.html') +def languageV2(): + return {'language_list': Language.objects.all()} diff --git a/program/views.py b/program/views.py index ab7bd82..2a7609c 100644 --- a/program/views.py +++ b/program/views.py @@ -259,8 +259,26 @@ class RecommendationsListViewV2(ListView): start__range=(now, end))).order_by('start')[:20] -class RecommendationsBoxViewV2(RecommendationsListView): - template_name = 'v2/boxes/recommendation.html' +class RecommendationsBoxViewV2(RecommendationsListViewV2): + template_name = 'v2/recommendation.html' + + +class CurrentShowBoxViewV2(TemplateView): + context_object_name = 'recommendation_list' + template_name = 'v2/current_show.html' + + def get_context_data(self, **kwargs): + current_timeslot = TimeSlot.objects.get_or_create_current() + previous_timeslot = current_timeslot.get_previous_by_start() + next_timeslot = current_timeslot.get_next_by_start() + after_next_timeslot = next_timeslot.get_next_by_start() + + context = super(CurrentShowBoxViewV2, self).get_context_data(**kwargs) + context['current_timeslot'] = current_timeslot + context['previous_timeslot'] = previous_timeslot + context['next_timeslot'] = next_timeslot + context['after_next_timeslot'] = after_next_timeslot + return context class DayScheduleViewV2(TemplateView): @@ -305,24 +323,6 @@ class DayScheduleViewV2(TemplateView): return context -class CurrentShowBoxViewV2(TemplateView): - context_object_name = 'recommendation_list' - template_name = 'v2/boxes/current.html' - - def get_context_data(self, **kwargs): - current_timeslot = TimeSlot.objects.get_or_create_current() - previous_timeslot = current_timeslot.get_previous_by_start() - next_timeslot = current_timeslot.get_next_by_start() - after_next_timeslot = next_timeslot.get_next_by_start() - - context = super(CurrentShowBoxViewV2, self).get_context_data(**kwargs) - context['current_timeslot'] = current_timeslot - context['previous_timeslot'] = previous_timeslot - context['next_timeslot'] = next_timeslot - context['after_next_timeslot'] = after_next_timeslot - return context - - # Exports def json_day_schedule(request, year=None, month=None, day=None): |