Commit 230008b0 authored by fred's avatar fred

display tracks as "artist - title"

parent d3e15eaf
......@@ -1942,9 +1942,6 @@ ul.nonstop-playlist {
line-height: 130%;
list-style: none;
padding: 0;
.trackartist {
color: #666;
}
}
p.playlist-disclaimer {
......
......@@ -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 {
......
......@@ -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 %}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment