1
0
Fork 0
mirror of https://github.com/Kunsi/pretalx-plugin-broadcast-tools synced 2024-11-14 17:45:49 +00:00

Merge pull request #24 from pretalx/main

Fix overlooked jquery link + remove bootstrap4
This commit is contained in:
Franzi 2024-10-12 19:23:44 +02:00 committed by GitHub
commit 529f7f1eee
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 10 deletions

View file

@ -1,5 +1,4 @@
{% extends "orga/base.html" %}
{% load bootstrap4 %}
{% load i18n %}
{% block content %}
@ -54,8 +53,8 @@
<legend>
{% translate "Lower thirds" %}
</legend>
{% bootstrap_field form.broadcast_tools_lower_thirds_no_talk_info layout='event' %}
{% bootstrap_field form.broadcast_tools_lower_thirds_info_string layout='event' %}
{{ form.broadcast_tools_lower_thirds_no_talk_info.as_field_group }}
{{ form.broadcast_tools_lower_thirds_info_string.as_field_group }}
<p>
The info line will be shown on the bottom right side of your
lower third. If you set it to an empty string, it will automatically
@ -66,17 +65,17 @@
<legend>
{% translate "Room info" %}
</legend>
{% bootstrap_field form.broadcast_tools_room_info_lower_content layout='event' %}
{% bootstrap_field form.broadcast_tools_room_info_show_next_talk layout='event' %}
{{ form.broadcast_tools_room_info_lower_content.as_field_group }}
{{ form.broadcast_tools_room_info_show_next_talk.as_field_group }}
</fieldset>
<fieldset>
<legend>
{% translate "PDF export" %}
</legend>
{% bootstrap_field form.broadcast_tools_pdf_show_internal_notes layout='event' %}
{% bootstrap_field form.broadcast_tools_pdf_ignore_do_not_record layout='event' %}
{% bootstrap_field form.broadcast_tools_pdf_questions_to_include layout='event' %}
{% bootstrap_field form.broadcast_tools_pdf_additional_content layout='event' %}
{{ form.broadcast_tools_pdf_show_internal_notes.as_field_group }}
{{ form.broadcast_tools_pdf_ignore_do_not_record.as_field_group }}
{{ form.broadcast_tools_pdf_questions_to_include.as_field_group }}
{{ form.broadcast_tools_pdf_additional_content.as_field_group }}
</fieldset>
<fieldset>
<div class="submit-group panel">

View file

@ -7,7 +7,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
<title>{{ request.event.name }} room info</title>
{% compress js %}
<script src="{% static "vendored/jquery-3.1.1.js" %}"></script>
<script src="{% static "js/jquery.js" %}"></script>
{% endcompress %}
<script src="{% static "pretalx_broadcast_tools/generic.js" %}"></script>
<script src="{% static "pretalx_broadcast_tools/room_info.js" %}"></script>