display tracks as "artist - title"

diff --git a/panikweb/static/css/_specifics.scss b/panikweb/static/css/_specifics.scss
index 9801bc08462155e8fbffac4f0f3e393b63cb0e04..eb4945949b85a7ff788deddac4c9707ac2302fcc 100644 (file)
--- a/panikweb/static/css/_specifics.scss
+++ b/panikweb/static/css/_specifics.scss
@@ -1942,9 +1942,6 @@ ul.nonstop-playlist {
        line-height: 130%;
        list-style: none;
        padding: 0;
-       .trackartist {
-               color: #666;
-       }
 }
 
 p.playlist-disclaimer {

diff --git a/panikweb/static/js/specifics.js b/panikweb/static/js/specifics.js
index dcb996971b1b2d25e30bd3e7ef9b325081beb5ef..189e4766aaf4e7af7dfc96d29db482cf03208c92 100644 (file)
--- a/panikweb/static/js/specifics.js
+++ b/panikweb/static/js/specifics.js
@@ -168,11 +168,11 @@ $(function() {
                                }
                                if (onair.data.track_title) {
                                        $('<span> - </span>').appendTo(onairContainer);
-                                       $('<span class="nonstop-track-title">' + onair.data.track_title + '</span>').appendTo(onairContainer);
                                        if (onair.data.track_artist) {
-                                               $('<span> </span>').appendTo(onairContainer)
-                                               $('<span class="nonstop-track-artist">(' + onair.data.track_artist + ')</span>').appendTo(onairContainer);
+                                               $('<span>', {text: onair.data.track_artist, class: "nonstop-track-artist"}).appendTo(onairContainer);
+                                               $('<span> - </span>').appendTo(onairContainer)
                                        }
+                                       $('<span>', {text: onair.data.track_title, class: "nonstop-track-title"}).appendTo(onairContainer);
                                }
                        }
                        else {

diff --git a/panikweb/templates/nonstop_playlist.html b/panikweb/templates/nonstop_playlist.html
index 9b3328aadd7a72d906e01de6ffcc66689e907cd3..eae4fcf9d32c885cdbf8c25485222d1c7ac8b9ba 100644 (file)
--- a/panikweb/templates/nonstop_playlist.html
+++ b/panikweb/templates/nonstop_playlist.html
@@ -21,8 +21,9 @@
                {% if track.filepath.track.title %}
                <li>
                        <span class="tracktime">{{track.play_timestamp|date:'H:i'}}</span> :
+                       <span class="trackartist">{{track.filepath.track.artist.name }}</span>
+                       <span class="tracksep">—</span>
                        <span class="tracktitle">{{track.filepath.track.title }}</span>
-                       <span class="trackartist">({{track.filepath.track.artist.name }})</span>
                </li>
                {% endif %}
                {% endfor %}