From e657fe6605102f1b8033dc0c37952a61e320c29e Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Mon, 15 Jun 2015 20:17:18 +0200 Subject: [PATCH] Added configuration options for imprint URL and contact email address --- src/pretix/base/settings.py | 8 ++++++++ src/pretix/control/forms/event.py | 9 +++++++++ .../control/templates/pretixcontrol/event/settings.html | 2 ++ .../presale/templates/pretixpresale/event/base.html | 7 +++++++ 4 files changed, 26 insertions(+) diff --git a/src/pretix/base/settings.py b/src/pretix/base/settings.py index 55aa70ace..d09cc031b 100644 --- a/src/pretix/base/settings.py +++ b/src/pretix/base/settings.py @@ -81,6 +81,14 @@ DEFAULTS = { 'default': None, 'type': datetime }, + 'contact_mail': { + 'default': None, + 'type': str + }, + 'imprint_url': { + 'default': None, + 'type': str + }, 'mail_from': { 'default': settings.MAIL_FROM, 'type': str diff --git a/src/pretix/control/forms/event.py b/src/pretix/control/forms/event.py index 4a699b1f8..bcc428250 100644 --- a/src/pretix/control/forms/event.py +++ b/src/pretix/control/forms/event.py @@ -142,6 +142,15 @@ class EventSettingsForm(SettingsForm): label=_("Reservation period"), help_text=_("The number of minutes the items in a user's card are reserved for this user."), ) + imprint_url = forms.URLField( + label=_("Imprint URL"), + required=False, + ) + contact_mail = forms.EmailField( + label=_("Contact address"), + required=False, + help_text=_("Public email address for contacting the organizer") + ) mail_from = forms.EmailField( label=_("Sender address"), help_text=_("Sender address for outgoing e-mails") diff --git a/src/pretix/control/templates/pretixcontrol/event/settings.html b/src/pretix/control/templates/pretixcontrol/event/settings.html index 04e1724e3..f79a7427b 100644 --- a/src/pretix/control/templates/pretixcontrol/event/settings.html +++ b/src/pretix/control/templates/pretixcontrol/event/settings.html @@ -19,6 +19,8 @@ {% bootstrap_field sform.timezone layout="horizontal" %} {% bootstrap_field sform.show_date_to layout="horizontal" %} {% bootstrap_field sform.show_times layout="horizontal" %} + {% bootstrap_field sform.contact_mail layout="horizontal" %} + {% bootstrap_field sform.imprint_url layout="horizontal" %}
{% trans "Timeline" %} diff --git a/src/pretix/presale/templates/pretixpresale/event/base.html b/src/pretix/presale/templates/pretixpresale/event/base.html index 8e2ae7fc3..3ea5e5521 100644 --- a/src/pretix/presale/templates/pretixpresale/event/base.html +++ b/src/pretix/presale/templates/pretixpresale/event/base.html @@ -61,6 +61,13 @@ {% endblock %}