Update media templates

diff --git a/app/organization/media/views.py b/app/organization/media/views.py
index f99044a688ef69616ff3dd56ce87d8418cda0904..4bc4bb6d175733aa32e299fbf78992a0fa36aa8b 100644 (file)
--- a/app/organization/media/views.py
+++ b/app/organization/media/views.py
@@ -19,6 +19,7 @@ class PlaylistDetailView(SlugMixin, DetailView):
 
 class PlaylistListView(ListView):
 
+    model = Playlist
     template_name='media/playlist_list.html'
     context_object_name = 'playlists'
 
@@ -26,14 +27,6 @@ class PlaylistListView(ListView):
         context = super(PlaylistListView, self).get_context_data(**kwargs)
         return context
 
-    # def get_queryset(self):
-    #     audio_playlists = PlaylistAudio.objects.all()
-    #     video_playlists = PlaylistVideo.objects.all()
-    #     playlist_list = [video_playlist for video_playlist in video_playlists]
-    #     playlist_list += [audio_playlist for audio_playlist in audio_playlists]
-    #     playlist_list.sort(key=lambda x: x.created_at, reverse=True)
-    #     return playlist_list
-
 
 class PlayListMediaView(autocomplete.Select2QuerySetView):
 

diff --git a/app/templates/index.html b/app/templates/index.html
index f1c8221defaef2b44458fe26e63a6a39f9d03a09..5a0097c4a3fc9beebcfa3045784dcfebe7dca71a 100644 (file)
--- a/app/templates/index.html
+++ b/app/templates/index.html
@@ -50,9 +50,9 @@
           <div class="home__shutter">
               <div class="home__shutter-content">
                   <div class="container-fluid tal">
-                      {% include "media/inc/media_shutter.html" %}
+                      {% include "media/inc/playlist_shutter.html" %}
                   </div>
-                  <div><a href="{% url 'media-list' %}" title="">{% trans 'See more media >' %}</a></div>
+                  <div><a href="{% url 'organization-playlist-list' %}" title="">{% trans 'See more media >' %}</a></div>
               </div>
           </div>
       </li>

diff --git a/app/templates/media/inc/playlist_audio_card.html b/app/templates/media/inc/playlist_audio_card.html
index 96460dabcb23b9992f3c0b9edde0ae5091731a55..243b7c715429e474d321f279e334e53e33dbd0dd 100644 (file)
--- a/app/templates/media/inc/playlist_audio_card.html
+++ b/app/templates/media/inc/playlist_audio_card.html
@@ -1,10 +1,10 @@
 <audio preload="true"></audio>
 
 <ol class="audio-playlist">
-    {% for media in playlist %}
+    {% for media in playlist.medias.all %}
         <li class="audio-playlist__item">
-            {% for transcoded_media in media.transcoded.all %}
-                <a href="#" data-src="{{ transcoded_media.url }}">{{ media.title }}</a>
+            {% for transcoded in media.media.transcoded.all %}
+                <a href="#" data-src="{{ transcoded.url }}">{{ media.title }}</a>
             {% endfor %}
         </li>
     {% endfor %}

diff --git a/app/templates/media/inc/playlist_video_card.html b/app/templates/media/inc/playlist_video_card.html
index 2246e8a1d109f8b90efb631ac01b1fa9ce820883..fb9427b310c48dd8c3658b4b4b9433a552a87b6c 100644 (file)
--- a/app/templates/media/inc/playlist_video_card.html
+++ b/app/templates/media/inc/playlist_video_card.html
@@ -1,10 +1,10 @@
 <video preload="true"></video>
 
-<ol class="audio-playlist">
+<ol class="video-playlist">
     {% for media in playlist %}
         <li class="video-playlist__item">
-            {% for transcoded_media in media.transcoded.all %}
-                <a href="#" data-src="{{ transcoded_media.url }}">{{ media.title }}</a>
+            {% for transcoded in media.media.transcoded.all %}
+                <a href="#" data-src="{{ transcoded.url }}">{{ media.title }}</a>
             {% endfor %}
         </li>
     {% endfor %}

diff --git a/app/templates/media/playlist_detail.html b/app/templates/media/playlist_detail.html
index 4f5e0c507151fa508e3fbd5a6a8e4b9927c30db5..7bbdccc63d4498e6bcf55654b3772dc9220c8524 100644 (file)
--- a/app/templates/media/playlist_detail.html
+++ b/app/templates/media/playlist_detail.html
@@ -27,13 +27,5 @@
 {% endblock %}
 
 {% block page_content %}
-    {% for object in media %}
-        {% with object|classname|lower as class_name %}
-            {% with "media/"|add:class_name|add:"/inc/"|add:class_name|add:"_card.html" as template %}
-                {% include template %}
-            {% endwith %}
-        {% endwith %}
-        {{ object|classname }} : {{ object.created_at }} : {{ object.title }}
-        <br>
-    {% endfor %}
+
 {% endblock %}

diff --git a/app/templates/media/playlist_list.html b/app/templates/media/playlist_list.html
index 9a56fcb8f244aab1c7075f016be517be15a7da31..dc2eaa1fe80090dbf49de7b9d9a686900d2ef09e 100644 (file)
--- a/app/templates/media/playlist_list.html
+++ b/app/templates/media/playlist_list.html
@@ -34,7 +34,7 @@
                 {% include template %}
             {% endwith %}
         {% endwith %}
-        {{  playlist|classname }} : {{ playlist.created }} : {{ playlist.title }}
+        {{  playlist.type }} : {{ playlist.created }} : {{ playlist.title }}
         <br>
     {% endfor %}