player: display currently playing track/artist

diff --git a/panikweb/settings.py b/panikweb/settings.py
index f332b24ea731e890c3cb611b0f9d3a657e6bacb1..d4710e8c618f6ed6951693a22921061747a024ca 100644 (file)
--- a/panikweb/settings.py
+++ b/panikweb/settings.py
@@ -147,6 +147,7 @@ INSTALLED_APPS = (
     'ckeditor',
     'emissions',
     'newsletter',
+    'nonstop',
     'combo.data',
     'combo.public',
 )

diff --git a/panikweb/views.py b/panikweb/views.py
index a1632ad441bc0e87657c5a45b5e873a1a4c9e180..2a3568aceb0ec4795adb82281bc3aee6ba02d2d9 100644 (file)
--- a/panikweb/views.py
+++ b/panikweb/views.py
@@ -29,6 +29,7 @@ from emissions.models import Category, Emission, Episode, Diffusion, SoundFile,
 from emissions.utils import whatsonair, period_program
 
 from newsletter.forms import SubscribeForm
+from nonstop.utils import get_current_nonstop_track
 
 from . import utils
 
@@ -540,6 +541,7 @@ def onair(request):
         d['nonstop'] = {
             'title': d['nonstop'].title,
         }
+        d.update(get_current_nonstop_track())
     if d.get('current_slot'):
         del d['current_slot']
     return d

diff --git a/panikweb_templates/static/css/specifics.css b/panikweb_templates/static/css/specifics.css
index 82e151192eb6f82418f486536847aa695d0c9206..520237faf86a897d1d3c24e24858ded1206af8d9 100644 (file)
--- a/panikweb_templates/static/css/specifics.css
+++ b/panikweb_templates/static/css/specifics.css
@@ -1501,3 +1501,7 @@ h3.episode-subtitle {
        font-style: normal;
        font-weight: bold;
 }
+
+.nonstop-track-title, .nonstop-track-artist {
+       font-size: 80%;
+}

diff --git a/panikweb_templates/static/js/specifics.js b/panikweb_templates/static/js/specifics.js
index 5745a951e9353dc47bb433be904d8eff50918000..392dc10da7634ec5239a34320707bf7b2468585d 100644 (file)
--- a/panikweb_templates/static/js/specifics.js
+++ b/panikweb_templates/static/js/specifics.js
@@ -207,6 +207,14 @@ $(function() {
                                }
                        } else if (onair.data.nonstop) {
                                onairContainer = $('<span>' + onair.data.nonstop.title + '</span>');
+                               if (onair.data.track_title) {
+                                       onairContainer = onairContainer.add('<span> - </span>');
+                                       onairContainer = onairContainer.add($('<span class="nonstop-track-title">' + onair.data.track_title + '</span>'));
+                                       if (onair.data.track_artist) {
+                                               onairContainer = onairContainer.add('<span> </span>');
+                                               onairContainer = onairContainer.add($('<span class="nonstop-track-artist">(' + onair.data.track_artist + ')</span>'));
+                                       }
+                               }
                        }
                        else {
                                onairContainer = $('<span>Unknown (Probably Non-Stop)</span>');