diff --git a/src/pretix/control/forms/__init__.py b/src/pretix/control/forms/__init__.py index 61e3c3ddb2..72945781ab 100644 --- a/src/pretix/control/forms/__init__.py +++ b/src/pretix/control/forms/__init__.py @@ -200,3 +200,7 @@ class SplitDateTimeField(forms.SplitDateTimeField): result = datetime.datetime.combine(*data_list) return from_current_timezone(result) return None + + +class FontSelect(forms.RadioSelect): + option_template_name = 'pretixcontrol/font_option.html' diff --git a/src/pretix/control/forms/event.py b/src/pretix/control/forms/event.py index 261a1a459b..62acd365c4 100644 --- a/src/pretix/control/forms/event.py +++ b/src/pretix/control/forms/event.py @@ -25,8 +25,8 @@ from pretix.base.models.event import EventMetaValue, SubEvent from pretix.base.reldate import RelativeDateField, RelativeDateTimeField from pretix.base.settings import PERSON_NAME_SCHEMES from pretix.control.forms import ( - ExtFileField, MultipleLanguagesWidget, SingleLanguageWidget, SlugWidget, - SplitDateTimeField, SplitDateTimePickerWidget, + ExtFileField, FontSelect, MultipleLanguagesWidget, SingleLanguageWidget, + SlugWidget, SplitDateTimeField, SplitDateTimePickerWidget, ) from pretix.multidomain.urlreverse import build_absolute_uri from pretix.plugins.banktransfer.payment import BankTransfer @@ -1140,6 +1140,7 @@ class DisplaySettingsForm(SettingsForm): choices=[ ('Open Sans', 'Open Sans') ], + widget=FontSelect, help_text=_('Only respected by modern browsers.') ) frontpage_text = I18nFormField( diff --git a/src/pretix/control/forms/organizer.py b/src/pretix/control/forms/organizer.py index 989e1b4d48..37395978f0 100644 --- a/src/pretix/control/forms/organizer.py +++ b/src/pretix/control/forms/organizer.py @@ -12,7 +12,9 @@ from pretix.api.models import WebHook from pretix.api.webhooks import get_all_webhook_events from pretix.base.forms import I18nModelForm, SettingsForm from pretix.base.models import Device, Organizer, Team -from pretix.control.forms import ExtFileField, MultipleLanguagesWidget +from pretix.control.forms import ( + ExtFileField, FontSelect, MultipleLanguagesWidget, +) from pretix.multidomain.models import KnownDomain from pretix.presale.style import get_fonts @@ -260,6 +262,7 @@ class OrganizerDisplaySettingsForm(SettingsForm): choices=[ ('Open Sans', 'Open Sans') ], + widget=FontSelect, help_text=_('Only respected by modern browsers.') ) favicon = ExtFileField( diff --git a/src/pretix/control/templates/pretixcontrol/event/display.html b/src/pretix/control/templates/pretixcontrol/event/display.html index ee991b2064..d377962306 100644 --- a/src/pretix/control/templates/pretixcontrol/event/display.html +++ b/src/pretix/control/templates/pretixcontrol/event/display.html @@ -2,6 +2,10 @@ {% load i18n %} {% load bootstrap3 %} {% load hierarkey_form %} +{% block custom_header %} + {{ block.super }} + +{% endblock %} {% block inside %}