From ab42dade2bc3e569f70af86ba08437cf4c25161c Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Wed, 29 Mar 2023 10:33:07 +0200 Subject: [PATCH] lower thirds: change css selectors to be similar to the others --- CHANGELOG.md | 7 ++++ .../pretalx_broadcast_tools/frontend.css | 8 ++--- .../pretalx_broadcast_tools/lower_thirds.js | 32 +++++++++---------- .../pretalx_broadcast_tools/lower_thirds.html | 10 +++--- 4 files changed, 32 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c395e44..4e1dc69 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ * room info page can now show more content on the lower half of the view * **BREAKING:** The option to select which content should be shown is now a ChoiceField, the old setting will be ignored. +* **BREAKING:** lower thirds now use css selectors using the same rules + as the other css selectors + * `#l3box` is now `#broadcast_tools_lower_thirds_box` + * `#l3info_line` is now `#broadcast_tools_lower_thirds_infoline` + * `#l3speaker` is now `#broadcast_tools_lower_thirds_speaker` + * `#l3title` is now `#broadcast_tools_lower_thirds_title` + * `.lower3rd` is now `broadcast_tools_lower_thirds` # 1.1.0 diff --git a/pretalx_broadcast_tools/static/pretalx_broadcast_tools/frontend.css b/pretalx_broadcast_tools/static/pretalx_broadcast_tools/frontend.css index 6030e3c..70752cb 100644 --- a/pretalx_broadcast_tools/static/pretalx_broadcast_tools/frontend.css +++ b/pretalx_broadcast_tools/static/pretalx_broadcast_tools/frontend.css @@ -52,7 +52,7 @@ body { margin-top: 1em; } -#l3box { +#broadcast_tools_lower_thirds_box { width: 1020px; position: absolute; @@ -65,17 +65,17 @@ body { background-color: #3aa57c; } -#l3title { +#broadcast_tools_lower_thirds_title { font-size: 30px; font-weight: 500; margin-bottom: 15px; } -#l3speaker { +#broadcast_tools_lower_thirds_speaker { font-size: 20px; } -#l3info_line { +#broadcast_tools_lower_thirds_infoline { font-size: 16px; text-align: right; } diff --git a/pretalx_broadcast_tools/static/pretalx_broadcast_tools/lower_thirds.js b/pretalx_broadcast_tools/static/pretalx_broadcast_tools/lower_thirds.js index 3ef034c..78156d7 100644 --- a/pretalx_broadcast_tools/static/pretalx_broadcast_tools/lower_thirds.js +++ b/pretalx_broadcast_tools/static/pretalx_broadcast_tools/lower_thirds.js @@ -6,42 +6,42 @@ function update_lower_third() { return } - $('#l3box').css('background-color', event_info['color']); + $('#broadcast_tools_lower_thirds_box').css('background-color', event_info['color']); if (!schedule) { - $('#l3title').text('Waiting for schedule ...') + $('#broadcast_tools_lower_thirds_title').text('Waiting for schedule ...') return } if ('error' in schedule) { - $('#l3title').text('Error') - $('#l3speaker').html(schedule['error'].join('
')); - $('#l3info_line').text(''); + $('#broadcast_tools_lower_thirds_title').text('Error') + $('#broadcast_tools_lower_thirds_speaker').html(schedule['error'].join('
')); + $('#broadcast_tools_lower_thirds_infoline').text(''); return } if (schedule['rooms'].length > 1 && !schedule['rooms'].includes(room_name)) { - $('#l3title').text('Error') - $('#l3speaker').text('Invalid room_name. Valid names: ' + schedule['rooms'].join(', ')); - $('#l3info_line').text(''); + $('#broadcast_tools_lower_thirds_title').text('Error') + $('#broadcast_tools_lower_thirds_speaker').text('Invalid room_name. Valid names: ' + schedule['rooms'].join(', ')); + $('#broadcast_tools_lower_thirds_infoline').text(''); return } current_talk = get_current_talk(5); if (current_talk) { - $('#l3title').text(current_talk['title']); - $('#l3speaker').text(current_talk['persons'].join(', ')); - $('#l3info_line').text(current_talk['infoline']); + $('#broadcast_tools_lower_thirds_title').text(current_talk['title']); + $('#broadcast_tools_lower_thirds_speaker').text(current_talk['persons'].join(', ')); + $('#broadcast_tools_lower_thirds_infoline').text(current_talk['infoline']); } else { - $('#l3title').text(event_info['no_talk']); - $('#l3speaker').text(''); - $('#l3info_line').text(''); + $('#broadcast_tools_lower_thirds_title').text(event_info['no_talk']); + $('#broadcast_tools_lower_thirds_speaker').text(''); + $('#broadcast_tools_lower_thirds_infoline').text(''); } if (current_talk && current_talk['track']) { - $('#l3box').css('border-bottom', '10px solid ' + current_talk['track']['color']); + $('#broadcast_tools_lower_thirds_box').css('border-bottom', '10px solid ' + current_talk['track']['color']); } else { - $('#l3box').css('border-bottom', 'none'); + $('#broadcast_tools_lower_thirds_box').css('border-bottom', 'none'); } } window.setInterval(update_lower_third, 1000); diff --git a/pretalx_broadcast_tools/templates/pretalx_broadcast_tools/lower_thirds.html b/pretalx_broadcast_tools/templates/pretalx_broadcast_tools/lower_thirds.html index 458be8c..c330e27 100644 --- a/pretalx_broadcast_tools/templates/pretalx_broadcast_tools/lower_thirds.html +++ b/pretalx_broadcast_tools/templates/pretalx_broadcast_tools/lower_thirds.html @@ -16,11 +16,11 @@ {% endif %} - -
-

Loading ...

-

Content should appear soon. If not, please verify you have Javascript enabled.

-

+ +
+

Loading ...

+

Content should appear soon. If not, please verify you have Javascript enabled.

+