diff options
| author | Christian Pointner <equinox@helsinki.at> | 2021-03-03 13:43:40 (GMT) |
|---|---|---|
| committer | Christian Pointner <equinox@helsinki.at> | 2021-03-03 13:43:40 (GMT) |
| commit | ef98eb1ea7167a6be047cb9fdbfc500d8272792a (patch) | |
| tree | b566c607f3f971edc8734b62c124e9c1625705c3 | |
| parent | 2094bd035f5b9ede35f9b28d5a2be7555f59b3af (diff) | |
| parent | 59be96ee97d08017bd3ba37b77fc5a3442262909 (diff) | |
Merge branch 'new-homepage' into stable
| -rw-r--r-- | program/templates/v2/day_schedule.html | 9 | ||||
| -rw-r--r-- | program/templates/v2/host_list.html | 2 | ||||
| -rw-r--r-- | program/templates/v2/show_detail.html | 2 | ||||
| -rw-r--r-- | program/templates/v2/show_filters.html | 17 | ||||
| -rw-r--r-- | program/templates/v2/show_list.html | 9 | ||||
| -rw-r--r-- | program/templatetags/show_filters.py (renamed from program/templatetags/filters.py) | 0 | ||||
| -rw-r--r-- | program/urls.py | 1 | ||||
| -rw-r--r-- | program/views.py | 4 |
8 files changed, 23 insertions, 21 deletions
diff --git a/program/templates/v2/day_schedule.html b/program/templates/v2/day_schedule.html index e91c020..8fef31d 100644 --- a/program/templates/v2/day_schedule.html +++ b/program/templates/v2/day_schedule.html @@ -4,15 +4,6 @@ </head> <body> -{% load filters %} -<div id="filter"> -{% broadcastformatV2 %} -{% musicfocusV2 %} -{% showinformationV2 %} -{% showtopicV2 %} -{% languageV2 %} -</div> - <div id="content-main" class="day-schedule"> <h2>Tagesansicht</h2> <h1 id="date">{{ day|date:"l, d.m.Y" }}</h1> diff --git a/program/templates/v2/host_list.html b/program/templates/v2/host_list.html index 27b2895..3d4663d 100644 --- a/program/templates/v2/host_list.html +++ b/program/templates/v2/host_list.html @@ -4,7 +4,7 @@ </head> <body> -<div id="content-main"> +<div id="content-main" class="host-list"> <h1>Sendungsmachende A-Z</h1> <div class="host-list"> {% for host in host_list %} diff --git a/program/templates/v2/show_detail.html b/program/templates/v2/show_detail.html index 5e687f1..56f1a84 100644 --- a/program/templates/v2/show_detail.html +++ b/program/templates/v2/show_detail.html @@ -4,8 +4,6 @@ </head> <body> -<div id="calendar"></div> - <div id="content-main" class="show-detail"> <div class="show-detail-header bf-{{ show.broadcastformat.slug }}"> diff --git a/program/templates/v2/show_filters.html b/program/templates/v2/show_filters.html new file mode 100644 index 0000000..16f6a0a --- /dev/null +++ b/program/templates/v2/show_filters.html @@ -0,0 +1,17 @@ +<html> +<head> + <title>Show Filters</title> +</head> +<body> + +{% load show_filters %} +<div id="filter"> +{% broadcastformatV2 %} +{% musicfocusV2 %} +{% showinformationV2 %} +{% showtopicV2 %} +{% languageV2 %} +</div> + +</body> +</html> diff --git a/program/templates/v2/show_list.html b/program/templates/v2/show_list.html index b88695f..56ecd21 100644 --- a/program/templates/v2/show_list.html +++ b/program/templates/v2/show_list.html @@ -4,15 +4,6 @@ </head> <body> -{% load filters %} -<div id="filter"> -{% broadcastformatV2 %} -{% musicfocusV2 %} -{% showinformationV2 %} -{% showtopicV2 %} -{% languageV2 %} -</div> - <div id="content-main" class="show-list"> <h1>Sendungen A-Z</h1> diff --git a/program/templatetags/filters.py b/program/templatetags/show_filters.py index 811216b..811216b 100644 --- a/program/templatetags/filters.py +++ b/program/templatetags/show_filters.py diff --git a/program/urls.py b/program/urls.py index a4909e4..776b9c0 100644 --- a/program/urls.py +++ b/program/urls.py @@ -31,6 +31,7 @@ urlpatterns = patterns('', url(r'^v2/shows/?$', views.ShowListViewV2.as_view()), url(r'^v2/shows/(?P<slug>[\w-]+)/?$', views.ShowDetailViewV2.as_view()), url(r'^v2/(?P<pk>\d+)/?$', views.TimeSlotDetailViewV2.as_view()), + url(r'^v2/show-filters/?$', views.ShowFilterListViewV2.as_view()), ) if settings.DEBUG: urlpatterns += \ diff --git a/program/views.py b/program/views.py index 61a6207..3f1cf9e 100644 --- a/program/views.py +++ b/program/views.py @@ -301,6 +301,10 @@ class DayScheduleViewV2(TemplateView): return context +class ShowFilterListViewV2(TemplateView): + template_name = 'v2/show_filters.html' + + # Exports def json_day_schedule(request, year=None, month=None, day=None): |