Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Simon Daron
panikweb
Commits
c06014fc
Commit
c06014fc
authored
Mar 04, 2015
by
fred
Browse files
player: display currently playing track/artist
parent
7768d028
Changes
4
Hide whitespace changes
Inline
Side-by-side
panikweb/settings.py
View file @
c06014fc
...
...
@@ -147,6 +147,7 @@ INSTALLED_APPS = (
'ckeditor'
,
'emissions'
,
'newsletter'
,
'nonstop'
,
'combo.data'
,
'combo.public'
,
)
...
...
panikweb/views.py
View file @
c06014fc
...
...
@@ -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
...
...
panikweb_templates/static/css/specifics.css
View file @
c06014fc
...
...
@@ -1501,3 +1501,7 @@ h3.episode-subtitle {
font-style
:
normal
;
font-weight
:
bold
;
}
.nonstop-track-title
,
.nonstop-track-artist
{
font-size
:
80%
;
}
panikweb_templates/static/js/specifics.js
View file @
c06014fc
...
...
@@ -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>
'
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment