diff --git a/src/pretix/api/serializers/event.py b/src/pretix/api/serializers/event.py index ba9d5950f..7a2e9fbc6 100644 --- a/src/pretix/api/serializers/event.py +++ b/src/pretix/api/serializers/event.py @@ -533,6 +533,7 @@ class EventSettingsSerializer(serializers.Serializer): 'presale_has_ended_text', 'voucher_explanation_text', 'banner_text', + 'banner_text_bottom', 'show_dates_on_frontpage', 'show_date_to', 'show_times', diff --git a/src/pretix/base/settings.py b/src/pretix/base/settings.py index 0b45b6eea..2c20759e6 100644 --- a/src/pretix/base/settings.py +++ b/src/pretix/base/settings.py @@ -1475,10 +1475,23 @@ Your {event} team""")) 'serializer_class': I18nField, 'form_class': I18nFormField, 'form_kwargs': dict( - label=_("Banner text"), + label=_("Banner text (top)"), widget=I18nTextarea, widget_kwargs={'attrs': {'rows': '2'}}, - help_text=_("This text will be shown above and below every page of your shop. Please only use this for " + help_text=_("This text will be shown above every page of your shop. Please only use this for " + "very important messages.") + ) + }, + 'banner_text_bottom': { + 'default': '', + 'type': LazyI18nString, + 'serializer_class': I18nField, + 'form_class': I18nFormField, + 'form_kwargs': dict( + label=_("Banner text (bottom)"), + widget=I18nTextarea, + widget_kwargs={'attrs': {'rows': '2'}}, + help_text=_("This text will be shown below every page of your shop. Please only use this for " "very important messages.") ) }, diff --git a/src/pretix/control/forms/event.py b/src/pretix/control/forms/event.py index c9b1068e1..b1a410cb1 100644 --- a/src/pretix/control/forms/event.py +++ b/src/pretix/control/forms/event.py @@ -521,6 +521,7 @@ class EventSettingsForm(SettingsForm): 'attendee_addresses_required', 'confirm_text', 'banner_text', + 'banner_text_bottom', 'order_email_asked_twice', 'last_order_modification_date', ] diff --git a/src/pretix/control/templates/pretixcontrol/event/settings.html b/src/pretix/control/templates/pretixcontrol/event/settings.html index 8c2453b88..bcea51ef2 100644 --- a/src/pretix/control/templates/pretixcontrol/event/settings.html +++ b/src/pretix/control/templates/pretixcontrol/event/settings.html @@ -82,17 +82,94 @@
{% trans "Attendee data" %} - {% bootstrap_field sform.attendee_names_asked layout="control" %} - {% bootstrap_field sform.attendee_names_required layout="control" %} + {% trans "Asked for every ticket" as ask_label %} + {% trans "Required" as req_label %} +
+ +
+
+ +
+
+
+
+ +
+
+
+ {% trans "Ask twice to avoid errors" as label %} + {% bootstrap_field sform.order_email_asked_twice layout="inline" form_group_class="" label=label %} +
+
+
+ +
+
+ {% url "control:event.settings.invoice" event=request.event.slug organizer=request.organizer.slug as inv_settings %} + {% blocktrans trimmed with a_attr='href="'|add:inv_settings|add:'#tab-0-1-open"'|safe %} + These settings can be modified in the "Invoicing" section. + {% endblocktrans %} +
+
+
+
+ +
+ {% bootstrap_field sform.attendee_names_asked layout="inline" form_group_class="" label=ask_label %} +
+
+ {% bootstrap_field sform.attendee_names_required layout="inline" form_group_class="" label=req_label %} +
+
+
+ +
+ {% bootstrap_field sform.attendee_emails_asked layout="inline" form_group_class="" label=ask_label %} +
+
+ {% bootstrap_field sform.attendee_emails_required layout="inline" form_group_class="" label=req_label %} +
+
+
+ +
+ {% bootstrap_field sform.attendee_company_asked layout="inline" form_group_class="" label=ask_label %} +
+
+ {% bootstrap_field sform.attendee_company_required layout="inline" form_group_class="" label=req_label %} +
+
+
+ +
+ {% bootstrap_field sform.attendee_addresses_asked layout="inline" form_group_class="" label=ask_label %} +
+
+ {% bootstrap_field sform.attendee_addresses_required layout="inline" form_group_class="" label=req_label %} +
+
{% bootstrap_field sform.name_scheme layout="control" %} {% bootstrap_field sform.name_scheme_titles layout="control" %} - {% bootstrap_field sform.order_email_asked_twice layout="control" %} - {% bootstrap_field sform.attendee_emails_asked layout="control" %} - {% bootstrap_field sform.attendee_emails_required layout="control" %} - {% bootstrap_field sform.attendee_company_asked layout="control" %} - {% bootstrap_field sform.attendee_company_required layout="control" %} - {% bootstrap_field sform.attendee_addresses_asked layout="control" %} - {% bootstrap_field sform.attendee_addresses_required layout="control" %}
{% trans "Texts" %} @@ -102,6 +179,7 @@ {% bootstrap_field sform.confirm_text layout="control" %} {% bootstrap_field sform.checkout_email_helptext layout="control" %} {% bootstrap_field sform.banner_text layout="control" %} + {% bootstrap_field sform.banner_text_bottom layout="control" %}
{% trans "Shop design" %} diff --git a/src/pretix/presale/templates/pretixpresale/event/base.html b/src/pretix/presale/templates/pretixpresale/event/base.html index 5cd5988fc..31374a561 100644 --- a/src/pretix/presale/templates/pretixpresale/event/base.html +++ b/src/pretix/presale/templates/pretixpresale/event/base.html @@ -118,8 +118,8 @@ {% endif %} {% block content %} {% endblock %} - {% if request.event.settings.banner_text %} - {{ request.event.settings.banner_text|rich_text }} + {% if request.event.settings.banner_text_bottom %} + {{ request.event.settings.banner_text_bottom|rich_text }} {% endif %} {% if request.event.testmode %} {% if request.sales_channel.testmode_supported %}