diff --git a/notes.md b/notes.md index 4af0778..ceed4b3 100644 --- a/notes.md +++ b/notes.md @@ -6,14 +6,14 @@ - programs: - schedule changes -> update later diffusions according to the new schedule - - stream disable -> remote control on liquidsoap - users - tests: - sound_monitor - import_playlist -- liquidsoap: +- controllers : - models to template -> note + - streamed program disable -> remote control on liquidsoap - tests: - monitor - check when a played sound has a temp blank @@ -29,12 +29,9 @@ -> enhance calendar with possible actions? - website: - - diffusions: - - print program's name in lists / clean up that thing also a bit - article list with the focus - player: - mixcloud - - seek bar + timer - remove from playing playlist -> stop - date_by_list: - sections' url @@ -52,7 +49,6 @@ - actions -> noscript case, think of accessibility - comments -> remove/edit by the author - integrate logs for tracks + in on air - -- get_for "model" -> "models" +- rename controllers.Station into controllers.Streamer -> keep Station for sth else diff --git a/programs/management/__pycache__/__init__.cpython-35.pyc b/programs/management/__pycache__/__init__.cpython-35.pyc index 0c6b51b..38482b3 100644 Binary files a/programs/management/__pycache__/__init__.cpython-35.pyc and b/programs/management/__pycache__/__init__.cpython-35.pyc differ diff --git a/website/actions.py b/website/actions.py index af8fcda..af4086d 100644 --- a/website/actions.py +++ b/website/actions.py @@ -23,7 +23,7 @@ class AddToPlaylist(Action): """ @classmethod - def make_for_diffusions(cl, request, object): + def make_for_diffusion(cl, request, object): from aircox.website.sections import Player if object.related.end > tz.make_aware(tz.datetime.now()): return @@ -50,7 +50,7 @@ class AddToPlaylist(Action): return False if issubclass(type(object), Diffusion): - return cl.make_for_diffusions(request, object) + return cl.make_for_diffusion(request, object) if issubclass(type(object), Sound): return cl.make_for_sound(request, object) if hasattr(object, 'sound') and object.sound: diff --git a/website/sections.py b/website/sections.py index af0c022..aa3e6e7 100644 --- a/website/sections.py +++ b/website/sections.py @@ -82,7 +82,6 @@ class Player(sections.Section): .filter(published = True) \ .filter(related__end__lte = tz.datetime.now()) \ .order_by('-related__end') - recents = [] for post in qs: archives = post.related.get_archives() diff --git a/website/templates/aircox/website/player.html b/website/templates/aircox/website/player.html index c7d6a71..63251a6 100644 --- a/website/templates/aircox/website/player.html +++ b/website/templates/aircox/website/player.html @@ -47,25 +47,43 @@ padding: 0.2em; } - #player .on_air .title { - font-size: 0.8em; - display: inline; - } + #player .on_air .title { + font-size: 0.8em; + display: inline; + } - #player .on_air a { - float: right; - } + #player .on_air a { + float: right; + } + + #player .info { + float: right; + } -.playlists { +#player progress { + background: none; + border: none; + width: 100%; + height: 0.8em; + cursor: pointer; + display: none; } - .playlists ul:not([selected]) { + #player[seekable]:hover progress { + display: block; + } + + +#player .playlists { +} + + #player .playlists ul:not([selected]) { display: none; } - .playlists nav > a.close, - .playlists nav > label { + #player .playlists nav > a.close, + #player .playlists nav > label { float: right; } @@ -73,33 +91,29 @@ content:"{% trans "single mode" %}"; } -.playlist { + +#player .playlist { margin: 0; padding: 0; height: 15em; /*overflow-y: auto;*/ } - .playlist .item > *:not(.actions) { + #player .playlist .item > *:not(.actions) { display: inline; margin: 0.2em; vertical-align: middle; } - .playlist .item .info { - float: right; - } - - -.playlist .actions { +#player .playlist .actions { float: right; } - .playlist .actions a.action { + #player .playlist .actions a.action { display: inline; } - .playlist .actions label, + #player .playlist .actions label, #playlist-live .actions, #playlist-recents .actions a.action[action="remove"], #playlist-favorites .actions a.action[action="sound.mark"], @@ -109,7 +123,7 @@ display: none; } - .playlist .action[action="remove"] { + #player .playlist .action[action="remove"] { float: right; } @@ -137,7 +151,10 @@ title="{% trans "play/pause" %}">
+ + +