[Media] : playlist overlay

diff --git a/app/organization/media/urls.py b/app/organization/media/urls.py
index fc8a27e3d0689427cbbffb5c419db2faf0b5e038..2233d5a048d274cb65429c2e0d826cce926d7584 100644 (file)
--- a/app/organization/media/urls.py
+++ b/app/organization/media/urls.py
@@ -36,6 +36,7 @@ urlpatterns = [
     url("^video/overlay/(?P<slug>.*)/$", MediaOverlayView.as_view(), name="organization-media-overlay"),
     url("^(?P<type>.*)/detail/(?P<slug>.*)/$", MediaDetailView.as_view(), name="organization-media-detail"),
     url("^playlist/list/$", PlaylistListView.as_view(), name="organization-playlist-list"),
+    url("^playlist/overlay/(?P<slug>.*)/$", PlaylistOverlayView.as_view(), name="organization-playlist-overlay"),
     url("^playlist/list/(?P<type>.*)$", PlaylistListView.as_view(), name="organization-playlist-list"),
     url("^playlist/detail/(?P<slug>.*)/$", PlaylistDetailView.as_view(), name="organization-playlist-detail"),
     url("^playlist-media-autocomplete/$",  permission_required('playlist.can_edit')(PlayListMediaView.as_view()), name='media-autocomplete'),

diff --git a/app/organization/media/views.py b/app/organization/media/views.py
index e820096ca568f9866ccb2e23e5acbde786f138cf..d5bdd646038a1436fbe5d23d1ba10b0e27d4e793 100644 (file)
--- a/app/organization/media/views.py
+++ b/app/organization/media/views.py
@@ -34,7 +34,7 @@ class MediaDetailView(SlugMixin, DetailView):
 
     model = Media
     context_object_name = 'media'
-    
+
     def get_template_names(self):
         templates = super(MediaDetailView, self).get_template_names()
         templates.insert(0,'media/'+self.kwargs['type'].lower()+'/'+self.kwargs['type'].lower()+'_detail.html')
@@ -112,5 +112,11 @@ class PlayListMediaView(autocomplete.Select2QuerySetView):
 
 class MediaOverlayView(SlugMixin, DetailView):
     model = Media
-    template_name='media/overlay_detail.html'
+    template_name='media/media/media_overlay.html'
     context_object_name = 'media'
+
+
+class PlaylistOverlayView(SlugMixin, DetailView):
+    model = Playlist
+    template_name='media/playlist_overlay.html'
+    context_object_name = 'playlist'

diff --git a/app/templates/media/media/media_overlay.html b/app/templates/media/media/media_overlay.html
new file mode 100644 (file)
index 0000000..97a2e90
--- /dev/null
+++ b/app/templates/media/media/media_overlay.html
@@ -0,0 +1,69 @@
+{% load mezzanine_tags keyword_tags i18n organization_tags %}
+
+<div class="container">
+
+    <div class="row">
+
+        <div class="mb1 col-md-10 col-md-push-3 page__content" data-summary-content>
+
+            <div class="embed-responsive">
+                <video controls id="video-js-playlist" class="video-js vjs-ircam-skin" data-title="{{ media.title }}" {% if media.poster_url %}poster="{{ media.poster_url }}"{% endif %}>
+                </video>
+            </div>
+            <ol class="video-playlist">
+                {% spaceless %}
+                    <li class="video-playlist__item{% if forloop.first %} playing{% endif %}"><a href="#" data-poster="{{media.poster_url }}" data-src="{% for transcoded in media.transcoded.all %}{% if forloop.first %}{% else %},{% endif %}{{ transcoded.url }}{% if forloop.last %}{% endif %}{% endfor %}" data-mime="{% for transcoded in media.transcoded.all %}{% if forloop.first %}{% else %},{% endif %}{{ transcoded.mime_type }}{% if forloop.last %}{% endif %}{% endfor %}"><span>{{ media.title }}</span>{% if media.description %}<small> {{ media.description }}</small>{% endif %}</a></li>
+                {% endspaceless %}
+            </ol>
+
+        </div>
+
+    </div>
+
+    <div class="row">
+
+        <div class="col-md-3 page__sidebar">
+            <div style="position: relative;">
+                <div class="page__meta" data-sticky data-sticky-parent="row" data-sticky-offset="100" data-sticky-detach-at="971">
+                    <div class="page__meta-title">
+                        {% trans 'Publish date' %}
+                    </div>
+                    {% editable media.publish_date %}
+                        <div class="page__meta-text">
+                            {{ media.publish_date|date:"DATE_FORMAT" }}
+                        </div>
+                    {% endeditable %}
+
+                    {% with media as object %}
+                        <div class="mt1">
+                            <ul class="share-links">
+                                <li class="share-links__item share-links__item--facebook">
+                                    <a target="_blank" href="http://facebook.com/sharer.php?u={{ request.META.HTTP_HOST }}{{ request.scheme }}{{ '://'|urlencode }}{% url 'organization-media-detail' object|get_media_type|lower object.slug %}&amp;t={{ object.title|urlencode }}" title="{% trans "Share on Facebook" %}"><i class="fa fa-facebook-square"></i></a>
+                                </li>
+                                <li class="share-links__item share-links__item--twitter">
+                                    <a target="_blank" href="http://twitter.com/home?status={{ object.title|urlencode }}%20{{ request.scheme }}{{ '://'|urlencode }}{{ request.META.HTTP_HOST }}{% url 'organization-media-detail' object|get_media_type|lower object.slug %}" title="{% trans "Share on Twitter" %}"><i class="fa fa-twitter-square"></i></a>
+                                </li>
+                                <li class="share-links__item share-links__item--email">
+                                    <a href="mailto:?subject={{ object.title }}&amp;body={{ request.scheme }}{{ '://'|urlencode }}{{ request.META.HTTP_HOST }}{% url 'organization-media-detail' object|get_media_type|lower object.slug %}" title="{% trans "Share by email" %}"> <i class="fa fa-envelope-square"></i></a>
+                                </li>
+                            </ul>
+                        </div>
+                    {% endwith %}
+                </div>
+            </div>
+        </div>
+
+        <div class="col-sm-16 col-md-10 page__content" data-summary-content>
+
+            <h2 class="mt0">{{ media.title }}</h2>
+            {% if media.description %}
+                <p>
+                    {{ media.description }}
+                </p>
+            {% endif %}
+
+        </div>
+
+    </div>
+
+</div>

diff --git a/app/templates/media/overlay_detail.html b/app/templates/media/overlay_detail.html
deleted file mode 100644 (file)
index 97a2e90..0000000
--- a/app/templates/media/overlay_detail.html
+++ /dev/null
@@ -1,69 +0,0 @@
-{% load mezzanine_tags keyword_tags i18n organization_tags %}
-
-<div class="container">
-
-    <div class="row">
-
-        <div class="mb1 col-md-10 col-md-push-3 page__content" data-summary-content>
-
-            <div class="embed-responsive">
-                <video controls id="video-js-playlist" class="video-js vjs-ircam-skin" data-title="{{ media.title }}" {% if media.poster_url %}poster="{{ media.poster_url }}"{% endif %}>
-                </video>
-            </div>
-            <ol class="video-playlist">
-                {% spaceless %}
-                    <li class="video-playlist__item{% if forloop.first %} playing{% endif %}"><a href="#" data-poster="{{media.poster_url }}" data-src="{% for transcoded in media.transcoded.all %}{% if forloop.first %}{% else %},{% endif %}{{ transcoded.url }}{% if forloop.last %}{% endif %}{% endfor %}" data-mime="{% for transcoded in media.transcoded.all %}{% if forloop.first %}{% else %},{% endif %}{{ transcoded.mime_type }}{% if forloop.last %}{% endif %}{% endfor %}"><span>{{ media.title }}</span>{% if media.description %}<small> {{ media.description }}</small>{% endif %}</a></li>
-                {% endspaceless %}
-            </ol>
-
-        </div>
-
-    </div>
-
-    <div class="row">
-
-        <div class="col-md-3 page__sidebar">
-            <div style="position: relative;">
-                <div class="page__meta" data-sticky data-sticky-parent="row" data-sticky-offset="100" data-sticky-detach-at="971">
-                    <div class="page__meta-title">
-                        {% trans 'Publish date' %}
-                    </div>
-                    {% editable media.publish_date %}
-                        <div class="page__meta-text">
-                            {{ media.publish_date|date:"DATE_FORMAT" }}
-                        </div>
-                    {% endeditable %}
-
-                    {% with media as object %}
-                        <div class="mt1">
-                            <ul class="share-links">
-                                <li class="share-links__item share-links__item--facebook">
-                                    <a target="_blank" href="http://facebook.com/sharer.php?u={{ request.META.HTTP_HOST }}{{ request.scheme }}{{ '://'|urlencode }}{% url 'organization-media-detail' object|get_media_type|lower object.slug %}&amp;t={{ object.title|urlencode }}" title="{% trans "Share on Facebook" %}"><i class="fa fa-facebook-square"></i></a>
-                                </li>
-                                <li class="share-links__item share-links__item--twitter">
-                                    <a target="_blank" href="http://twitter.com/home?status={{ object.title|urlencode }}%20{{ request.scheme }}{{ '://'|urlencode }}{{ request.META.HTTP_HOST }}{% url 'organization-media-detail' object|get_media_type|lower object.slug %}" title="{% trans "Share on Twitter" %}"><i class="fa fa-twitter-square"></i></a>
-                                </li>
-                                <li class="share-links__item share-links__item--email">
-                                    <a href="mailto:?subject={{ object.title }}&amp;body={{ request.scheme }}{{ '://'|urlencode }}{{ request.META.HTTP_HOST }}{% url 'organization-media-detail' object|get_media_type|lower object.slug %}" title="{% trans "Share by email" %}"> <i class="fa fa-envelope-square"></i></a>
-                                </li>
-                            </ul>
-                        </div>
-                    {% endwith %}
-                </div>
-            </div>
-        </div>
-
-        <div class="col-sm-16 col-md-10 page__content" data-summary-content>
-
-            <h2 class="mt0">{{ media.title }}</h2>
-            {% if media.description %}
-                <p>
-                    {{ media.description }}
-                </p>
-            {% endif %}
-
-        </div>
-
-    </div>
-
-</div>

diff --git a/app/templates/media/playlist_overlay.html b/app/templates/media/playlist_overlay.html
new file mode 100644 (file)
index 0000000..b769b18
--- /dev/null
+++ b/app/templates/media/playlist_overlay.html
@@ -0,0 +1,9 @@
+{% with playlist.type as type %}
+    {% with "media/inc/playlist_"|add:type|add:"_detail.html" as template %}
+        {% include template %}
+    {% endwith %}
+{% endwith %}
+
+<div class="playslit-html">
+    {{ playlist.content|safe }}
+</div>