From 3f1a6bee7168c47a795f808b774b38939f726aee Mon Sep 17 00:00:00 2001 From: Emilie Date: Wed, 8 Feb 2017 11:35:46 +0100 Subject: [PATCH] [Video] overlay template --- app/organization/media/urls.py | 3 ++- app/organization/media/views.py | 6 +++++ app/templates/media/overlay_detail.html | 29 +++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 app/templates/media/overlay_detail.html diff --git a/app/organization/media/urls.py b/app/organization/media/urls.py index 79c1de23..28f84197 100644 --- a/app/organization/media/urls.py +++ b/app/organization/media/urls.py @@ -33,7 +33,8 @@ from organization.media.views import * urlpatterns = [ - url("^media/deatil/(?P.*)/$", MediaDetailView.as_view(), name="organization-media-detail"), + url("^video/overlay/(?P.*)/$", MediaOverlayView.as_view(), name="organization-media-overlay"), + url("^media/detail/(?P.*)/$", MediaDetailView.as_view(), name="organization-media-detail"), url("^playlist/list/$", PlaylistListView.as_view(), name="organization-playlist-list"), url("^playlist/list/(?P.*)$", PlaylistListView.as_view(), name="organization-playlist-list"), url("^playlist/detail/(?P.*)/$", PlaylistDetailView.as_view(), name="organization-playlist-detail"), diff --git a/app/organization/media/views.py b/app/organization/media/views.py index d5c16d4a..4bab950d 100644 --- a/app/organization/media/views.py +++ b/app/organization/media/views.py @@ -103,3 +103,9 @@ class PlayListMediaView(autocomplete.Select2QuerySetView): if self.q: qs = qs.filter(title__istartswith=self.q) return qs + + +class MediaOverlayView(SlugMixin, DetailView): + model = Media + template_name='media/overlay_detail.html' + context_object_name = 'media' diff --git a/app/templates/media/overlay_detail.html b/app/templates/media/overlay_detail.html new file mode 100644 index 00000000..53ef9eca --- /dev/null +++ b/app/templates/media/overlay_detail.html @@ -0,0 +1,29 @@ +{{ media.title }} +{% if media.poster_url %} + {{ media.poster_url }} +{% endif %} + +{{ media.publish_date|date:"j F, Y" }} + +{% if media.description %} + {{ media.description }} +{% endif %} + +

+ +{% with media.transcoded.all as media_transcoded %} + {% if media_transcoded %} + {# WEBM #} + {{ media_transcoded.0.url }} + {{ media_transcoded.0.mime_type }} +

+ {# MP4 #} + {{ media_transcoded.1.url }} + {{ media_transcoded.1.mime_type }} +

+ {# OGG #} + {{ media_transcoded.2.url }} + {{ media_transcoded.2.mime_type }} + {% endif %} +{% endwith %} +