diff --git a/pretalx_broadcast_tools/static/pretalx_broadcast_tools/frontend.css b/pretalx_broadcast_tools/static/pretalx_broadcast_tools/frontend.css index e1d0c47..f12077f 100644 --- a/pretalx_broadcast_tools/static/pretalx_broadcast_tools/frontend.css +++ b/pretalx_broadcast_tools/static/pretalx_broadcast_tools/frontend.css @@ -14,6 +14,7 @@ body { display: flex; flex-flow: column; height: 100vh; + overflow: hidden; } #broadcast_tools_room_info_header, #broadcast_tools_room_info_qr { @@ -38,7 +39,11 @@ body { #broadcast_tools_room_info_qr img { background-color: white; - height: 100%; + height: calc(100% - 2em); +} + +#broadcast_tools_room_info_qr p { + margin-top: 1em; } #l3box { diff --git a/pretalx_broadcast_tools/static/pretalx_broadcast_tools/room_info.js b/pretalx_broadcast_tools/static/pretalx_broadcast_tools/room_info.js index f5bd3c1..c906fb2 100644 --- a/pretalx_broadcast_tools/static/pretalx_broadcast_tools/room_info.js +++ b/pretalx_broadcast_tools/static/pretalx_broadcast_tools/room_info.js @@ -43,7 +43,7 @@ function update_room_info() { if (current_talk) { $('#broadcast_tools_room_info_title').text(current_talk['title']); $('#broadcast_tools_room_info_speaker').text(current_talk['persons'].join(', ')); - $('#broadcast_tools_room_info_qr').html('Feedback QR Code'); + $('#broadcast_tools_room_info_qr').html('Feedback QR Code

Leave Feedback by scanning the code or visiting ' + current_talk['urls']['feedback'] + '

'); } else { $('#broadcast_tools_room_info_title').text(event_info['no_talk']); $('#broadcast_tools_room_info_speaker').text(''); diff --git a/pretalx_broadcast_tools/views.py b/pretalx_broadcast_tools/views.py index 0d71408..1d8fc6b 100644 --- a/pretalx_broadcast_tools/views.py +++ b/pretalx_broadcast_tools/views.py @@ -133,13 +133,19 @@ class BroadcastToolsScheduleView(EventPermissionRequired, ScheduleMixin, View): else None, "room": room["name"].localize(schedule.event.locale), "infoline": infoline.format(**placeholders(schedule, talk)), - "feedback_qr_url": reverse( - "plugins:pretalx_broadcast_tools:feedback_qr_id", - kwargs={ - "event": schedule.event, - "talk": talk.submission.id, - }, - ), + "urls": { + "feedback": "{}{}".format( + schedule.event.custom_domain or settings.SITE_URL, + talk.submission.urls.feedback, + ), + "feedback_qr": reverse( + "plugins:pretalx_broadcast_tools:feedback_qr_id", + kwargs={ + "event": schedule.event, + "talk": talk.submission.id, + }, + ), + }, } for day in schedule.data for room in day["rooms"]