CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-06 15:24:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Split banner text into top and bottom

Browse Source
This commit is contained in:
Raphael Michel
2020-04-03 13:02:23 +02:00
parent 25dd8f2e2f
commit 1ffc799c4d
5 changed files with 106 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/pretix/api/serializers/event.py
View File

@@ -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',

17
src/pretix/base/settings.py
View File

@@ -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.")
)
},

1
src/pretix/control/forms/event.py
View File

@@ -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',
]

96
src/pretix/control/templates/pretixcontrol/event/settings.html
View File

@@ -82,17 +82,94 @@
</fieldset>
<fieldset>
<legend>{% trans "Attendee data" %}</legend>
{% 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 %}
<div class="form-group">
<label class="col-md-3 control-label">
{% trans "Buyer email" %}
</label>
<div class="col-md-2">
<div class="checkbox">
<label>
<input type="checkbox"
checked disabled>
{% trans "Asked" %}
</label>
</div>
</div>
<div class="col-md-2">
<div class="checkbox">
<label>
<input type="checkbox"
checked disabled>
{{ req_label }}
</label>
</div>
</div>
<div class="col-md-2">
{% trans "Ask twice to avoid errors" as label %}
{% bootstrap_field sform.order_email_asked_twice layout="inline" form_group_class="" label=label %}
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label">
{% trans "Buyer name and address" %}
</label>
<div class="col-md-9">
<div class="help-block">
{% 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 "<a {{ a_attr }}>Invoicing</a>" section.
{% endblocktrans %}
</div>
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label">
{% trans "Attendee name" %}
</label>
<div class="col-md-2">
{% bootstrap_field sform.attendee_names_asked layout="inline" form_group_class="" label=ask_label %}
</div>
<div class="col-md-2">
{% bootstrap_field sform.attendee_names_required layout="inline" form_group_class="" label=req_label %}
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label">
{% trans "Attendee email" %}
</label>
<div class="col-md-2">
{% bootstrap_field sform.attendee_emails_asked layout="inline" form_group_class="" label=ask_label %}
</div>
<div class="col-md-2">
{% bootstrap_field sform.attendee_emails_required layout="inline" form_group_class="" label=req_label %}
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label">
{% trans "Attendee company" %}
</label>
<div class="col-md-2">
{% bootstrap_field sform.attendee_company_asked layout="inline" form_group_class="" label=ask_label %}
</div>
<div class="col-md-2">
{% bootstrap_field sform.attendee_company_required layout="inline" form_group_class="" label=req_label %}
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label">
{% trans "Attendee address" %}
</label>
<div class="col-md-2">
{% bootstrap_field sform.attendee_addresses_asked layout="inline" form_group_class="" label=ask_label %}
</div>
<div class="col-md-2">
{% bootstrap_field sform.attendee_addresses_required layout="inline" form_group_class="" label=req_label %}
</div>
</div>
{% 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" %}
</fieldset>
<fieldset>
<legend>{% trans "Texts" %}</legend>
@@ -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" %}
</fieldset>
<fieldset>
<legend>{% trans "Shop design" %}</legend>

4
src/pretix/presale/templates/pretixpresale/event/base.html
View File

@@ -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 %}