diff options
| -rw-r--r-- | program/templates/v2/current_show.html | 56 | ||||
| -rw-r--r-- | program/templates/v2/recommendation.html | 28 | ||||
| -rw-r--r-- | program/urls.py | 2 | ||||
| -rw-r--r-- | program/views.py | 22 |
4 files changed, 0 insertions, 108 deletions
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 @@ -<!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-v2" 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-v2" 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-v2" 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-v2" 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/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 @@ -<!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-v2" 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-v2" recommendation.id %}">[weiter]</a> - </div> - </li> -{% endfor %} - </ul> -</body> -</html> 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<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\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<pk>\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<slug>[\w-]+)/?$', views.ShowDetailViewV2.as_view(), name='show-detail-v2'), url(r'^v2/(?P<pk>\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' |