From 675dc42b0ea4beec0093cc686a65a3705921ce47 Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Thu, 13 Oct 2016 22:52:27 +0200
Subject: [PATCH] Fix playlist templates architecture

---
 .../media/inc/playlist_audio_card.html        | 14 ++----
 .../media/inc/playlist_audio_detail.html      | 50 +++++--------------
 .../media/inc/playlist_video_card.html        | 15 ++----
 .../media/inc/playlist_video_detail.html      | 22 +-------
 app/templates/media/playlist_detail.html      | 17 ++++++-
 app/templates/media/playlist_list.html        |  4 +-
 6 files changed, 40 insertions(+), 82 deletions(-)

diff --git a/app/templates/media/inc/playlist_audio_card.html b/app/templates/media/inc/playlist_audio_card.html
index 243b7c71..caf524bd 100644
--- a/app/templates/media/inc/playlist_audio_card.html
+++ b/app/templates/media/inc/playlist_audio_card.html
@@ -1,11 +1,5 @@
-<audio preload="true"></audio>
+{% load mezzanine_tags keyword_tags i18n organization_tags %}
 
-<ol class="audio-playlist">
-    {% for media in playlist.medias.all %}
-        <li class="audio-playlist__item">
-            {% for transcoded in media.media.transcoded.all %}
-                <a href="#" data-src="{{ transcoded.url }}">{{ media.title }}</a>
-            {% endfor %}
-        </li>
-    {% endfor %}
-</ol>
+<div class="audio-card">
+    <a href="{% url 'organization-playlist-detail' playlist.slug %}">{{ playlist.title }}</a>
+</div>
diff --git a/app/templates/media/inc/playlist_audio_detail.html b/app/templates/media/inc/playlist_audio_detail.html
index 23fdb87a..a373955e 100644
--- a/app/templates/media/inc/playlist_audio_detail.html
+++ b/app/templates/media/inc/playlist_audio_detail.html
@@ -1,37 +1,13 @@
-{% extends "base.html" %}
-{% load i18n %}
-{% load mezzanine_tags keyword_tags %}
-
-{% block title %}
-{{ playlist.title }}
-{% endblock %}
-
-{% block main %}
-
-{% for media in playlist.medias.all %}
-    {% if forloop.first %}
-        <div class="embed-responsive">
-        	<audio width="100%" poster="{{ media.poster_url }}" controls data-title="{{ media.title }}" preload="none">
-                {% for transcoded_media in media.transcoded.all %}
-        	       <source src="{{ transcoded_media.url }}" type="{{ transcoded_media.mime_type }}" />
-                {% endfor %}
-        	</audio>
-        </div>
-        <ul>
-    {% else %}
-        <li>{{ media.title }}</li>
-    {% endif %}
-    {% if forloop.last %}
-        </ul>
-    {% endif %}
-{% endfor %}
-
-<div class="video-html">
-    {{ playlist.content|safe }}
-</div>
-
-{% with playlist as object %}
-  {% include "includes/share_buttons.html" %}
-{% endwith %}
-
-{% endblock %}
+{% load mezzanine_tags keyword_tags i18n organization_tags %}
+
+<audio preload="true"></audio>
+
+<ol class="audio-playlist">
+    {% for media in playlist.medias.all %}
+        <li class="audio-playlist__item">
+            {% for transcoded in media.media.transcoded.all %}
+                <a href="#" data-src="{{ transcoded.url }}">{{ media.media.title }}</a>
+            {% endfor %}
+        </li>
+    {% endfor %}
+</ol>
diff --git a/app/templates/media/inc/playlist_video_card.html b/app/templates/media/inc/playlist_video_card.html
index fb9427b3..cc58d397 100644
--- a/app/templates/media/inc/playlist_video_card.html
+++ b/app/templates/media/inc/playlist_video_card.html
@@ -1,11 +1,6 @@
-<video preload="true"></video>
+{% load mezzanine_tags keyword_tags i18n organization_tags %}
 
-<ol class="video-playlist">
-    {% for media in playlist %}
-        <li class="video-playlist__item">
-            {% for transcoded in media.media.transcoded.all %}
-                <a href="#" data-src="{{ transcoded.url }}">{{ media.title }}</a>
-            {% endfor %}
-        </li>
-    {% endfor %}
-</ol>
+<div class="video-card">
+    <img src="{{ playlist.medias.all.0.poster_url }}"><br>
+    <a href="{% url 'organization-playlist-detail' playlist.slug %}">{{ playlist.title }}</a>
+</div>
diff --git a/app/templates/media/inc/playlist_video_detail.html b/app/templates/media/inc/playlist_video_detail.html
index 8529df19..7f638b66 100644
--- a/app/templates/media/inc/playlist_video_detail.html
+++ b/app/templates/media/inc/playlist_video_detail.html
@@ -1,12 +1,4 @@
-{% extends "base.html" %}
-{% load i18n %}
-{% load mezzanine_tags keyword_tags %}
-
-{% block title %}
-{{ playlist.title }}
-{% endblock %}
-
-{% block main %}
+{% load mezzanine_tags keyword_tags i18n organization_tags %}
 
 {% for media in playlist.medias.all %}
     {% if forloop.first %}
@@ -19,19 +11,9 @@
         </div>
         <ol>
     {% else %}
-        <li>{{ media.title }}</li>
+        <li><a href="#" data-src="{{ media.url }}">>{{ media.title }}</a></li>
     {% endif %}
     {% if forloop.last %}
         </ol>
     {% endif %}
 {% endfor %}
-
-<div class="video-html">
-    {{ playlist.content|safe }}
-</div>
-
-{% with playlist as object %}
-  {% include "includes/share_buttons.html" %}
-{% endwith %}
-
-{% endblock %}
diff --git a/app/templates/media/playlist_detail.html b/app/templates/media/playlist_detail.html
index 7bbdccc6..c3237d3b 100644
--- a/app/templates/media/playlist_detail.html
+++ b/app/templates/media/playlist_detail.html
@@ -1,5 +1,5 @@
 {% extends "pages/page.html" %}
-{% load mezzanine_tags keyword_tags i18n organization_tags pages_tags %}
+{% load mezzanine_tags keyword_tags i18n organization_tags %}
 
 {% block meta_title %}{% trans "Media" %}{% endblock %}
 
@@ -22,10 +22,23 @@
 
 {% block page_title %}
     {% editable person.title %}
-        <h1 class="dotted">{% trans "Media" %}</h1>
+        <h1 class="dotted">{{ playlist.title }}</h1>
     {% endeditable %}
 {% endblock %}
 
 {% block page_content %}
+    {% 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>
+
+    {% with playlist as object %}
+      {% include "includes/share_buttons.html" %}
+    {% endwith %}
 
 {% endblock %}
diff --git a/app/templates/media/playlist_list.html b/app/templates/media/playlist_list.html
index dc2eaa1f..5d268211 100644
--- a/app/templates/media/playlist_list.html
+++ b/app/templates/media/playlist_list.html
@@ -1,5 +1,5 @@
 {% extends "pages/page.html" %}
-{% load mezzanine_tags keyword_tags i18n organization_tags pages_tags %}
+{% load mezzanine_tags keyword_tags i18n organization_tags %}
 
 {% block meta_title %}{% trans "Media" %}{% endblock %}
 
@@ -27,14 +27,12 @@
 {% endblock %}
 
 {% block page_content %}
-    {# not working for audio for the moment... #}
     {% for playlist in playlists %}
         {% with playlist.type as type %}
             {% with "media/inc/playlist_"|add:type|add:"_card.html" as template %}
                 {% include template %}
             {% endwith %}
         {% endwith %}
-        {{  playlist.type }} : {{ playlist.created }} : {{ playlist.title }}
         <br>
     {% endfor %}
 
-- 
2.39.5