From: Frédéric Péters Date: Sun, 15 Mar 2020 09:12:51 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/master' into radio-esperanzah-2020 X-Git-Tag: v2021~16 X-Git-Url: https://git.0d.be/?p=panikweb-esperanzah.git;a=commitdiff_plain;h=03d2f195aaa894f2a7e8d22d24061321f628ea32 Merge remote-tracking branch 'origin/master' into radio-esperanzah-2020 --- 03d2f195aaa894f2a7e8d22d24061321f628ea32 diff --cc panikweb/settings.py index bf911a2,5173478..bee6c95 --- a/panikweb/settings.py +++ b/panikweb/settings.py @@@ -238,9 -241,13 +237,13 @@@ LANGUAGE_COOKIE_NAME = 'panikweb_langua TEMPLATE_VARS = {} COMBO_DASHBOARD_ENABLED = False + COMBO_MAP_TILE_URLTEMPLATE = '' + COMBO_MAP_ATTRIBUTION = '' JSON_CELL_TYPES = {} -RADIO_NAME = 'Radio Panik' -RADIO_LONG_NAME = 'Radio Panik - 105.4 FM' --WEBSITE_BASE_URL = 'http://www.radiopanik.org/' ++RADIO_NAME = 'Radio Esperanzah!' ++RADIO_LONG_NAME = 'Radio Esperanzah! - 106.2 FM' ++WEBSITE_BASE_URL = 'https://radio.esperanzah.be/' COMBO_INITIAL_LOGIN_PAGE_PATH = '/' COMBO_WELCOME_PAGE_PATH = None diff --cc panikweb/views.py index c1e45a8,3314d71..966e77f --- a/panikweb/views.py +++ b/panikweb/views.py @@@ -683,14 -652,8 +691,15 @@@ def onair(request) 'url': d['emission'].get_absolute_url(), 'chat': chat_url, } + + track_title = None + playing_txt = os.path.join(settings.MEDIA_ROOT, 'playing.txt') + if os.path.exists(playing_txt): + track_title = open(playing_txt).read().strip() + if len(track_title) < 6: + track_title = None if d.get('nonstop'): + redirect_path = d['nonstop'].redirect_path d['nonstop'] = { 'title': d['nonstop'].title, } @@@ -746,10 -702,10 +755,10 @@@ class RssCustomPodcastsFeed(Rss201rev2F handler.addQuickElement('itunes:name', emission.title) handler.endElement('itunes:owner') else: - handler.addQuickElement('itunes:author', 'Radio Esperanzah!') + handler.addQuickElement('itunes:author', settings.RADIO_NAME) handler.startElement('itunes:owner', {}) - handler.addQuickElement('itunes:email', 'info@radiopanik.org') + handler.addQuickElement('itunes:email', 'radio@esperanzah.be') - handler.addQuickElement('itunes:name', 'Radio Esperanzah!') + handler.addQuickElement('itunes:name', settings.RADIO_NAME) handler.endElement('itunes:owner') def root_attributes(self): @@@ -792,8 -748,8 +801,8 @@@ class PodcastsFeed(Feed) def item_title(self, item): if item.fragment: - return '%s - %s' % (item.title, item.episode.title) - return '[%s] %s - %s' % (item.episode.emission.title, item.title, item.episode.title) - return '[%s] %s' % (item.episode.emission.title, item.episode.title) ++ return '%s - %s - %s' % (item.episode.emission.title, item.title, item.episode.title) + return '%s - %s' % (item.episode.emission.title, item.episode.title) def item_link(self, item): return item.episode.get_absolute_url() diff --cc panikweb_templates/locale/fr/LC_MESSAGES/django.po index 2ccd05f,adb2c84..65af4e1 --- a/panikweb_templates/locale/fr/LC_MESSAGES/django.po +++ b/panikweb_templates/locale/fr/LC_MESSAGES/django.po @@@ -110,14 -139,14 +139,14 @@@ msgstr "À propos msgid "Get the stream on your player!" msgstr "Récupérez le stream sur votre lecteur !" - #: templates/includes/player.html:10 - msgid "Need some help?" - msgstr "Besoin d'aide ?" - - #: templates/includes/player.html:14 + #: templates/includes/player.html:13 msgid "live" -msgstr "en direct" +msgstr "En direct de la radio" + #: templates/includes/player.html:38 + msgid "Empty playlist" + msgstr "Vider la playlist" + #: templates/nonstop_playlist.html:16 msgid "Playlist" msgstr "Playlist" diff --cc panikweb_templates/static/css/_specifics.scss index bc1a6e7,91e927b..85581bb --- a/panikweb_templates/static/css/_specifics.scss +++ b/panikweb_templates/static/css/_specifics.scss @@@ -111,10 -87,10 +103,10 @@@ h5.focus-title .wrapper.text {max-width: 780px; margin:auto;} .wrapper .rightPart{margin-top:1em;} -@media screen and (min-width: 760px) { +@media screen and (min-width: $size_m) { #player-container.fixed { position: fixed; - top: 50px; + top: 60px; width: calc(0% + 235px); } .wrapper .rightPart{ @@@ -2328,19 -2111,8 +2337,25 @@@ div#loading-page 100% { right: 0%; } } +div#header_date { + text-transform: uppercase; + position: absolute; + text-align: left; + color: $red; + font-weight: bold; + top: 63px; + left: 135px; + @media screen and (max-width:$size_m){ + display: none; + } +} + +h2.top { + padding-bottom: 2rem; +} ++ + .episode-auto-selection-cell.hide-emission-titles { + .emission-title, .soundfile-info .sep { + display: none; + } + } diff --cc panikweb_templates/static/js/audioPlayer.js index 47f5486,35f1daf..8622f7f --- a/panikweb_templates/static/js/audioPlayer.js +++ b/panikweb_templates/static/js/audioPlayer.js @@@ -128,17 -127,18 +128,18 @@@ } thePlaylist.setFocus(container); container.addClass('playing'); - playpause.addClass('icon-pause').removeClass('icon-play'); - thePlaylist.controlButtons['playpause'].removeClass('icon-play').addClass('icon-pause'); + playpause.addClass('action-pause').removeClass('action-play'); + thePlaylist.controlButtons['playpause'].removeClass('action-play').addClass('action-pause'); thePlaylist.afterPlay(); - }).on('pause',function(){ - container.removeClass('playing'); - $(this).removeClass('playing'); - playpause.addClass('action-play').removeClass('action-pause'); - thePlaylist.controlButtons['playpause'].removeClass('action-pause').addClass('action-play'); - }).on('stop',function(){ - container.removeClass('playing'); + var sound_id = $(e.target).data('sound-id'); + $(document).trigger('panik:play', {'sound_id': sound_id}); + }).on('pause',function(e){ $(this).removeClass('playing'); + playpause.addClass('icon-play').removeClass('icon-pause'); + var sound_id = $(e.target).data('sound-id'); + $(document).trigger('panik:pause', {'sound_id': sound_id}); + thePlaylist.controlButtons['playpause'].removeClass('icon-pause').addClass('icon-play'); + }).on('stop',function(event){ $(this).trigger('pause'); if($(this)[0].currentTime){$(this)[0].currentTime = 0;} }).on("ended", function(e){ @@@ -159,10 -159,7 +160,7 @@@ }); var controls = $('',{'class':'soundControls controls'}); var link = $('',{href:sound.url,'class':'button icon-external-link'}); - var html5 = $(' + {% endif %} + >{% trans "Play" %} + {% if embed %}
-
-
- - -
+
-
-
{% trans 'live' %}
- +
-
+ diff --cc panikweb_templates/templates/panikombo/episode_auto_selection.html index 7d416ab,fa6dc8d..c126beb --- a/panikweb_templates/templates/panikombo/episode_auto_selection.html +++ b/panikweb_templates/templates/panikombo/episode_auto_selection.html @@@ -1,20 -1,39 +1,19 @@@ {% load paniktags thumbnail staticfiles %} {% if title and episodes %}

{{title}}

{% endif %} {% for episode in episodes %} - -
- - {% endfor %}