From 5d63bb9963ae6e41fc6c2cca97834b40beb71a0b Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Wed, 3 Mar 2021 13:43:54 +0100 Subject: remove views not used by new homepage diff --git a/program/templates/v2/current_show.html b/program/templates/v2/current_show.html deleted file mode 100644 index ab5f843..0000000 --- a/program/templates/v2/current_show.html +++ /dev/null @@ -1,56 +0,0 @@ - - - - - Current program box - - - - - diff --git a/program/templates/v2/recommendation.html b/program/templates/v2/recommendation.html deleted file mode 100644 index 3dfeed2..0000000 --- a/program/templates/v2/recommendation.html +++ /dev/null @@ -1,28 +0,0 @@ - - - - - Recomendations box - - - - - diff --git a/program/urls.py b/program/urls.py index 378faf1..0abce53 100644 --- a/program/urls.py +++ b/program/urls.py @@ -25,11 +25,9 @@ urlpatterns = patterns('', # V2 Patterns for new Homepage 2021 url(r'^v2/today/?$', views.DayScheduleViewV2.as_view()), url(r'^v2/(?P\d{4})/(?P\d{1,2})/(?P\d{1,2})/?$', views.DayScheduleViewV2.as_view()), - url(r'^v2/current_box/?$', cache_page(60)(views.CurrentShowBoxViewV2.as_view())), url(r'^v2/hosts/?$', views.HostListViewV2.as_view()), url(r'^v2/hosts/(?P\d+)/?$', views.HostDetailViewV2.as_view(), name='host-detail-v2'), url(r'^v2/tips/?$', views.RecommendationsListViewV2.as_view()), - url(r'^v2/tips_box/?$', views.RecommendationsBoxViewV2.as_view()), url(r'^v2/shows/?$', views.ShowListViewV2.as_view()), url(r'^v2/shows/(?P[\w-]+)/?$', views.ShowDetailViewV2.as_view(), name='show-detail-v2'), url(r'^v2/(?P\d+)/?$', views.TimeSlotDetailViewV2.as_view(), name='timeslot-detail-v2'), diff --git a/program/views.py b/program/views.py index 2a7609c..61a6207 100644 --- a/program/views.py +++ b/program/views.py @@ -259,28 +259,6 @@ class RecommendationsListViewV2(ListView): start__range=(now, end))).order_by('start')[:20] -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): template_name = 'v2/day_schedule.html' -- cgit v0.10.2 From a0ee1c483fe320e9b6b719a2ce103954f5b00e92 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Wed, 3 Mar 2021 14:02:31 +0100 Subject: furhter cleanup of filter templatetags diff --git a/program/templates/v2/day_schedule.html b/program/templates/v2/day_schedule.html index 4a36bdb..a4e1bde 100644 --- a/program/templates/v2/day_schedule.html +++ b/program/templates/v2/day_schedule.html @@ -5,14 +5,8 @@ {% load filters %} -
- {% broadcastformatV2 %} -
- -
-
-
Filter
-
+
+{% broadcastformatV2 %} {% musicfocusV2 %} {% showinformationV2 %} {% showtopicV2 %} diff --git a/program/templates/v2/filters/broadcastformat.html b/program/templates/v2/filters/broadcastformat.html index 922c99c..4081323 100644 --- a/program/templates/v2/filters/broadcastformat.html +++ b/program/templates/v2/filters/broadcastformat.html @@ -1,6 +1,6 @@ {% if broadcastformat_list %} {% endif %} diff --git a/program/templates/v2/filters/language.html b/program/templates/v2/filters/language.html index c79122f..75a2d89 100644 --- a/program/templates/v2/filters/language.html +++ b/program/templates/v2/filters/language.html @@ -1,6 +1,6 @@ {% if language_list %} {% endif %} diff --git a/program/templates/v2/filters/musicfocus.html b/program/templates/v2/filters/musicfocus.html index 99bbb20..b2897e2 100644 --- a/program/templates/v2/filters/musicfocus.html +++ b/program/templates/v2/filters/musicfocus.html @@ -1,6 +1,6 @@ {% if musicfocus_list %} {% endif %} diff --git a/program/templates/v2/filters/showinformation.html b/program/templates/v2/filters/showinformation.html index bcd6cb1..75c5c78 100644 --- a/program/templates/v2/filters/showinformation.html +++ b/program/templates/v2/filters/showinformation.html @@ -1,6 +1,6 @@ {% if showinformation_list %} {% endif %} diff --git a/program/templates/v2/filters/showtopic.html b/program/templates/v2/filters/showtopic.html index 070d82a..6ecdb34 100644 --- a/program/templates/v2/filters/showtopic.html +++ b/program/templates/v2/filters/showtopic.html @@ -1,6 +1,6 @@ {% if showtopic_list %} {% endif %} diff --git a/program/templates/v2/show_list.html b/program/templates/v2/show_list.html index 50cae57..c4d123b 100644 --- a/program/templates/v2/show_list.html +++ b/program/templates/v2/show_list.html @@ -5,17 +5,12 @@ {% load filters %} -
- {% broadcastformatV2 %} -
-
-
-
Filter
-
- {% musicfocusV2 %} - {% showinformationV2 %} - {% showtopicV2 %} - {% languageV2 %} +
+{% broadcastformatV2 %} +{% musicfocusV2 %} +{% showinformationV2 %} +{% showtopicV2 %} +{% languageV2 %}
-- cgit v0.10.2