From 7be34e6bee00732579224d07a217542fb97dd005 Mon Sep 17 00:00:00 2001
From: yomguy <yomguy@parisson.com>
Date: Fri, 18 Mar 2011 11:12:07 +0100
Subject: [PATCH] add playlists to element detail page templates, add rss img

---
 telemeta/htdocs/images/rss.png                | Bin 0 -> 1737 bytes
 telemeta/templates/telemeta_default/home.html |   2 +-
 telemeta/web/base.py                          |   6 ++++--
 3 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 telemeta/htdocs/images/rss.png

diff --git a/telemeta/htdocs/images/rss.png b/telemeta/htdocs/images/rss.png
new file mode 100644
index 0000000000000000000000000000000000000000..d64c669c7589d3a886682dbd1f3c83b716a420f5
GIT binary patch
literal 1737
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

literal 0
HcmV?d00001

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'))
-- 
2.39.5