From: yomguy <yomguy@parisson.com>
Date: Fri, 18 Mar 2011 10:12:07 +0000 (+0100)
Subject: add playlists to element detail page templates, add rss img
X-Git-Tag: 1.1~354
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=7be34e6bee00732579224d07a217542fb97dd005;p=telemeta.git

add playlists to element detail page templates, add rss img
---

diff --git a/telemeta/htdocs/images/rss.png b/telemeta/htdocs/images/rss.png
new file mode 100644
index 00000000..d64c669c
Binary files /dev/null and b/telemeta/htdocs/images/rss.png differ
diff --git a/telemeta/templates/telemeta_default/home.html b/telemeta/templates/telemeta_default/home.html
index 072852c0..6c2f1128 100644
--- a/telemeta/templates/telemeta_default/home.html
+++ b/telemeta/templates/telemeta_default/home.html
@@ -14,7 +14,7 @@
 {% block modules %}
 
    <div id="module" class="module">
-    <h3><img src="{% url telemeta-images "module_playlist.png" %}" style="vertical-align:middle" />
+    <h3><img src="{% url telemeta-images "rss.png" %}" style="vertical-align:middle" />
       {% trans "Last changes" %}</h3>
     <table class="listing" bgcolor="#FFFFFF" width="390px">
       <tr>
diff --git a/telemeta/web/base.py b/telemeta/web/base.py
index f96d20d7..6a5b6e48 100644
--- a/telemeta/web/base.py
+++ b/telemeta/web/base.py
@@ -145,7 +145,8 @@ class WebView(object):
         
     def collection_detail(self, request, public_id, template='telemeta/collection_detail.html'):
         collection = MediaCollection.objects.get(public_id=public_id)
-        return render(request, template, {'collection': collection})
+        playlists = self.get_playlists(request)
+        return render(request, template, {'collection': collection, 'playlists' : playlists, })
 
     @method_decorator(permission_required('telemeta.change_mediacollection'))
     def collection_edit(self, request, public_id, template='telemeta/collection_edit.html'):
@@ -236,12 +237,13 @@ class WebView(object):
         
         previous, next = self.item_previous_next(item)
         analyzers = self.item_analyze(item)
+        playlists = self.get_playlists(request)
    
         return render(request, template,
                     {'item': item, 'export_formats': formats,
                     'visualizers': graphers, 'visualizer_id': grapher_id,'analysers': analyzers,
                     'audio_export_enabled': getattr(settings, 'TELEMETA_DOWNLOAD_ENABLED', True),
-                    'previous' : previous, 'next' : next, 'marker': marker_id, 
+                    'previous' : previous, 'next' : next, 'marker': marker_id, 'playlists' : playlists, 
                     })
 
     @method_decorator(permission_required('telemeta.change_mediaitem'))