[Media] : separating overlay for audio and video

diff --git a/app/organization/media/urls.py b/app/organization/media/urls.py
index 2233d5a048d274cb65429c2e0d826cce926d7584..a890a03c9cf64b59f47dd7178fff60578ee8ba1b 100644 (file)
--- a/app/organization/media/urls.py
+++ b/app/organization/media/urls.py
@@ -33,7 +33,7 @@ from organization.media.views import *
 
 
 urlpatterns = [
-    url("^video/overlay/(?P<slug>.*)/$", MediaOverlayView.as_view(), name="organization-media-overlay"),
+    url("^(?P<type>.*)/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"),

diff --git a/app/organization/media/views.py b/app/organization/media/views.py
index ca0634c6be1656696bb4fd35059466e95c7bac67..f24ae5a45802c8c161c13fa42d233e2545387e77 100644 (file)
--- a/app/organization/media/views.py
+++ b/app/organization/media/views.py
@@ -46,7 +46,6 @@ class PlaylistDetailView(SlugMixin, DetailView):
     model = Playlist
     template_name='media/playlist_detail.html'
     context_object_name = 'playlist'
-    
     def get_context_data(self, **kwargs):
         context = super(PlaylistDetailView, self).get_context_data(**kwargs)
         self.related_objects = []
@@ -116,6 +115,11 @@ class MediaOverlayView(SlugMixin, DetailView):
     template_name='media/media/media_overlay.html'
     context_object_name = 'media'
 
+    def get_template_names(self):
+        templates = super(MediaOverlayView, self).get_template_names()
+        templates.insert(0,'media/'+self.object.type.lower()+'/'+self.object.type.lower()+'_overlay.html')
+        return templates
+
 
 class PlaylistOverlayView(SlugMixin, DetailView):
     model = Playlist

diff --git a/app/templates/media/audio/audio_overlay.html b/app/templates/media/audio/audio_overlay.html
new file mode 100644 (file)
index 0000000..e3390dd
--- /dev/null
+++ b/app/templates/media/audio/audio_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></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/media/includes/media_card.html b/app/templates/media/media/includes/media_card.html
index a0b5e9adad898e3a5f1098c1da384a8a3c367252..db774cb95850ed273000f065d67a0a9f9983e37b 100644 (file)
--- a/app/templates/media/media/includes/media_card.html
+++ b/app/templates/media/media/includes/media_card.html
@@ -2,7 +2,7 @@
 
 <div class="">
     <div class="media-box media-box--{{object|get_media_type|lower}}">
-        <a class="media-box__image-container" href="{% url 'organization-media-overlay' object.slug %}" data-video-overlay>
+        <a class="media-box__image-container" href="{% url 'organization-media-overlay' object.type object.slug %}" data-video-overlay>
             <figure class="media-box__image media-box__image--video">
                 {% if object.poster_url %}
                     <img src="{{ object.poster_url }}">

diff --git a/app/templates/media/media/media_overlay.html b/app/templates/media/media/media_overlay.html
deleted file mode 100644 (file)
index e3390dd..0000000
--- a/app/templates/media/media/media_overlay.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></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/video/video_overlay.html b/app/templates/media/video/video_overlay.html
new file mode 100644 (file)
index 0000000..e3390dd
--- /dev/null
+++ b/app/templates/media/video/video_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></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>