make track metadata a link to the current playlist

diff --git a/panikweb/static/js/specifics.js b/panikweb/static/js/specifics.js
index 82c2a040fd3246b70bed07f9cc346ca154aac05a..225b505fee4032e88b968aa6bbf4a0a652680925 100644 (file)
--- a/panikweb/static/js/specifics.js
+++ b/panikweb/static/js/specifics.js
@@ -168,12 +168,18 @@ $(function() {
                                        onairContainer = $('<span>' + onair.data.nonstop.title + '</span>');
                                }
                                if (onair.data.track_title) {
-                                       $('<span> - </span>').appendTo(onairContainer);
+                                       var $track_container = $('<span>', {class: "nonstop-track-metadata"});
+                                       if (onair.data.nonstop.playlist_url) {
+                                               $track_container = $('<a>', {class: "nonstop-track-metadata", href: onair.data.nonstop.playlist_url});
+                                               $track_container.ajaxifyClick();
+                                       }
                                        if (onair.data.track_artist) {
-                                               $('<span>', {text: onair.data.track_artist, class: "nonstop-track-artist"}).appendTo(onairContainer);
-                                               $('<span> - </span>').appendTo(onairContainer)
+                                               $('<span>', {text: onair.data.track_artist, class: "nonstop-track-artist"}).appendTo($track_container);
+                                               $('<span> - </span>').appendTo($track_container)
                                        }
-                                       $('<span>', {text: onair.data.track_title, class: "nonstop-track-title"}).appendTo(onairContainer);
+                                       $('<span>', {text: onair.data.track_title, class: "nonstop-track-title"}).appendTo($track_container);
+                                       $('<span> - </span>').appendTo(onairContainer);
+                                       $track_container.appendTo(onairContainer);
                                }
                        }
                        else {

diff --git a/panikweb/templates/nonstop_playlist.html b/panikweb/templates/nonstop_playlist.html
index eae4fcf9d32c885cdbf8c25485222d1c7ac8b9ba..5d04c7f2b1e4798a4b14eefb0bffdb22199fd227 100644 (file)
--- a/panikweb/templates/nonstop_playlist.html
+++ b/panikweb/templates/nonstop_playlist.html
@@ -19,7 +19,7 @@
                <ul class="nonstop-playlist">
                {% for track in tracks %}
                {% if track.filepath.track.title %}
-               <li>
+               <li id="log-{{track.id}}">
                        <span class="tracktime">{{track.play_timestamp|date:'H:i'}}</span> :
                        <span class="trackartist">{{track.filepath.track.artist.name }}</span>
                        <span class="tracksep">—</span>

diff --git a/panikweb/views.py b/panikweb/views.py
index ba9ad8f3a58163db34f58e42fcc43f301f5fd85d..46ee5e6dba71fa5611b700bc1b9625cb92aa20ed 100644 (file)
--- a/panikweb/views.py
+++ b/panikweb/views.py
@@ -836,6 +836,16 @@ def onair(request):
         }
         if redirect_path:
             d['nonstop']['url'] = redirect_path
+        today = datetime.today()
+        d['nonstop']['playlist_url'] = reverse(
+            'nonstop-playlist',
+            kwargs={
+                'year': today.year,
+                'month': today.month,
+                'day': today.day,
+                'slug': d['current_slot'].slug,
+            },
+        )
         d.update(get_current_nonstop_track())
     if d.get('current_slot'):
         del d['current_slot']