From e9f0af189839159782b2631294bdb395968dd9d9 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Mon, 16 Jul 2018 10:34:23 +0200 Subject: [PATCH] More views --- src/pretix/base/models/items.py | 12 + .../pretixcontrol/checkin/index.html | 20 ++ .../pretixcontrol/event/quick_setup.html | 91 +++--- .../pretixcontrol/event/tax_index.html | 5 + .../pretixcontrol/events/create_base.html | 14 - .../pretixcontrol/events/create_basics.html | 113 +++++--- .../pretixcontrol/events/create_copy.html | 50 +++- .../events/create_foundation.html | 36 ++- .../templates/pretixcontrol/events/index.html | 262 ++++++++++-------- .../pretixcontrol/global_message.html | 10 +- .../pretixcontrol/global_settings.html | 25 +- .../pretixcontrol/global_settings_base.html | 13 - .../pretixcontrol/global_update.html | 116 ++++---- .../pretixcontrol/items/categories.html | 5 + .../templates/pretixcontrol/items/index.html | 7 +- .../pretixcontrol/items/question.html | 207 ++++++++------ .../templates/pretixcontrol/items/quota.html | 143 +++++----- .../pretixcontrol/oauth/app_delete.html | 33 ++- .../pretixcontrol/oauth/app_list.html | 91 +++--- .../pretixcontrol/oauth/app_register.html | 24 +- .../pretixcontrol/oauth/app_rollkeys.html | 33 ++- .../pretixcontrol/oauth/app_update.html | 24 +- .../pretixcontrol/oauth/auth_revoke.html | 32 ++- .../pretixcontrol/oauth/authorized.html | 12 +- .../templates/pretixcontrol/orders/index.html | 3 - .../pretixcontrol/organizers/create.html | 27 +- .../pretixcontrol/organizers/detail.html | 16 +- .../pretixcontrol/organizers/display.html | 43 +-- .../pretixcontrol/organizers/edit.html | 149 +++++----- .../pretixcontrol/organizers/index.html | 82 +++--- .../pretixcontrol/organizers/team_delete.html | 55 ++-- .../pretixcontrol/organizers/team_edit.html | 69 +++-- .../organizers/team_members.html | 207 +++++++------- .../pretixcontrol/organizers/teams.html | 99 +++---- .../templates/pretixcontrol/pdf/index.html | 21 +- .../pretixcontrol/search/orders.html | 152 +++++----- .../pretixcontrol/shredder/index.html | 1 - .../pretixcontrol/subevents/bulk.html | 21 +- .../pretixcontrol/subevents/index.html | 148 +++++----- .../templates/pretixcontrol/user/2fa_add.html | 28 +- .../pretixcontrol/user/2fa_confirm_totp.html | 54 ++-- .../pretixcontrol/user/2fa_confirm_u2f.html | 48 ++-- .../pretixcontrol/user/2fa_delete.html | 42 +-- .../pretixcontrol/user/2fa_disable.html | 40 +-- .../pretixcontrol/user/2fa_enable.html | 42 +-- .../pretixcontrol/user/2fa_main.html | 52 ++-- .../user/2fa_regenemergency.html | 40 +-- .../templates/pretixcontrol/user/history.html | 1 - .../pretixcontrol/user/notifications.html | 105 ++++--- .../pretixcontrol/user/settings.html | 108 ++++---- .../user/staff_session_edit.html | 90 +++--- .../user/staff_session_list.html | 101 +++---- .../user/staff_session_start.html | 36 ++- .../templates/pretixcontrol/users/create.html | 31 ++- .../templates/pretixcontrol/users/form.html | 86 +++--- .../templates/pretixcontrol/users/index.html | 118 ++++---- .../pretixplugins/badges/delete.html | 33 ++- .../templates/pretixplugins/badges/edit.html | 56 ++-- .../templates/pretixplugins/badges/index.html | 146 +++++----- src/pretix/plugins/badges/views.py | 1 + .../banktransfer/import_assign.html | 46 +-- .../banktransfer/import_base.html | 1 - .../banktransfer/import_form.html | 45 +-- .../banktransfer/job_detail.html | 87 +++--- src/pretix/plugins/pretixdroid/signals.py | 2 +- .../pretixdroid/configuration.html | 181 ++++++------ .../pretixdroid/configuration_code.html | 131 +++++---- .../pretixplugins/sendmail/history.html | 10 +- .../pretixplugins/sendmail/send_form.html | 60 ++-- .../pretixplugins/statistics/index.html | 12 +- .../pretixplugins/ticketoutputpdf/delete.html | 33 ++- .../pretixplugins/ticketoutputpdf/edit.html | 58 ++-- .../pretixplugins/ticketoutputpdf/index.html | 143 +++++----- src/pretix/plugins/ticketoutputpdf/views.py | 1 + src/pretix/static/pretixbase/scss/_theme.scss | 17 +- .../static/pretixcontrol/scss/_forms.scss | 5 +- .../static/pretixcontrol/scss/main.scss | 12 +- 77 files changed, 2564 insertions(+), 2009 deletions(-) diff --git a/src/pretix/base/models/items.py b/src/pretix/base/models/items.py index 54087a9e6..1292d7698 100644 --- a/src/pretix/base/models/items.py +++ b/src/pretix/base/models/items.py @@ -1151,3 +1151,15 @@ class Quota(LoggedModel): else: if subevent: raise ValidationError(_('The subevent does not belong to this event.')) + + def get_items_display(self): + parts = [] + vars = self.variations.all() + for i in self.items.all(): + if i.has_variations: + for v in vars: + if v.item_id == i.pk: + parts.append('{} – {}'.format(i, v)) + else: + parts.append(str(i)) + return parts diff --git a/src/pretix/control/templates/pretixcontrol/checkin/index.html b/src/pretix/control/templates/pretixcontrol/checkin/index.html index 96629e4fa..ff2902255 100644 --- a/src/pretix/control/templates/pretixcontrol/checkin/index.html +++ b/src/pretix/control/templates/pretixcontrol/checkin/index.html @@ -32,6 +32,26 @@ {% blocktrans with name=checkinlist.name %}Check-in list: {{ name }}{% endblocktrans %} +
+
+
{% trans "Products" %}
+
+ {% if checkinlist.all_products %} + {% trans "All" %} + {% else %} + {{ checkinlist.limit_products.all|join:"
" }} + {% endif %} +
+
{% trans "Orders" %}
+
{% if checkinlist.include_pending %}{% trans "Pending and paid" %}{% else %}{% trans "Only paid orders" %}{% endif %}
+ {% if checkinlist.subevent %} +
{% trans "Date" context "subevent" %}
+
{{ checkinlist.subevent }}
+ {% endif %} +
+
+ +
{% bootstrap_field filter_form.user layout='inline' %} diff --git a/src/pretix/control/templates/pretixcontrol/event/quick_setup.html b/src/pretix/control/templates/pretixcontrol/event/quick_setup.html index f6c23f8dd..283d01689 100644 --- a/src/pretix/control/templates/pretixcontrol/event/quick_setup.html +++ b/src/pretix/control/templates/pretixcontrol/event/quick_setup.html @@ -4,34 +4,37 @@ {% load formset_tags %} {% block title %}{{ request.event.name }}{% endblock %} {% block content %} -
-
- -
-
- -

{% trans "Congratulations!" %}

-

- {% trans "You just created an event!" %} -

-

- {% blocktrans trimmed %} - You can scroll down and create your first ticket products quickly, or you can use the navigation - on the left to modify the settings of your event in much more detail. - {% endblocktrans %} -

-
+
+
+
+
+ +
+
+

{% trans "Congratulations!" %}

+

+ {% trans "You just created an event!" %} +

+

+ {% blocktrans trimmed %} + You can scroll down and create your first ticket products quickly, or you can use the + navigation + on the left to modify the settings of your event in much more detail. + {% endblocktrans %} +

+
+
+
{% csrf_token %} -
-
- -
-
+
+
{% trans "Create ticket types" %} +
+
{{ formset.management_form }} {% bootstrap_formset_errors formset %} @@ -104,7 +107,9 @@ {% trans "Total capacity:" %} {% bootstrap_field form.total_quota layout="inline" field_class="sr-only" %} - +
@@ -114,20 +119,19 @@

 

{% blocktrans trimmed %} - If you want to use more advanced features like non-admission products, product variations, custom - quotas, add-on products or want to modify your ticket types in more detail, you can later do so - in the "Products" section in the navigation. Don't worry, you can change everything you input here. + If you want to use more advanced features like non-admission products, product variations, + custom quotas, add-on products or want to modify your ticket types in more detail, you can later + do so in the "Products" section in the navigation. Don't worry, you can change everything you + input here. {% endblocktrans %}

-

 

-
-
- -
-
+
+
{% trans "Features" %} +
+

{% blocktrans trimmed %} We recommend that you take some time to go through the "Settings" part of your event, but if @@ -138,15 +142,13 @@ {% bootstrap_field form.waiting_list_enabled layout="control" label_class="sr-only" field_class="col-md-12" %} {% bootstrap_field form.show_quota_left layout="control" label_class="sr-only" field_class="col-md-12" %} {% bootstrap_field form.attendee_names_required layout="control" label_class="sr-only" field_class="col-md-12" %} -

 

-
-
- -
-
+
+
{% trans "Payment" %} +
+

{% blocktrans trimmed %} pretix supports a @@ -164,21 +166,20 @@

{% blocktrans trimmed %} - After you saved this page, we will redirect you to Stripe to create or connect an account + After you saved this page, we will redirect you to Stripe to create or connect an + account there. Once you completed this, you will be taken back to pretix. {% endblocktrans %}
{% endif %} -

 

-
-
- -
-
+
+
{% trans "Getting in touch with you" %} +
+

{% blocktrans trimmed %} In case something goes wrong or is unclear, we strongly suggest that you provide ways for your diff --git a/src/pretix/control/templates/pretixcontrol/event/tax_index.html b/src/pretix/control/templates/pretixcontrol/event/tax_index.html index ba07af709..4cbc0a4d6 100644 --- a/src/pretix/control/templates/pretixcontrol/event/tax_index.html +++ b/src/pretix/control/templates/pretixcontrol/event/tax_index.html @@ -6,6 +6,11 @@

{% trans "Tax rules" %}
+
+ {% trans "You can create one or multiple tax rules that you can apply to your products." %} +
+
+
{% if taxrules|length == 0 %}

diff --git a/src/pretix/control/templates/pretixcontrol/events/create_base.html b/src/pretix/control/templates/pretixcontrol/events/create_base.html index 4e0fa772e..0ba76913f 100644 --- a/src/pretix/control/templates/pretixcontrol/events/create_base.html +++ b/src/pretix/control/templates/pretixcontrol/events/create_base.html @@ -3,9 +3,6 @@ {% load bootstrap3 %} {% block title %}{% trans "Create a new event" %}{% endblock %} {% block content %} -

{% trans "Create a new event" %} {% blocktrans trimmed with step=wizard.steps.step1 %} - Step {{ step }} - {% endblocktrans %}

{% if has_organizer %} {% csrf_token %} @@ -13,17 +10,6 @@ {% bootstrap_form_errors form %} {% block form %} {% endblock %} -
- - {% if wizard.steps.prev %} - - {% endif %} -
{% else %}
diff --git a/src/pretix/control/templates/pretixcontrol/events/create_basics.html b/src/pretix/control/templates/pretixcontrol/events/create_basics.html index 9e7243249..4a61257aa 100644 --- a/src/pretix/control/templates/pretixcontrol/events/create_basics.html +++ b/src/pretix/control/templates/pretixcontrol/events/create_basics.html @@ -2,54 +2,81 @@ {% load i18n %} {% load bootstrap3 %} {% block form %} -
- {% trans "General information" %} - {% bootstrap_field form.name layout="control" %} -
- -
- - {% bootstrap_field form.slug form_group_class="helper-display-inline" show_label=False layout="inline" %} -
- {% blocktrans trimmed %} - This is the address users can buy your tickets at. Should be short, only contain lowercase - letters and numbers, and must be unique among your events. We recommend some kind of - abbreviation or a date with less than 10 characters that can be easily remembered, but you - can also choose to use a random value. - {% endblocktrans %} -
-
- {% blocktrans trimmed %} - We will also use this in some places like order codes, invoice numbers or bank transfer - references as an abbreviation to reference this event. - {% endblocktrans %} -
-
- {% blocktrans trimmed %} - We strongly recommend against using short forms of more then 16 characters. - {% endblocktrans %} +
+
+

{% trans "Create a new event" %} + {% blocktrans trimmed with step=wizard.steps.step1 %} + Step {{ step }} + {% endblocktrans %} +

+
+
+ {% bootstrap_field form.name layout="control" %} +
+ +
+ + {% bootstrap_field form.slug form_group_class="helper-display-inline" show_label=False layout="inline" %} +
+ {% blocktrans trimmed %} + This is the address users can buy your tickets at. Should be short, only contain lowercase + letters and numbers, and must be unique among your events. We recommend some kind of + abbreviation or a date with less than 10 characters that can be easily remembered, but you + can also choose to use a random value. + {% endblocktrans %} +
+
+ {% blocktrans trimmed %} + We will also use this in some places like order codes, invoice numbers or bank transfer + references as an abbreviation to reference this event. + {% endblocktrans %} +
+
+ {% blocktrans trimmed %} + We strongly recommend against using short forms of more then 16 characters. + {% endblocktrans %} +
+ {% bootstrap_field form.date_from layout="control" %} + {% bootstrap_field form.date_to layout="control" %} + {% bootstrap_field form.location layout="control" %} + {% bootstrap_field form.currency layout="control" %} + {% bootstrap_field form.tax_rate addon_after="%" layout="control" %} +
+
+
+
+ {% trans "Display settings" %} +
+
+ {% bootstrap_field form.locale layout="control" %} + {% bootstrap_field form.timezone layout="control" %}
- {% bootstrap_field form.date_from layout="control" %} - {% bootstrap_field form.date_to layout="control" %} - {% bootstrap_field form.location layout="control" %} - {% bootstrap_field form.currency layout="control" %} - {% bootstrap_field form.tax_rate addon_after="%" layout="control" %} -
-
- {% trans "Display settings" %} - {% bootstrap_field form.locale layout="control" %} - {% bootstrap_field form.timezone layout="control" %}
{% if form.presale_start %} -
- {% trans "Timeline" %} - {% bootstrap_field form.presale_start layout="control" %} - {% bootstrap_field form.presale_end layout="control" %} +
+
+ {% trans "Timeline" %} +
+
+ {% bootstrap_field form.presale_start layout="control" %} + {% bootstrap_field form.presale_end layout="control" %} +
{% endif %} +
+ + {% if wizard.steps.prev %} + + {% endif %} +
{% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/events/create_copy.html b/src/pretix/control/templates/pretixcontrol/events/create_copy.html index 445e7bd72..b4f8fe3ee 100644 --- a/src/pretix/control/templates/pretixcontrol/events/create_copy.html +++ b/src/pretix/control/templates/pretixcontrol/events/create_copy.html @@ -2,19 +2,41 @@ {% load i18n %} {% load bootstrap3 %} {% block form %} -

- {% blocktrans trimmed %} - Do you want to copy over your configuration from a different event? We will copy all - products, categories, quotas, and questions as well as general event settings. - {% endblocktrans %} -

-
- - {% blocktrans trimmed %} - Please make sure to review all settings extensively. You will probably still need to change some - settings manually, e.g. date and time settings and texts that contain the event name. - {% endblocktrans %} - +
+
+

{% trans "Create a new event" %} + {% blocktrans trimmed with step=wizard.steps.step1 %} + Step {{ step }} + {% endblocktrans %} +

+
+
+

+ {% blocktrans trimmed %} + Do you want to copy over your configuration from a different event? We will copy all + products, categories, quotas, and questions as well as general event settings. + {% endblocktrans %} +

+
+ + {% blocktrans trimmed %} + Please make sure to review all settings extensively. You will probably still need to change some + settings manually, e.g. date and time settings and texts that contain the event name. + {% endblocktrans %} + +
+ {% bootstrap_field form.copy_from_event layout="control" %} +
+ + {% if wizard.steps.prev %} + + {% endif %} +
+
- {% bootstrap_field form.copy_from_event layout="control" %} {% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/events/create_foundation.html b/src/pretix/control/templates/pretixcontrol/events/create_foundation.html index a673382c3..cdd694b2c 100644 --- a/src/pretix/control/templates/pretixcontrol/events/create_foundation.html +++ b/src/pretix/control/templates/pretixcontrol/events/create_foundation.html @@ -2,11 +2,33 @@ {% load i18n %} {% load bootstrap3 %} {% block form %} - {% bootstrap_field form.organizer layout="horizontal" %} - {% bootstrap_field form.locales layout="horizontal" %} - {% bootstrap_field form.has_subevents layout="horizontal" %} -

- - {% trans "Please note that you will only be able to delete your event until the first order has been created." %} -

+
+
+

{% trans "Create a new event" %} + {% blocktrans trimmed with step=wizard.steps.step1 %} + Step {{ step }} + {% endblocktrans %} +

+
+
+ {% bootstrap_field form.organizer layout="horizontal" %} + {% bootstrap_field form.locales layout="horizontal" %} + {% bootstrap_field form.has_subevents layout="horizontal" %} +

+ + {% trans "Please note that you will only be able to delete your event until the first order has been created." %} +

+
+ + {% if wizard.steps.prev %} + + {% endif %} +
+
+
{% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/events/index.html b/src/pretix/control/templates/pretixcontrol/events/index.html index 1ce4a8c91..805c20cf6 100644 --- a/src/pretix/control/templates/pretixcontrol/events/index.html +++ b/src/pretix/control/templates/pretixcontrol/events/index.html @@ -4,134 +4,150 @@ {% load bootstrap3 %} {% block title %}{% trans "Events" %}{% endblock %} {% block content %} -

{% trans "Events" %}

-

{% trans "The list below shows all events you have administrative access to. Click on the event name to access event details." %}

- {% if events|length == 0 and not filter_form.filtered %} -
-

- {% blocktrans trimmed %} - You currently do not have access to any events. - {% endblocktrans %} -

- - - - {% trans "Create a new event" %} - +
+
+

{% trans "Events" %}

- {% else %} -
-
- {% bootstrap_field filter_form.query layout='inline' %} +
{% trans "The list below shows all events you have administrative access to. Click on the event name to access event details." %}
+
+
+ {% if events|length == 0 and not filter_form.filtered %} +
+

+ {% blocktrans trimmed %} + You currently do not have access to any events. + {% endblocktrans %} +

+ + + + {% trans "Create a new event" %} +
-
- {% bootstrap_field filter_form.status layout='inline' %} -
-
- {% bootstrap_field filter_form.organizer layout='inline' %} -
-
- + +
+ +
+ + + {% trans "Create a new event" %} +
- -

- - - {% trans "Create a new event" %} - -

- - - - - {% if not hide_orga %} - - {% endif %} - - - - - - - {% for e in events %} +
- {% trans "Event name" %} - - {% trans "Organizer" %} - - - - {% trans "Start date" %} - - - / - {% trans "End date" %} - - - - {% trans "Paid tickets per quota" %} - - - - {% trans "Status" %} - - -
+ - - {% if not hide_orga %}{% endif %} - - - + + {% if not hide_orga %} + + {% endif %} + + + - {% endfor %} - -
- {{ e.name }} -
{{ e.slug }} - 		{{ e.organizer }} - {% if e.has_subevents %} - {{ e.min_from|default_if_none:""|date:"SHORT_DATETIME_FORMAT" }} - {% else %} - {{ e.get_short_date_from_display }} - {% endif %} - {% if e.has_subevents %} - {% trans "Series" %} - {% endif %} - {% if e.settings.show_date_to and e.date_to %} - –
- {% if e.has_subevents %} - {{ e.max_fromto|default_if_none:e.max_from|default_if_none:e.max_to|default_if_none:""|date:"SHORT_DATETIME_FORMAT" }} - {% else %} - {{ e.get_short_date_to_display }} - {% endif %} - {% endif %} - 		- {% for q in e.first_quotas|slice:":3" %} - {% include "pretixcontrol/fragment_quota_box_paid.html" with quota=q %} - {% endfor %} - {% if e.first_quotas|length > 3 %} - - ··· - - {% endif %} - - {% if not e.live %} - {% trans "Shop disabled" %} - {% elif e.presale_has_ended %} - {% trans "Presale over" %} - {% elif not e.presale_is_running %} - {% trans "Presale not started" %} - {% else %} - {% trans "On sale" %} - {% endif %} - + {% trans "Event name" %} + + {% trans "Organizer" %} + + + + {% trans "Start date" %} + + + / + {% trans "End date" %} + + + + {% trans "Paid tickets per quota" %} + + + + {% trans "Status" %} + + +
- {% include "pretixcontrol/pagination.html" %} - {% endif %} + + + {% for e in events %} + + + {{ e.name }} +
+ {{ e.slug }} + + {% if not hide_orga %} + {{ e.organizer }}{% endif %} + + {% if e.has_subevents %} + {{ e.min_from|default_if_none:""|date:"SHORT_DATETIME_FORMAT" }} + {% else %} + {{ e.get_short_date_from_display }} + {% endif %} + {% if e.has_subevents %} + {% trans "Series" %} + {% endif %} + {% if e.settings.show_date_to and e.date_to %} + –
+ {% if e.has_subevents %} + {{ e.max_fromto|default_if_none:e.max_from|default_if_none:e.max_to|default_if_none:""|date:"SHORT_DATETIME_FORMAT" }} + {% else %} + {{ e.get_short_date_to_display }} + {% endif %} + {% endif %} + + + {% for q in e.first_quotas|slice:":3" %} + {% include "pretixcontrol/fragment_quota_box_paid.html" with quota=q %} + {% endfor %} + {% if e.first_quotas|length > 3 %} + + ··· + + {% endif %} + + + {% if not e.live %} + {% trans "Shop disabled" %} + {% elif e.presale_has_ended %} + {% trans "Presale over" %} + {% elif not e.presale_is_running %} + {% trans "Presale not started" %} + {% else %} + {% trans "On sale" %} + {% endif %} + + + {% endfor %} + + +
+ {% include "pretixcontrol/pagination.html" %} +
+ {% endif %} +
{% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/global_message.html b/src/pretix/control/templates/pretixcontrol/global_message.html index ff8923593..9af16744d 100644 --- a/src/pretix/control/templates/pretixcontrol/global_message.html +++ b/src/pretix/control/templates/pretixcontrol/global_message.html @@ -4,6 +4,12 @@ {% block title %}{% trans "System message" %}{% endblock %} {% block content %} -

{% trans "System message" %}

- {{ global_settings.banner_message_detail|rich_text }} +
+
+

{% trans "System message" %}

+
+
+ {{ global_settings.banner_message_detail|rich_text }} +
+
{% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/global_settings.html b/src/pretix/control/templates/pretixcontrol/global_settings.html index 59961d8bf..f1635128a 100644 --- a/src/pretix/control/templates/pretixcontrol/global_settings.html +++ b/src/pretix/control/templates/pretixcontrol/global_settings.html @@ -3,14 +3,21 @@ {% load bootstrap3 %} {% block inner %} -
- {% csrf_token %} - {% bootstrap_form_errors form %} - {% bootstrap_form form layout='horizontal' %} -
- +
+
+

{% trans "Global settings" %}

- +
+
+ {% csrf_token %} + {% bootstrap_form_errors form %} + {% bootstrap_form form layout='horizontal' %} +
+ +
+
+
+
{% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/global_settings_base.html b/src/pretix/control/templates/pretixcontrol/global_settings_base.html index b2d309b3a..1d724a5fd 100644 --- a/src/pretix/control/templates/pretixcontrol/global_settings_base.html +++ b/src/pretix/control/templates/pretixcontrol/global_settings_base.html @@ -4,19 +4,6 @@ {% block title %}{% trans "Global settings" %}{% endblock %} {% block content %} -

{% trans "Global settings" %}

- {% block inner %} {% endblock %} {% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/global_update.html b/src/pretix/control/templates/pretixcontrol/global_update.html index b642e70fc..71f1b6d71 100644 --- a/src/pretix/control/templates/pretixcontrol/global_update.html +++ b/src/pretix/control/templates/pretixcontrol/global_update.html @@ -3,55 +3,63 @@ {% load bootstrap3 %} {% block inner %} -
- {% trans "Update check results" %} +
+
+ {% trans "Update check results" %} +
{% if not gs.settings.update_check_perform %} -
- {% trans "Update checks are disabled." %} +
+
+ {% trans "Update checks are disabled." %} +
- {% elif not gs.settings.update_check_last %} -
- {% trans "No update check has been performed yet since the last update of this installation. Update checks are performed on a daily basis if your cronjob is set up properly." %} + {% elif not gs.settings.update_check_last %} +
+
+ {% trans "No update check has been performed yet since the last update of this installation. Update checks are performed on a daily basis if your cronjob is set up properly." %} +
+
+ {% csrf_token %} +

+ +

+
-
- {% csrf_token %} -

- -

-
- {% elif "error" in gs.settings.update_check_result %} -
- {% trans "The last update check was not successful." %} - {% if gs.settings.update_check_result.error == "http_error" %} - {% trans "The pretix.eu server returned an error code." %} - {% elif gs.settings.update_check_result.error == "unavailable" %} - {% trans "The pretix.eu server could not be reached." %} - {% elif gs.settings.update_check_result.error == "development" %} - {% trans "This installation appears to be a development installation." %} - {% endif %} + {% elif "error" in gs.settings.update_check_result %} +
+
+ {% trans "The last update check was not successful." %} + {% if gs.settings.update_check_result.error == "http_error" %} + {% trans "The pretix.eu server returned an error code." %} + {% elif gs.settings.update_check_result.error == "unavailable" %} + {% trans "The pretix.eu server could not be reached." %} + {% elif gs.settings.update_check_result.error == "development" %} + {% trans "This installation appears to be a development installation." %} + {% endif %} +
+
+ {% csrf_token %} +

+ +

+
-
- {% csrf_token %} -

- -

-
{% else %} -
- {% csrf_token %} -

+

+ + {% csrf_token %} {% blocktrans trimmed with date=gs.settings.update_check_last|date:"SHORT_DATETIME_FORMAT" %} Last updated: {{ date }} {% endblocktrans %} -

- + +
@@ -63,11 +71,11 @@ {% for row in tbl %} - - - - - + + + + + {% endfor %}
{{ row.0 }}{{ row.1 }}{{ row.2 }}
{{ row.0 }}{{ row.1 }}{{ row.2 }}
@@ -76,15 +84,19 @@
{% csrf_token %} -
- {% trans "Update check settings" %} - {% bootstrap_form_errors form %} - {% bootstrap_form form layout='horizontal' %} +
+
+ {% trans "Update check settings" %} +
+
+ {% bootstrap_form_errors form %} + {% bootstrap_form form layout='horizontal' %} +
+ +
+
-
- -
{% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/items/categories.html b/src/pretix/control/templates/pretixcontrol/items/categories.html index 8068fd411..2108d6e25 100644 --- a/src/pretix/control/templates/pretixcontrol/items/categories.html +++ b/src/pretix/control/templates/pretixcontrol/items/categories.html @@ -6,6 +6,11 @@

{% trans "Product categories" %}

+
+ {% trans "You can use categories to group multiple products together in an organized way." %} +
+
+
{% if categories|length == 0 %}

diff --git a/src/pretix/control/templates/pretixcontrol/items/index.html b/src/pretix/control/templates/pretixcontrol/items/index.html index 6a07c81ff..1c078a634 100644 --- a/src/pretix/control/templates/pretixcontrol/items/index.html +++ b/src/pretix/control/templates/pretixcontrol/items/index.html @@ -4,8 +4,13 @@ {% block inside %}

-

{% trans "Products" %}

+ {% trans "Products" %}
+
+ {% trans "Products are everything that you sell: Different ticket price categories, additional merchandise items, or parts of your event that you sell individually." %} +
+
+
{% if items|length == 0 %}

diff --git a/src/pretix/control/templates/pretixcontrol/items/question.html b/src/pretix/control/templates/pretixcontrol/items/question.html index 1e9708622..d8f5660eb 100644 --- a/src/pretix/control/templates/pretixcontrol/items/question.html +++ b/src/pretix/control/templates/pretixcontrol/items/question.html @@ -5,57 +5,76 @@ {% load formset_tags %} {% block title %}{% blocktrans with name=question.question %}Question: {{ name }}{% endblocktrans %}{% endblock %} {% block inside %} -

-
- - - {% trans "Edit question" %} - -

- {% blocktrans with name=question.question %}Question: {{ name }}{% endblocktrans %} -

-
-
-
-

- - - -

-
-
-
- {% if not stats %} -
+
+
+
+ + + {% trans "Edit question" %} + +

+ {% blocktrans with name=question.question %}Question: {{ name }}{% endblocktrans %} +

+
+
+
+
{% trans "Products" %}
+
{{ question.items.all|join:"
" }}
+
{% trans "Type" %}
+
{{ question.get_type_display }}
+
{% trans "Internal reference" %}
+
{{ question.identifier }}
+
{% trans "Answer required" %}
+
{% if question.required %}{% trans "Yes" %}{% else %}{% trans "No" %}{% endif %}
+
{% trans "Time of question" %}
+
{% if not question.ask_during_checkin %}{% trans "Ticket purchase" %}{% else %} + {% trans "Check-in" %}{% endif %}
+
+
+
+
+
+ +
+
+ +
+
+ +
+
+
+
+ {% if not stats %}

@@ -69,52 +88,62 @@

{% trans "Edit question" %} + class="btn btn-primary btn-lg"> {% trans "Edit question" %} + {% endif %}
-
- {% else %} -
-
-
-
+ {% else %} +
+
+
+
+
+
+ +
+
+
+
+
+ + + + + + + + + {% for stat in stats %} + + + + + {% endfor %} + +
{% trans "Answer" %}{% trans "Count" %}
+ + {{ stat.answer }} + + {{ stat.count }}
-
-
-
-
- - - - - - - - - {% for stat in stats %} - - - - - {% endfor %} - -
{% trans "Answer" %}{% trans "Count" %}
- - {{ stat.answer }} - - {{ stat.count }}
-
-
- {% endif %} + {% endif %} +
diff --git a/src/pretix/control/templates/pretixcontrol/items/quota.html b/src/pretix/control/templates/pretixcontrol/items/quota.html index 33c6408ff..721c638ab 100644 --- a/src/pretix/control/templates/pretixcontrol/items/quota.html +++ b/src/pretix/control/templates/pretixcontrol/items/quota.html @@ -5,80 +5,99 @@ {% load eventsignal %} {% block title %}{% blocktrans with name=quota.name %}Quota: {{ name }}{% endblocktrans %}{% endblock %} {% block inside %} -
-
- {% if 'can_change_items' in request.eventpermset %} - - - {% trans "Edit quota" %} - - {% endif %} -

- {% blocktrans with name=quota.name %}Quota: {{ name }}{% endblocktrans %} -
-

-
-
- {% if quota.subevent %} -

- {{ quota.subevent.name }} – {{ quota.subevent.get_date_range_display }} -

- {% endif %}
-
-
+
+
- {% trans "Usage overview" %} + {% if 'can_change_items' in request.eventpermset %} + + + {% trans "Edit quota" %} + + {% endif %} +

+ {% blocktrans with name=quota.name %}Quota: {{ name }}{% endblocktrans %} +
+

-
- -
- +
+
{% trans "Size" %}
+
{{ quota.size|default_if_none:"Unlimited" }}
+
{% trans "Products" %}
+
{{ quota.get_items_display|join:"
" }}
+ {% if quota.subevent %} +
{% trans "Date" context "subevent" %}
+
{{ quota.subevent }}
+ {% endif %} +
-
-
-
-
- {% trans "Availability calculation" %} -
-
+ {% if quota.subevent %} +

+ {{ quota.subevent.name }} + – {{ quota.subevent.get_date_range_display }} +

+ {% endif %} +
+
+
+
+ {% trans "Usage overview" %} +
+
+
-
-
{% trans "Total quota" %}
-
- {% if quota.size == None %}{% trans "Infinite" %}{% else %}{{ quota.size }}{% endif %} +
+
- {% for row in quota_table_rows %} -
-
{{ row.label }}
-
– {{ row.value }}
+
+
+
+
+ {% trans "Availability calculation" %}
- {% endfor %} -
-
{% trans "Current availability" %}
-
- {% if quota.size == None %}{% trans "Infinite" %}{% else %}{{ avail.1 }}{% endif %} +
+ +
+
{% trans "Total quota" %}
+
+ {% if quota.size == None %}{% trans "Infinite" %}{% else %} + {{ quota.size }}{% endif %} +
+
+ {% for row in quota_table_rows %} +
+
{{ row.label }}
+
– {{ row.value }}
+
+ {% endfor %} +
+
{% trans "Current availability" %}
+
+ {% if quota.size == None %}{% trans "Infinite" %}{% else %}{{ avail.1 }}{% endif %} +
+
+ {% if quota_overbooked > 0 %} +
+ {% blocktrans trimmed with num=quota_overbooked %} + This quota is currently overbooked by {{ num }} tickets. + {% endblocktrans %} +
+ {% endif %} + {% if has_ignore_vouchers %} +
+ {% blocktrans trimmed %} + Your event contains vouchers that affect products covered by this quota and that + allow a user to buy products even if this quota is sold out. + {% endblocktrans %} +
+ {% endif %}
- {% if quota_overbooked > 0 %} -
- {% blocktrans trimmed with num=quota_overbooked %} - This quota is currently overbooked by {{ num }} tickets. - {% endblocktrans %} -
- {% endif %} - {% if has_ignore_vouchers %} -
- {% blocktrans trimmed %} - Your event contains vouchers that affect products covered by this quota and that - allow a user to buy products even if this quota is sold out. - {% endblocktrans %} -
- {% endif %}
diff --git a/src/pretix/control/templates/pretixcontrol/oauth/app_delete.html b/src/pretix/control/templates/pretixcontrol/oauth/app_delete.html index efdb5f80d..81db96d60 100644 --- a/src/pretix/control/templates/pretixcontrol/oauth/app_delete.html +++ b/src/pretix/control/templates/pretixcontrol/oauth/app_delete.html @@ -3,17 +3,24 @@ {% load bootstrap3 %} {% block title %}{% trans "Disable application" %}{% endblock %} {% block content %} -

{% trans "Disable application" %}

-
- {% csrf_token %} -

{% blocktrans %}Are you sure you want to disable the application {{ application }} permanently?{% endblocktrans %}

-
- - {% trans "Cancel" %} - - -
-
+
+
+

{% trans "Disable application" %}

+
+
+
+ {% csrf_token %} +

{% blocktrans %}Are you sure you want to disable the application {{ application }} + permanently?{% endblocktrans %}

+
+ + {% trans "Cancel" %} + + +
+
+
+
{% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/oauth/app_list.html b/src/pretix/control/templates/pretixcontrol/oauth/app_list.html index b44320b4e..c2edef89c 100644 --- a/src/pretix/control/templates/pretixcontrol/oauth/app_list.html +++ b/src/pretix/control/templates/pretixcontrol/oauth/app_list.html @@ -3,48 +3,57 @@ {% load bootstrap3 %} {% block title %}{% trans "Your applications" %}{% endblock %} {% block content %} -

{% trans "Your applications" %}

- {% if applications %} -
- - - - - - - - - {% for application in applications %} +
+
+

{% trans "Your applications" %}

+
+ {% if applications %} +
+
{% trans "Name" %}
+ - - + + - {% endfor %} - -
{{ application.name }} - - - - {% trans "Name" %}
-
-

- - - {% trans "Create new application" %} - -

- {% else %} -
-

- {% blocktrans trimmed %} - No applications registered yet. - {% endblocktrans %} -

+ + + {% for application in applications %} + + {{ application.name }} + + + + + + + + {% endfor %} + + +
+
+ + + {% trans "Create new application" %} + +
+ {% else %} +
+

+ {% blocktrans trimmed %} + No applications registered yet. + {% endblocktrans %} +

- - {% trans "Register a new application" %} - -
- {% endif %} + + {% trans "Register a new application" %} + +
+ {% endif %} +
{% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/oauth/app_register.html b/src/pretix/control/templates/pretixcontrol/oauth/app_register.html index 527ff417a..4f6fa3653 100644 --- a/src/pretix/control/templates/pretixcontrol/oauth/app_register.html +++ b/src/pretix/control/templates/pretixcontrol/oauth/app_register.html @@ -3,14 +3,20 @@ {% load bootstrap3 %} {% block title %}{% trans "Register a new application" %}{% endblock %} {% block content %} -

{% trans "Register a new application" %}

-
- {% csrf_token %} - {% bootstrap_form form layout='control' %} -
- +
+
+

{% trans "Register a new application" %}

- +
+
+ {% csrf_token %} + {% bootstrap_form form layout='control' %} +
+ +
+
+
+
{% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/oauth/app_rollkeys.html b/src/pretix/control/templates/pretixcontrol/oauth/app_rollkeys.html index c4385d842..163295d0b 100644 --- a/src/pretix/control/templates/pretixcontrol/oauth/app_rollkeys.html +++ b/src/pretix/control/templates/pretixcontrol/oauth/app_rollkeys.html @@ -3,17 +3,24 @@ {% load bootstrap3 %} {% block title %}{% trans "Generate new application secret" %}{% endblock %} {% block content %} -

{% trans "Generate new application secret" %}

-
- {% csrf_token %} -

{% blocktrans %}Are you sure you want to generate a new client secret for the application {{ application }}?{% endblocktrans %}

-
- - {% trans "Cancel" %} - - -
-
+
+
+

{% trans "Generate new application secret" %}

+
+
+
+ {% csrf_token %} +

{% blocktrans %}Are you sure you want to generate a new client secret for the application + {{ application }}?{% endblocktrans %}

+
+ + {% trans "Cancel" %} + + +
+
+
+
{% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/oauth/app_update.html b/src/pretix/control/templates/pretixcontrol/oauth/app_update.html index d65f3e4cf..5d0dcfbc0 100644 --- a/src/pretix/control/templates/pretixcontrol/oauth/app_update.html +++ b/src/pretix/control/templates/pretixcontrol/oauth/app_update.html @@ -3,14 +3,20 @@ {% load bootstrap3 %} {% block title %}{% trans "Update an application" %}{% endblock %} {% block content %} -

{% trans "Update an application" %}

-
- {% csrf_token %} - {% bootstrap_form form layout='control' %} -
- +
+
+

{% trans "Update an application" %}

- +
+
+ {% csrf_token %} + {% bootstrap_form form layout='control' %} +
+ +
+
+
+
{% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/oauth/auth_revoke.html b/src/pretix/control/templates/pretixcontrol/oauth/auth_revoke.html index dba1bd4d8..32744073e 100644 --- a/src/pretix/control/templates/pretixcontrol/oauth/auth_revoke.html +++ b/src/pretix/control/templates/pretixcontrol/oauth/auth_revoke.html @@ -3,17 +3,23 @@ {% load bootstrap3 %} {% block title %}{% trans "Revoke access" %}{% endblock %} {% block content %} -

{% trans "Revoke access" %}

-
- {% csrf_token %} -

{% blocktrans %}Are you sure you want to revoke access to your account for the application {{ application }}?{% endblocktrans %}

-
- - {% trans "Cancel" %} - - -
-
+
+
+

{% trans "Revoke access" %}

+
+
+
+ {% csrf_token %} +

{% blocktrans %}Are you sure you want to revoke access to your account for the application {{ application }}?{% endblocktrans %}

+
+ + {% trans "Cancel" %} + + +
+
+
+
{% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/oauth/authorized.html b/src/pretix/control/templates/pretixcontrol/oauth/authorized.html index 4b13d1673..c5bcf6c6a 100644 --- a/src/pretix/control/templates/pretixcontrol/oauth/authorized.html +++ b/src/pretix/control/templates/pretixcontrol/oauth/authorized.html @@ -3,12 +3,15 @@ {% load bootstrap3 %} {% block title %}{% trans "Authorized applications" %}{% endblock %} {% block content %} -

{% trans "Authorized applications" %}

-

+

+
+

{% trans "Authorized applications" %}

+
+
{% trans "Manage your own apps" %} -

+
{% if tokens %}
@@ -54,7 +57,7 @@
{% else %} -
+

{% blocktrans trimmed %} No applications have access to your pretix account. @@ -62,4 +65,5 @@

{% endif %} +
{% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/orders/index.html b/src/pretix/control/templates/pretixcontrol/orders/index.html index ba8821c4f..d70f49312 100644 --- a/src/pretix/control/templates/pretixcontrol/orders/index.html +++ b/src/pretix/control/templates/pretixcontrol/orders/index.html @@ -7,9 +7,6 @@ {% block title %}{% trans "Orders" %}{% endblock %} {% block content %}
-
-

{% trans "Orders" %}

-
{% if not filter_form.filtered and orders|length == 0 %}

diff --git a/src/pretix/control/templates/pretixcontrol/organizers/create.html b/src/pretix/control/templates/pretixcontrol/organizers/create.html index e0a428bb0..f6ec33343 100644 --- a/src/pretix/control/templates/pretixcontrol/organizers/create.html +++ b/src/pretix/control/templates/pretixcontrol/organizers/create.html @@ -3,19 +3,22 @@ {% load bootstrap3 %} {% block title %}{% trans "Create a new organizer" %}{% endblock %} {% block content %} -

{% trans "Create a new organizer" %}

- {% csrf_token %} - {% bootstrap_form_errors form %} -
- {% trans "General information" %} - {% bootstrap_field form.name layout="horizontal" %} - {% bootstrap_field form.slug layout="horizontal" %} -
-
- +
+
+

{% trans "Create a new organizer" %}

+
+
+ {% csrf_token %} + {% bootstrap_form_errors form %} + {% bootstrap_field form.name layout="horizontal" %} + {% bootstrap_field form.slug layout="horizontal" %} +
+ +
+
{% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/organizers/detail.html b/src/pretix/control/templates/pretixcontrol/organizers/detail.html index 17c2bf6a8..06168da27 100644 --- a/src/pretix/control/templates/pretixcontrol/organizers/detail.html +++ b/src/pretix/control/templates/pretixcontrol/organizers/detail.html @@ -2,11 +2,18 @@ {% load i18n %} {% load bootstrap3 %} {% block inner %} +
{% if events|length == 0 %} -

+

{% trans "You currently do not have access to any events." %} -

+
{% else %} +
+ + + {% trans "Create a new event" %} + +
@@ -27,8 +34,5 @@
{% endif %} - - - {% trans "Create a new event" %} - +
{% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/organizers/display.html b/src/pretix/control/templates/pretixcontrol/organizers/display.html index cf0621690..670ae5bc3 100644 --- a/src/pretix/control/templates/pretixcontrol/organizers/display.html +++ b/src/pretix/control/templates/pretixcontrol/organizers/display.html @@ -4,25 +4,32 @@ {% block inner %}
{% csrf_token %} -
- {% trans "Organizer page" %} - {% bootstrap_form_errors form %} - {% bootstrap_field form.locales layout="control" %} - {% bootstrap_field form.organizer_logo_image layout="control" %} - {% bootstrap_field form.organizer_homepage_text layout="control" %} - {% bootstrap_field form.event_list_type layout="control" %} - {% bootstrap_field form.organizer_link_back layout="control" %} +
+
+ {% trans "Organizer page" %} +
+
+ {% bootstrap_form_errors form %} + {% bootstrap_field form.locales layout="control" %} + {% bootstrap_field form.organizer_logo_image layout="control" %} + {% bootstrap_field form.organizer_homepage_text layout="control" %} + {% bootstrap_field form.event_list_type layout="control" %} + {% bootstrap_field form.organizer_link_back layout="control" %} +
-
- {% trans "Shop design" %} -

- {% blocktrans trimmed %} - These settings will be used for the organizer page as well as for the default settings - for all events in this account that do not have their own design settings. - {% endblocktrans %} -

- {% bootstrap_field form.primary_color layout="control" %} - {% bootstrap_field form.primary_font layout="control" %} +
+
+ {% trans "Shop design" %} +
+
+

+ {% blocktrans trimmed %} + These settings will be used for the organizer page as well as for the default settings + for all events in this account that do not have their own design settings. + {% endblocktrans %} +

+ {% bootstrap_field form.primary_color layout="control" %} + {% bootstrap_field form.primary_font layout="control" %}
-
-
- {% endfor %} -
- +
+
+ {% trans "Event metadata (advanced)" %} +
+

- + {% blocktrans trimmed %} + You can here define a set of metadata properties (i.e. variables) that you can later set for + your + events and re-use in places like ticket layouts. This is an useful timesaver if you create lots + and + lots of events. + {% endblocktrans %}

+
+ {{ formset.management_form }} + {% bootstrap_formset_errors formset %} +
+ {% for form in formset %} +
+
+ {{ form.id }} + {% bootstrap_field form.DELETE form_group_class="" layout="inline" %} +
+
+ {% bootstrap_form_errors form %} + {% bootstrap_field form.name layout='inline' form_group_class="" %} +
+
+ {% bootstrap_field form.default layout='inline' form_group_class="" %} +
+
+ +
+
+ {% endfor %} +
+ +

+ +

+
diff --git a/src/pretix/control/templates/pretixcontrol/organizers/index.html b/src/pretix/control/templates/pretixcontrol/organizers/index.html index 4f9bfb492..aba427a84 100644 --- a/src/pretix/control/templates/pretixcontrol/organizers/index.html +++ b/src/pretix/control/templates/pretixcontrol/organizers/index.html @@ -5,32 +5,37 @@ {% load eventurl %} {% block title %}{% trans "Organizers" %}{% endblock %} {% block content %} -

{% trans "Organizers" %}

-

{% trans "The list below shows all organizer accounts you have administrative access to." %}

- -
- {% bootstrap_field filter_form.query layout='inline' %} +
+
+

{% trans "Organizers" %}

-
-
+
+ +
+ {% bootstrap_field filter_form.query layout='inline' %} +
+
+ -
- - {% if staff_session %} -

- - - {% trans "Create a new organizer" %} - -

- {% endif %} - - - + + + + {% if staff_session %} +
+ + + {% trans "Create a new organizer" %} + +
+ {% endif %} +
+ + - - - - {% for o in organizers %} - - - - - {% endfor %} - -
{% trans "Organizer name" %} @@ -41,18 +46,21 @@
- {{ o.name }} - {{ o.slug }}
- {% include "pretixcontrol/pagination.html" %} + + + + {% for o in organizers %} + + + {{ o.name }} + + {{ o.slug }} + + {% endfor %} + + +
+ {% include "pretixcontrol/pagination.html" %} +
+
{% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/organizers/team_delete.html b/src/pretix/control/templates/pretixcontrol/organizers/team_delete.html index 2cfc8ff8d..ddb68b802 100644 --- a/src/pretix/control/templates/pretixcontrol/organizers/team_delete.html +++ b/src/pretix/control/templates/pretixcontrol/organizers/team_delete.html @@ -2,28 +2,37 @@ {% load i18n %} {% load bootstrap3 %} {% block inner %} -

{% trans "Delete team:" %} {{ team.name }}

- {% if not possible %} -

{% blocktrans %}You cannot delete the team because there would be no one left who could change team permissions afterwards.{% endblocktrans %}

-
- - {% trans "Cancel" %} - -
+
+
+

{% trans "Delete team:" %} {{ team.name }}

- {% else %} -
- {% csrf_token %} -

{% blocktrans %}Are you sure you want to delete the team?{% endblocktrans %} -

-
- - {% trans "Cancel" %} - - -
-
- {% endif %} +
+ {% if not possible %} +

{% blocktrans %}You cannot delete the team because there would be no one left who could change team + permissions afterwards.{% endblocktrans %}

+
+ + {% trans "Cancel" %} + +
+
+ {% else %} +
+ {% csrf_token %} +

{% blocktrans %}Are you sure you want to delete the team?{% endblocktrans %} +

+
+ + {% trans "Cancel" %} + + +
+
+ {% endif %} +
+
{% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/organizers/team_edit.html b/src/pretix/control/templates/pretixcontrol/organizers/team_edit.html index 389cceb53..736fdb0ec 100644 --- a/src/pretix/control/templates/pretixcontrol/organizers/team_edit.html +++ b/src/pretix/control/templates/pretixcontrol/organizers/team_edit.html @@ -2,40 +2,53 @@ {% load i18n %} {% load bootstrap3 %} {% block inner %} - {% if team %} -

{% trans "Team:" %} {{ team.name }}

- {% else %} -

{% trans "Create a new team" %}

-

- {% blocktrans trimmed %} - You will be able to add team members in the next step. - {% endblocktrans %} -

- {% endif %}
{% csrf_token %} {% bootstrap_form_errors form %} -
- {% trans "General information" %} - {% bootstrap_field form.name layout="control" %} +
+
+ {% if team %} +

{% trans "Team:" %} {{ team.name }}

+ {% else %} +

{% trans "Create a new team" %}

+ {% endif %} +
+
+ {% if not team %} +

+ {% blocktrans trimmed %} + You will be able to add team members in the next step. + {% endblocktrans %} +

+ {% endif %} + {% bootstrap_field form.name layout="control" %} +
-
- {% trans "Organizer permissions" %} - {% bootstrap_field form.can_create_events layout="control" %} - {% bootstrap_field form.can_change_teams layout="control" %} - {% bootstrap_field form.can_change_organizer_settings layout="control" %} +
+
+ {% trans "Organizer permissions" %} +
+
+ {% bootstrap_field form.can_create_events layout="control" %} + {% bootstrap_field form.can_change_teams layout="control" %} + {% bootstrap_field form.can_change_organizer_settings layout="control" %} +
-
- {% trans "Event permissions" %} +
+
+ {% trans "Event permissions" %} +
+
- {% bootstrap_field form.all_events layout="control" %} - {% bootstrap_field form.limit_events layout="control" %} - {% bootstrap_field form.can_change_event_settings layout="control" %} - {% bootstrap_field form.can_change_items layout="control" %} - {% bootstrap_field form.can_view_orders layout="control" %} - {% bootstrap_field form.can_change_orders layout="control" %} - {% bootstrap_field form.can_view_vouchers layout="control" %} - {% bootstrap_field form.can_change_vouchers layout="control" %} + {% bootstrap_field form.all_events layout="control" %} + {% bootstrap_field form.limit_events layout="control" %} + {% bootstrap_field form.can_change_event_settings layout="control" %} + {% bootstrap_field form.can_change_items layout="control" %} + {% bootstrap_field form.can_view_orders layout="control" %} + {% bootstrap_field form.can_change_orders layout="control" %} + {% bootstrap_field form.can_view_vouchers layout="control" %} + {% bootstrap_field form.can_change_vouchers layout="control" %} +
- - - - - - - - - {% for u in team.members.all %} +
+
+

{% trans "Team members" %}

+
+ +
{% trans "Member" %}
+ + + + + + + + {% for u in team.members.all %} + + + + + {% endfor %} + {% for i in team.invites.all %} + + + + + {% endfor %} + + - {% endfor %} - {% for i in team.invites.all %} - - - - - {% endfor %} - - - - - - - -
{% trans "Member" %}
+ {{ u.email }} + {% if u.require_2fa %} + + + {% else %} + + + {% endif %} + + +
+ {{ i.email }} + + + +
- {{ u.email }} - {% if u.require_2fa %} - - - {% else %} - - - {% endif %} + {% bootstrap_field add_form.user layout='inline' %} -
- {{ i.email }} - - - -
- {% bootstrap_field add_form.user layout='inline' %}
- {% blocktrans trimmed %} - To add a new user, you can enter their email address here. If they already have a - pretix account, they will immediately be added to the event. Otherwise, they will - be sent an email with an invitation. - {% endblocktrans %} - 		- -
+ + +
+ {% blocktrans trimmed %} + To add a new user, you can enter their email address here. If they already have a + pretix account, they will immediately be added to the event. Otherwise, they will + be sent an email with an invitation. + {% endblocktrans %} +
+
-

{% trans "API tokens" %}

{% csrf_token %} - - - - - - - - - {% for t in team.active_tokens %} +
+
+

{% trans "API tokens" %}

+
+
{% trans "Name" %}
+ + + + + + + + {% for t in team.active_tokens %} + + + + + {% endfor %} + + - {% endfor %} - - - - - - - -
{% trans "Name" %}
+ {{ t.name }} + + +
- {{ t.name }} + {% bootstrap_field add_token_form.name layout='inline' %}
 -
- {% bootstrap_field add_token_form.name layout='inline' %}
- 		- -
+ + +
diff --git a/src/pretix/control/templates/pretixcontrol/organizers/teams.html b/src/pretix/control/templates/pretixcontrol/organizers/teams.html index fe6b07ec3..14fae297f 100644 --- a/src/pretix/control/templates/pretixcontrol/organizers/teams.html +++ b/src/pretix/control/templates/pretixcontrol/organizers/teams.html @@ -2,55 +2,56 @@ {% load i18n %} {% load bootstrap3 %} {% block inner %} -

- {% trans "The list below shows all teams that exist within this organizer." %} -

- - - {% trans "Create a new team" %} - - - - - - - - - - - - {% for t in teams %} +
+
+ + + {% trans "Create a new team" %} + +
+
{% trans "Team name" %}{% trans "Members" %}{% trans "Events" %}
+ - - - - + + + + - {% endfor %} - -
- - {{ t.name }} - - - {{ t.memcount }} - {% if t.invcount %} - {% blocktrans trimmed with count=t.invcount %} - + {{ count }} invited - {% endblocktrans %} - {% endif %} - - {% if t.all_events %} - {% trans "All" %} - {% else %} - {{ t.eventcount }} - {% endif %} - - - - - {% trans "Team name" %}{% trans "Members" %}{% trans "Events" %}
+ + + {% for t in teams %} + + + + {{ t.name }} + + + + {{ t.memcount }} + {% if t.invcount %} + {% blocktrans trimmed with count=t.invcount %} + + {{ count }} invited + {% endblocktrans %} + {% endif %} + + + {% if t.all_events %} + {% trans "All" %} + {% else %} + {{ t.eventcount }} + {% endif %} + + + + + + + + {% endfor %} + + +
{% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/pdf/index.html b/src/pretix/control/templates/pretixcontrol/pdf/index.html index 17d7eec75..32d1e361d 100644 --- a/src/pretix/control/templates/pretixcontrol/pdf/index.html +++ b/src/pretix/control/templates/pretixcontrol/pdf/index.html @@ -11,12 +11,6 @@ {% endblock %} {% block content %} -

- {% trans "PDF Editor" %} - {% if title %} - {{ title }} - {% endif %} -

{% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/user/2fa_confirm_u2f.html b/src/pretix/control/templates/pretixcontrol/user/2fa_confirm_u2f.html index 896507392..69a6548c7 100644 --- a/src/pretix/control/templates/pretixcontrol/user/2fa_confirm_u2f.html +++ b/src/pretix/control/templates/pretixcontrol/user/2fa_confirm_u2f.html @@ -5,31 +5,33 @@ {% load compress %} {% block title %}{% trans "Add a two-factor authentication device" %}{% endblock %} {% block content %} -

{% trans "Add a two-factor authentication device" %}

-

- - {% trans "Please connect your U2F device. If it has a button, touch it now. You might have to unplug the device and plug it back in again." %} -

-
- {% csrf_token %} - -

- -

- -
+
+
+

{% trans "Add a two-factor authentication device" %}

+
+
+

+ + {% trans "Please connect your U2F device. If it has a button, touch it now. You might have to unplug the device and plug it back in again." %} +

+
+ {% csrf_token %} + +

+ +

+ +
-
- {% trans "Device registration failed." %} +
+ {% trans "Device registration failed." %} +
+ +
- {% compress js %} diff --git a/src/pretix/control/templates/pretixcontrol/user/2fa_delete.html b/src/pretix/control/templates/pretixcontrol/user/2fa_delete.html index 882b29f8f..2f308d9ae 100644 --- a/src/pretix/control/templates/pretixcontrol/user/2fa_delete.html +++ b/src/pretix/control/templates/pretixcontrol/user/2fa_delete.html @@ -3,23 +3,29 @@ {% load bootstrap3 %} {% block title %}{% trans "Delete a two-factor authentication device" %}{% endblock %} {% block content %} -

{% trans "Delete a two-factor authentication device" %}

-
- {% csrf_token %} -

{% blocktrans trimmed with device=device.name %} - Are you sure you want to delete the authentication device "{{ device }}"? - {% endblocktrans %}

-

{% trans "You will no longer be able to use this device to log in to pretix." %}

-

- {% trans "If this is the only device connected to your account, we will disable two-factor authentication." %} -

-
- - {% trans "Cancel" %} - - +
+
+

{% trans "Delete a two-factor authentication device" %}

- +
+
+ {% csrf_token %} +

{% blocktrans trimmed with device=device.name %} + Are you sure you want to delete the authentication device "{{ device }}"? + {% endblocktrans %}

+

{% trans "You will no longer be able to use this device to log in to pretix." %}

+

+ {% trans "If this is the only device connected to your account, we will disable two-factor authentication." %} +

+
+ + {% trans "Cancel" %} + + +
+
+
+
{% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/user/2fa_disable.html b/src/pretix/control/templates/pretixcontrol/user/2fa_disable.html index e4a5e3931..d9fb7b180 100644 --- a/src/pretix/control/templates/pretixcontrol/user/2fa_disable.html +++ b/src/pretix/control/templates/pretixcontrol/user/2fa_disable.html @@ -3,22 +3,28 @@ {% load bootstrap3 %} {% block title %}{% trans "Disable two-factor authentication" %}{% endblock %} {% block content %} -

{% trans "Disable two-factor authentication" %}

-
- {% csrf_token %} -

- {% trans "Do you really want to disable two-factor authentication?" %} -

-

- {% trans "You will no longer require a second device to log in to your account." %} -

-
- - {% trans "Cancel" %} - - +
+
+

{% trans "Disable two-factor authentication" %}

- +
+
+ {% csrf_token %} +

+ {% trans "Do you really want to disable two-factor authentication?" %} +

+

+ {% trans "You will no longer require a second device to log in to your account." %} +

+
+ + {% trans "Cancel" %} + + +
+
+
+
{% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/user/2fa_enable.html b/src/pretix/control/templates/pretixcontrol/user/2fa_enable.html index 39f41268d..64c32510b 100644 --- a/src/pretix/control/templates/pretixcontrol/user/2fa_enable.html +++ b/src/pretix/control/templates/pretixcontrol/user/2fa_enable.html @@ -3,23 +3,29 @@ {% load bootstrap3 %} {% block title %}{% trans "Enable two-factor authentication" %}{% endblock %} {% block content %} -

{% trans "Enable two-factor authentication" %}

-
- {% csrf_token %} -

- {% trans "Do you really want to enable two-factor authentication?" %} -

-

- {% trans "You will no longer be able to log in to pretix without one of your configured devices." %} - {% trans "Please make sure to print out or copy the emergency tokens and store them in a safe place." %} -

-
- - {% trans "Cancel" %} - - +
+
+

{% trans "Enable two-factor authentication" %}

- +
+
+ {% csrf_token %} +

+ {% trans "Do you really want to enable two-factor authentication?" %} +

+

+ {% trans "You will no longer be able to log in to pretix without one of your configured devices." %} + {% trans "Please make sure to print out or copy the emergency tokens and store them in a safe place." %} +

+
+ + {% trans "Cancel" %} + + +
+
+
+
{% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/user/2fa_main.html b/src/pretix/control/templates/pretixcontrol/user/2fa_main.html index 3fb117d67..893d59368 100644 --- a/src/pretix/control/templates/pretixcontrol/user/2fa_main.html +++ b/src/pretix/control/templates/pretixcontrol/user/2fa_main.html @@ -3,34 +3,28 @@ {% load bootstrap3 %} {% block title %}{% trans "Two-factor authentication" %}{% endblock %} {% block content %} -

{% trans "Two-factor authentication" %}

-

- {% blocktrans trimmed %} - Two-factor authentication is a way to add additional security to your account. If you enable it, you will - not only need your password to log in, but also an additional token that is generated e.g. by an app on your - smartphone or a hardware token generator and that changes on a regular basis. - {% endblocktrans %} -

- {% if user.require_2fa %} -
-
-

{% trans "Two-factor status" %}

-
-
+
+
+

{% trans "Two-factor authentication" %}

+
+
+

+ {% blocktrans trimmed %} + Two-factor authentication is a way to add additional security to your account. If you enable it, you + will + not only need your password to log in, but also an additional token that is generated e.g. by an app + on your + smartphone or a hardware token generator and that changes on a regular basis. + {% endblocktrans %} +

+ {% if user.require_2fa %} {% trans "Disable" %}

{% trans "Two-factor authentication is currently enabled." %}

-
-
- {% else %} -
-
-

{% trans "Two-factor status" %}

-
-
+ {% else %} {% if devices|length %} {% trans "Enable" %} @@ -42,9 +36,9 @@ {% if not devices|length %}

{% trans "To enable it, you need to configure at least one device below." %}

{% endif %} -
+ {% endif %}
- {% endif %} +

{% trans "Registered devices" %}

@@ -53,7 +47,7 @@ {% for d in devices %}
  • + href="{% url "control:user.settings.2fa.delete" devicetype=d.devicetype device=d.pk %}"> Delete {% if d.devicetype == "totp" %} @@ -75,6 +69,10 @@
    • + + + {% trans "Generate new emergency tokens" %} +

    {% trans "Emergency tokens" %}

    @@ -87,10 +85,6 @@
  • {{ t.token }}
    • {% endfor %} - - - {% trans "Generate new emergency tokens" %} -
    {% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/user/2fa_regenemergency.html b/src/pretix/control/templates/pretixcontrol/user/2fa_regenemergency.html index 88b8a491c..4e0b1fee5 100644 --- a/src/pretix/control/templates/pretixcontrol/user/2fa_regenemergency.html +++ b/src/pretix/control/templates/pretixcontrol/user/2fa_regenemergency.html @@ -3,22 +3,28 @@ {% load bootstrap3 %} {% block title %}{% trans "Regenerate emergency codes" %}{% endblock %} {% block content %} -

    {% trans "Regenerate emergency codes" %}

    -
    - {% csrf_token %} -

    - {% trans "Do you really want to regenerate your emergency codes?" %} -

    -

    - {% trans "The old codes will no longer work." %} -

    -
    - - {% trans "Cancel" %} - - +
    +
    +

    {% trans "Regenerate emergency codes" %}

    - +
    +
    + {% csrf_token %} +

    + {% trans "Do you really want to regenerate your emergency codes?" %} +

    +

    + {% trans "The old codes will no longer work." %} +

    +
    + + {% trans "Cancel" %} + + +
    +
    +
    +
    {% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/user/history.html b/src/pretix/control/templates/pretixcontrol/user/history.html index 7567d9457..171c048f1 100644 --- a/src/pretix/control/templates/pretixcontrol/user/history.html +++ b/src/pretix/control/templates/pretixcontrol/user/history.html @@ -3,7 +3,6 @@ {% load bootstrap3 %} {% block title %}{% trans "Account history" %}{% endblock %} {% block content %} -

    {% trans "Account history" %}

    diff --git a/src/pretix/control/templates/pretixcontrol/user/notifications.html b/src/pretix/control/templates/pretixcontrol/user/notifications.html index a549b3937..38f368260 100644 --- a/src/pretix/control/templates/pretixcontrol/user/notifications.html +++ b/src/pretix/control/templates/pretixcontrol/user/notifications.html @@ -3,39 +3,49 @@ {% load bootstrap3 %} {% block title %}{% trans "Notification settings" %}{% endblock %} {% block content %} -

    {% trans "Notification settings" %}

    -
    - {% csrf_token %} -
    - {% if request.user.notifications_send %} -
    - - {% trans "Notifications are turned on according to the settings below." %} -
    -
    - {% else %} -
    - - {% trans "All notifications are turned off globally." %} -
    -
    - {% endif %} -
    -
    +
    +
    +

    {% trans "Notification settings" %}

    +
    +
    +
    + {% csrf_token %} +
    + {% if request.user.notifications_send %} +
    + + {% trans "Notifications are turned on according to the settings below." %} +
    +
    + {% else %} +
    + + {% trans "All notifications are turned off globally." %} +
    +
    + {% endif %} +
    +
    +
    +
    -
    - {% trans "Choose event" %} -

    +

    +
    + {% trans "Choose event" %} +
    +
    {% trans "Save your modifications before switching events." %} -

    +
    {% csrf_token %} -
    - {% trans "Choose notifications to get" %} +
    +
    + {% trans "Choose notifications to get" %} +
    @@ -67,23 +79,30 @@ {% if not event or type.required_permission in permset %} {% else %} - + {% endif %} {% endfor %}
    +
    +
    + +
    +
    -
    - -
    {% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/user/settings.html b/src/pretix/control/templates/pretixcontrol/user/settings.html index 0c89937c5..a5db1f095 100644 --- a/src/pretix/control/templates/pretixcontrol/user/settings.html +++ b/src/pretix/control/templates/pretixcontrol/user/settings.html @@ -3,61 +3,69 @@ {% load bootstrap3 %} {% block title %}{% trans "Account settings" %}{% endblock %} {% block content %} -

    {% trans "Account settings" %}

    -
    - {% csrf_token %} - {% bootstrap_form_errors form %} -
    - {% trans "General settings" %} - {% bootstrap_field form.fullname layout='horizontal' %} - {% bootstrap_field form.locale layout='horizontal' %} - {% bootstrap_field form.timezone layout='horizontal' %} -
    - -
    - {% if request.user.notifications_send and request.user.notification_settings.exists %} - + + {% csrf_token %} + {% bootstrap_form_errors form %} +
    +
    + {% trans "Account settings" %} +
    +
    + {% bootstrap_field form.fullname layout='horizontal' %} + {% bootstrap_field form.locale layout='horizontal' %} + {% bootstrap_field form.timezone layout='horizontal' %} +
    + +
    + {% if request.user.notifications_send and request.user.notification_settings.exists %} + {% trans "On" %} - {% else %} - + {% else %} + {% trans "Off" %} - {% endif %} -   - - {% trans "Change notification settings" %} - + {% endif %} +   + + {% trans "Change notification settings" %} + +
    +
    -
    -
    -
    - {% trans "Login settings" %} - {% bootstrap_field form.old_pw layout='horizontal' %} - {% bootstrap_field form.email layout='horizontal' %} - {% bootstrap_field form.new_pw layout='horizontal' %} - {% bootstrap_field form.new_pw_repeat layout='horizontal' %} -
    - -
    - {% if user.require_2fa %} - {% trans "Enabled" %}   - - {% trans "Change two-factor settings" %} - - {% else %} - {% trans "Disabled" %}   - - {% trans "Enable" %} - - {% endif %} +
    +
    +
    + {% trans "Login settings" %}
    +
    + {% bootstrap_field form.old_pw layout='horizontal' %} + {% bootstrap_field form.email layout='horizontal' %} + {% bootstrap_field form.new_pw layout='horizontal' %} + {% bootstrap_field form.new_pw_repeat layout='horizontal' %} +
    + +
    + {% if user.require_2fa %} + {% trans "Enabled" %}   + + {% trans "Change two-factor settings" %} + + {% else %} + {% trans "Disabled" %}   + + {% trans "Enable" %} + + {% endif %} +
    +
    +
    +
    +
    +
    -
    -
    - -
    - + {% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/user/staff_session_edit.html b/src/pretix/control/templates/pretixcontrol/user/staff_session_edit.html index daf54a28b..58b0eb798 100644 --- a/src/pretix/control/templates/pretixcontrol/user/staff_session_edit.html +++ b/src/pretix/control/templates/pretixcontrol/user/staff_session_edit.html @@ -3,45 +3,57 @@ {% load bootstrap3 %} {% block title %}{% trans "Staff session" %}{% endblock %} {% block content %} -

    {% trans "Session notes" %}

    -
    - {% csrf_token %} - {% bootstrap_form_errors form %} - {% bootstrap_field form.comment layout='horizontal' %} -
    - +
    +
    +

    {% trans "Session notes" %}

    - -

    {% trans "Audit log" %}

    -
    -
    {% trans "Start date" %}
    -
    {{ session.date_start|date:"SHORT_DATETIME_FORMAT" }}
    -
    {% trans "End date" %}
    -
    {{ session.date_end|date:"SHORT_DATETIME_FORMAT" }}
    -
    {% trans "User" %}
    -
    {{ session.user.email }}
    -
    - - - - - - - - - - - {% for log in logs %} - - - - - - - {% endfor %} - +
    +
    + {% csrf_token %} + {% bootstrap_form_errors form %} + {% bootstrap_field form.comment layout='horizontal' %} +
    + +
    + +
    + +
    +
    +

    {% trans "Audit log" %}

    +
    +
    +
    +
    {% trans "Start date" %}
    +
    {{ session.date_start|date:"SHORT_DATETIME_FORMAT" }}
    +
    {% trans "End date" %}
    +
    {{ session.date_end|date:"SHORT_DATETIME_FORMAT" }}
    +
    {% trans "User" %}
    +
    {{ session.user.email }}
    +
    +
    +
    {% trans "Timestamp" %}{% trans "Method" %}{% trans "URL" %}{% trans "On behalf of" %}
    {{ log.datetime|date:"SHORT_DATETIME_FORMAT" }}{{ log.method }}{{ log.url }}{{ log.impersonating|default:"" }}
    + + + + + + + + + + {% for log in logs %} + + + + + + + {% endfor %} + -
    {% trans "Timestamp" %}{% trans "Method" %}{% trans "URL" %}{% trans "On behalf of" %}
    {{ log.datetime|date:"SHORT_DATETIME_FORMAT" }}{{ log.method }}{{ log.url }}{{ log.impersonating|default:"" }}
    + +
    {% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/user/staff_session_list.html b/src/pretix/control/templates/pretixcontrol/user/staff_session_list.html index 3724d5a48..4398771fd 100644 --- a/src/pretix/control/templates/pretixcontrol/user/staff_session_list.html +++ b/src/pretix/control/templates/pretixcontrol/user/staff_session_list.html @@ -4,55 +4,58 @@ {% load urlreplace %} {% block title %}{% trans "Admin sessions" %}{% endblock %} {% block content %} -

    {% trans "Admin sessions" %}

    - - - - - - - - - - - - - {% for s in sessions %} +
    +
    - # - - {% trans "User" %} - - {% trans "Start date" %} - {% trans "End date" %}{% trans "Comment" %}
    + - - - - - - + + + + + + - {% endfor %} - -
    - {{ s.pk }} - - {{ s.user.email }} - - {{ s.date_start|date:"SHORT_DATETIME_FORMAT" }} - - {% if s.date_end %} - {{ s.date_end|date:"SHORT_DATETIME_FORMAT" }} - {% endif %} - - {% if s.comment %} - - {% else %} - - {% endif %} - - - + # + + {% trans "User" %} + + {% trans "Start date" %} + {% trans "End date" %}{% trans "Comment" %}
    - {% include "pretixcontrol/pagination.html" %} + + + {% for s in sessions %} + + + {{ s.pk }} + + + {{ s.user.email }} + + + {{ s.date_start|date:"SHORT_DATETIME_FORMAT" }} + + + {% if s.date_end %} + {{ s.date_end|date:"SHORT_DATETIME_FORMAT" }} + {% endif %} + + + {% if s.comment %} + + {% else %} + + {% endif %} + + + + + + {% endfor %} + + +
    + {% include "pretixcontrol/pagination.html" %} +
    +
    {% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/user/staff_session_start.html b/src/pretix/control/templates/pretixcontrol/user/staff_session_start.html index 93594d4c9..292029953 100644 --- a/src/pretix/control/templates/pretixcontrol/user/staff_session_start.html +++ b/src/pretix/control/templates/pretixcontrol/user/staff_session_start.html @@ -3,20 +3,26 @@ {% load bootstrap3 %} {% block title %}{% trans "Admin mode" %}{% endblock %} {% block content %} -

    {% trans "Admin mode" %}

    -

    - {% blocktrans trimmed %} - To perform this action, you need to start an administrative session. Everything you do in that session - will be logged and you will later be asked to fill in a comment on what you did in your session for later - reference. - {% endblocktrans %} -

    -
    - {% csrf_token %} -
    - +
    +
    +

    {% trans "Admin mode" %}

    - +
    +

    + {% blocktrans trimmed %} + To perform this action, you need to start an administrative session. Everything you do in that + session will be logged and you will later be asked to fill in a comment on what you did in your session for + later reference. + {% endblocktrans %} +

    +
    + {% csrf_token %} +
    + +
    +
    +
    +
    {% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/users/create.html b/src/pretix/control/templates/pretixcontrol/users/create.html index 1922c9e6a..e16a52e10 100644 --- a/src/pretix/control/templates/pretixcontrol/users/create.html +++ b/src/pretix/control/templates/pretixcontrol/users/create.html @@ -3,22 +3,29 @@ {% load bootstrap3 %} {% block title %}{% trans "Create user" %}{% endblock %} {% block content %} -

    {% trans "Create user" %}

    {% csrf_token %} {% bootstrap_form_errors form %} -
    - {% trans "Base settings" %} - {% bootstrap_field form.is_active layout='control' %} - {% bootstrap_field form.fullname layout='control' %} - {% bootstrap_field form.locale layout='control' %} - {% bootstrap_field form.timezone layout='control' %} +
    +
    +

    {% trans "Create user" %}

    +
    +
    + {% bootstrap_field form.is_active layout='control' %} + {% bootstrap_field form.fullname layout='control' %} + {% bootstrap_field form.locale layout='control' %} + {% bootstrap_field form.timezone layout='control' %} +
    -
    - {% trans "Log-in settings" %} - {% bootstrap_field form.email layout='control' %} - {% bootstrap_field form.new_pw layout='control' %} - {% bootstrap_field form.new_pw_repeat layout='control' %} +
    +
    + {% trans "Log-in settings" %} +
    +
    + {% bootstrap_field form.email layout='control' %} + {% bootstrap_field form.new_pw layout='control' %} + {% bootstrap_field form.new_pw_repeat layout='control' %} +
    - -
    - {% csrf_token %} - -
    -

    {% csrf_token %} {% bootstrap_form_errors form %} -
    - {% trans "Base settings" %} - {% bootstrap_field form.is_active layout='control' %} - {% bootstrap_field form.fullname layout='control' %} - {% bootstrap_field form.locale layout='control' %} - {% bootstrap_field form.timezone layout='control' %} - {% bootstrap_field form.is_staff layout='control' %} +
    +
    +
    + + {% csrf_token %} + + +
    + {% csrf_token %} + +
    +
    +

    {% trans "User" %} {{ user.email }}

    +
    +
    + {% bootstrap_field form.is_active layout='control' %} + {% bootstrap_field form.fullname layout='control' %} + {% bootstrap_field form.locale layout='control' %} + {% bootstrap_field form.timezone layout='control' %} + {% bootstrap_field form.is_staff layout='control' %} +
    -
    - {% trans "Log-in settings" %} - {% bootstrap_field form.email layout='control' %} - {% bootstrap_field form.new_pw layout='control' %} - {% bootstrap_field form.new_pw_repeat layout='control' %} - {% bootstrap_field form.require_2fa layout='control' %} +
    +
    + {% trans "Log-in settings" %} +
    +
    + {% bootstrap_field form.email layout='control' %} + {% bootstrap_field form.new_pw layout='control' %} + {% bootstrap_field form.new_pw_repeat layout='control' %} + {% bootstrap_field form.require_2fa layout='control' %} +
    -
    - {% trans "Team memberships" %} - +
    +
    + {% trans "Team memberships" %} +
    +
    + +
    + +
    +
    - -

    - - - {% trans "Create a new user" %} - -

    - - - - - - - - - - - - {% for u in users %} +
    + + + {% trans "Create a new user" %} + +
    +
    - {% trans "E-mail address" %} - - - - {% trans "Full name" %} - - - {% trans "Active" %}{% trans "Administrator" %}
    + - - - - - + + + + + - {% endfor %} - -
    - {{ u.email }} - {{ u.fullname|default_if_none:"" }}{% if u.is_active %}{% endif %}{% if u.is_staff %}{% endif %} - - + {% trans "E-mail address" %} + + + + {% trans "Full name" %} + + + {% trans "Active" %}{% trans "Administrator" %}
    - {% include "pretixcontrol/pagination.html" %} + + + {% for u in users %} + + + {{ u.email }} + + {{ u.fullname|default_if_none:"" }} + {% if u.is_active %}{% endif %} + {% if u.is_staff %}{% endif %} + + + + + {% endfor %} + + +
    + {% include "pretixcontrol/pagination.html" %} +
    +
    {% endblock %} diff --git a/src/pretix/plugins/badges/templates/pretixplugins/badges/delete.html b/src/pretix/plugins/badges/templates/pretixplugins/badges/delete.html index deaf25336..bc61ada7c 100644 --- a/src/pretix/plugins/badges/templates/pretixplugins/badges/delete.html +++ b/src/pretix/plugins/badges/templates/pretixplugins/badges/delete.html @@ -3,18 +3,25 @@ {% load bootstrap3 %} {% block title %}{% trans "Badges" %}{% endblock %} {% block content %} -

    {% trans "Badges" %}

    -
    - {% csrf_token %} -

    {% blocktrans %}Are you sure you want to delete the badge layout {{ layout }}?{% endblocktrans %}

    -
    - - {% trans "Cancel" %} - - +
    +
    +

    {% trans "Badges" %}

    - +
    + +
    + {% csrf_token %} +

    {% blocktrans %}Are you sure you want to delete the badge layout {{ layout }}?{% endblocktrans %}

    +
    + + {% trans "Cancel" %} + + +
    +
    +
    +
    {% endblock %} diff --git a/src/pretix/plugins/badges/templates/pretixplugins/badges/edit.html b/src/pretix/plugins/badges/templates/pretixplugins/badges/edit.html index 125a36e21..66494d680 100644 --- a/src/pretix/plugins/badges/templates/pretixplugins/badges/edit.html +++ b/src/pretix/plugins/badges/templates/pretixplugins/badges/edit.html @@ -9,31 +9,37 @@ {% endif %} {% endblock %} {% block content %} - {% if layout %} -

    {% blocktrans with name=layout.name %}Badge layout: {{ name }}{% endblocktrans %}

    - {% else %} -

    {% trans "Badge layout" %}

    - {% endif %} -
    - {% csrf_token %} - {% bootstrap_form_errors form %} - {% bootstrap_field form.name layout="control" %} -
    - -
    -

    - {% blocktrans trimmed %} - You can modify the design after you saved this page. - {% endblocktrans %} -

    -
    +
    +
    + {% if layout %} +

    {% blocktrans with name=layout.name %}Badge layout: {{ name }}{% endblocktrans %}

    + {% else %} +

    {% trans "Badge layout" %}

    + {% endif %}
    -
    - +
    + + {% csrf_token %} + {% bootstrap_form_errors form %} + {% bootstrap_field form.name layout="control" %} +
    + +
    +

    + {% blocktrans trimmed %} + You can modify the design after you saved this page. + {% endblocktrans %} +

    +
    +
    +
    + +
    +
    - +
    {% endblock %} diff --git a/src/pretix/plugins/badges/templates/pretixplugins/badges/index.html b/src/pretix/plugins/badges/templates/pretixplugins/badges/index.html index f4d674b51..56d3ab684 100644 --- a/src/pretix/plugins/badges/templates/pretixplugins/badges/index.html +++ b/src/pretix/plugins/badges/templates/pretixplugins/badges/index.html @@ -3,79 +3,87 @@ {% load money %} {% block title %}{% trans "Badges" %}{% endblock %} {% block content %} -

    {% trans "Badges" %}

    - {% if layouts|length == 0 %} -
    -

    - {% blocktrans trimmed %} - You haven't created any badge layouts yet. - {% endblocktrans %} -

    +
    + {% if layouts|length == 0 %} +
    +

    + {% blocktrans trimmed %} + You haven't created any badge layouts yet. + {% endblocktrans %} +

    - {% if "can_change_event_settings" in request.eventpermset %} - {% trans "Create a new badge layout" %} + {% if "can_change_event_settings" in request.eventpermset %} + {% trans "Create a new badge layout" %} + + {% endif %} +
    + {% else %} +
    + {% if "can_change_event_settings" in request.eventpermset %} + {% trans "Create a new badge layout" %} + + {% endif %} + {% trans "Print badges" %} - {% endif %} -
    - {% else %} -

    - {% if "can_change_event_settings" in request.eventpermset %} - {% trans "Create a new badge layout" %} - - {% endif %} - {% trans "Print badges" %} - -

    -
    - - - - - - - - - - {% for l in layouts %} + +
    +
    {% trans "Name" %}{% trans "Default" %}
    + - - + + + + + + {% for l in layouts %} + + + - - - {% endfor %} - -
    - {% if "can_change_event_settings" in request.eventpermset %} - - {{ l.name }} - - {% else %} - {{ l.name }} - {% endif %} - - {% if l.default %} - + {% trans "Name" %}{% trans "Default" %}
    + {% if "can_change_event_settings" in request.eventpermset %} + + {{ l.name }} + + {% else %} + {{ l.name }} + {% endif %} + + {% if l.default %} + {% trans "Default" %} - {% elif "can_change_event_settings" in request.eventpermset %} -
    - {% csrf_token %} - -
    - {% endif %} -     		- {% if "can_change_event_settings" in request.eventpermset %} - - - {% endif %} -
    -
    - {% endif %} - {% include "pretixcontrol/pagination.html" %} + {% elif "can_change_event_settings" in request.eventpermset %} +
    + {% csrf_token %} + +
    + {% endif %} + + + {% if "can_change_event_settings" in request.eventpermset %} + + + {% endif %} + + + {% endfor %} + + +
    +
    + {% include "pretixcontrol/pagination.html" %} +
    + {% endif %} +
    {% endblock %} diff --git a/src/pretix/plugins/badges/views.py b/src/pretix/plugins/badges/views.py index 1dca9347b..b2e663429 100644 --- a/src/pretix/plugins/badges/views.py +++ b/src/pretix/plugins/badges/views.py @@ -35,6 +35,7 @@ class LayoutListView(EventPermissionRequiredMixin, ListView): permission = ('can_change_event_settings', 'can_view_orders') template_name = 'pretixplugins/badges/index.html' context_object_name = 'layouts' + paginate_by = 25 def get_queryset(self): return self.request.event.badge_layouts.prefetch_related('item_assignments') diff --git a/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/import_assign.html b/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/import_assign.html index 6137cc9e3..3676390e8 100644 --- a/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/import_assign.html +++ b/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/import_assign.html @@ -1,23 +1,28 @@ {% extends basetpl %} {% load i18n %} {% block inner %} -

    {% blocktrans trimmed %} - We've been unable to automatically determine how the columns in your file are aligned. Please help us - by selecting which column contain what kind of data. - {% endblocktrans %}

    {% csrf_token %} - -
    - - +
    +
    + + {% blocktrans trimmed %} + We've been unable to automatically determine how the columns in your file are aligned. Please help + us by selecting which column contain what kind of data. + {% endblocktrans %} +
    +
    +
    +
    +
    + {% for col in rows.0 %} {% endfor %} @@ -25,7 +30,7 @@ {% for col in rows.0 %} {% endfor %} @@ -33,7 +38,7 @@ {% for col in rows.0 %} {% endfor %} @@ -41,12 +46,12 @@ {% for col in rows.0 %} {% endfor %} - - + + {% for row in rows|slice:":100" %} {% with forloop.counter0 as rowid %} @@ -64,11 +69,12 @@ {% endif %} - -
    {% trans "Date" %} - +
    {% trans "Amount" %} - +
    {% trans "Reference" %} - +
    {% trans "Payer" %} - +
    + + +
    - - + + diff --git a/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/import_base.html b/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/import_base.html index 91c0e35b0..d7670498f 100644 --- a/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/import_base.html +++ b/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/import_base.html @@ -3,7 +3,6 @@ {% load static %} {% block title %}{% trans "Import bank data" %}{% endblock %} {% block content %} -

    {% trans "Import bank data" %}

    {% block inner %} {% endblock %} {% endblock %} diff --git a/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/import_form.html b/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/import_form.html index a94701afd..f87017623 100644 --- a/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/import_form.html +++ b/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/import_form.html @@ -23,7 +23,8 @@ Currently, this feature supports .csv files and files in the MT940 format. {% endblocktrans %}

    {% if job_running %} -
    +
    {% trans "An import is currently being processed, please try again in a few minutes." %}
    @@ -31,7 +32,8 @@ {% csrf_token %}
    - +
    {% endif %} -

    - - {% if transactions_unhandled|length > 0 %} - {% include "pretixcontrol/pagination.html" %} - {% include "pretixplugins/banktransfer/transaction_list.html" with list=transactions_unhandled %} - {% include "pretixcontrol/pagination.html" %} - {% else %} -
    {% trans "Your search matched no transactions." %}
    - {% endif %}
    + + {% if transactions_unhandled|length > 0 %} + {% include "pretixplugins/banktransfer/transaction_list.html" with list=transactions_unhandled %} +
    + {% include "pretixcontrol/pagination.html" %} +
    + {% else %} +
    {% trans "Your search matched no transactions." %}
    + {% endif %}
    {% endif %} diff --git a/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/job_detail.html b/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/job_detail.html index 00b86c9ab..c81b579ea 100644 --- a/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/job_detail.html +++ b/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/job_detail.html @@ -2,48 +2,57 @@ {% load i18n %} {% load staticfiles %} {% block inner %} -

    {% trans "Import result" %}

    - {% if job.state == "running" or job.state == "pending" %} -
    -

    - -

    -

    - {% trans "The result of your import is in progress. Please be patient while we process the data …" %} -

    +
    +
    +

    {% trans "Import result" %}

    - {% else %} - {% if job.state == "error" %} -
    - {% trans "An internal error occurred during processing your data." %} + {% if job.state == "running" or job.state == "pending" %} +
    +

    + +

    +

    + {% trans "The result of your import is in progress. Please be patient while we process the data …" %} +

    - {% elif transactions_ignored == 0 and transactions_invalid == 0 and transactions_valid == 0 %} -
    - {% trans "Your import did not contain any transactions that you did not import before." %} -
    - {% endif %} + {% else %} + {% if job.state == "error" %} +
    +
    + {% trans "An internal error occurred during processing your data." %} +
    +
    + {% elif transactions_ignored == 0 and transactions_invalid == 0 and transactions_valid == 0 %} +
    +
    + {% trans "Your import did not contain any transactions that you did not import before." %} +
    +
    + {% endif %} - - - - - - - - - - - - - -
    {{ transactions_valid }}{% trans "Orders marked as paid" %}
    {{ transactions_invalid }}{% trans "Invalid payments" %}
    {{ transactions_ignored }}{% trans "Ignored payments" %}
    - {% if transactions_ignored or transactions_invalid %} - - {% trans "Review invalid and ignored payments" %} » - + + + + + + + + + + + + + +
    {{ transactions_valid }}{% trans "Orders marked as paid" %}
    {{ transactions_invalid }}{% trans "Invalid payments" %}
    {{ transactions_ignored }}{% trans "Ignored payments" %}
    + {% if transactions_ignored or transactions_invalid %} +
    + + {% trans "Review invalid and ignored payments" %} » + +
    + {% endif %} {% endif %} - - {% endif %} +
    {% endblock %} diff --git a/src/pretix/plugins/pretixdroid/signals.py b/src/pretix/plugins/pretixdroid/signals.py index 12fd51976..ade624c8c 100644 --- a/src/pretix/plugins/pretixdroid/signals.py +++ b/src/pretix/plugins/pretixdroid/signals.py @@ -24,7 +24,7 @@ def control_nav_import(sender, request=None, **kwargs): 'event': request.event.slug, 'organizer': request.event.organizer.slug, }), - 'active': (url.namespace == 'plugins:pretixdroid' and url.url_name == 'config'), + 'active': (url.namespace == 'plugins:pretixdroid'), 'icon': 'mobile', } ] diff --git a/src/pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html b/src/pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html index f59ca2f0a..e8b862c08 100644 --- a/src/pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html +++ b/src/pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration.html @@ -4,96 +4,115 @@ {% load staticfiles %} {% block title %}{% trans "Check-in device configuration" %}{% endblock %} {% block content %} -

    {% trans "Check-in device configuration" %}

    -

    {% blocktrans trimmed %} - pretixdroid is an Android app that you can use to control tickets at the entrance of your event. - pretixdesk is the corresponding app for desktop computers. - {% endblocktrans %}

    +
    +
    +

    {% trans "Check-in device configuration" %}

    +
    +
    + {% blocktrans trimmed %} + pretixdroid is an Android app that you can use to control tickets at the entrance of your event. + pretixdesk is the corresponding app for desktop computers. + {% endblocktrans %} +
    + {% if configs and "create" not in request.GET %} +
    + + {% trans "Create a new configuration" %} + +
    + {% endif %} +
    {% if not configs or "create" in request.GET %} -

    {% trans "Create app configuration" %}

    -

    - {% blocktrans trimmed %} - To start scanning tickets with our apps, first create a configuration code here: - {% endblocktrans %} -

    -
    - {% csrf_token %} - {% bootstrap_form_errors add_form %} - {% bootstrap_field add_form.list layout="horizontal" %} - {% bootstrap_field add_form.all_items layout="horizontal" %} - {% bootstrap_field add_form.items layout="horizontal" %} - {% bootstrap_field add_form.show_info layout="horizontal" %} - {% bootstrap_field add_form.allow_search layout="horizontal" %} - {% bootstrap_field add_form.app layout="horizontal" %} -
    -
    - -
    +
    +
    +

    {% trans "Create app configuration" %}

    - +
    +

    + {% blocktrans trimmed %} + To start scanning tickets with our apps, first create a configuration code here: + {% endblocktrans %} +

    +
    + {% csrf_token %} + {% bootstrap_form_errors add_form %} + {% bootstrap_field add_form.list layout="horizontal" %} + {% bootstrap_field add_form.all_items layout="horizontal" %} + {% bootstrap_field add_form.items layout="horizontal" %} + {% bootstrap_field add_form.show_info layout="horizontal" %} + {% bootstrap_field add_form.allow_search layout="horizontal" %} + {% bootstrap_field add_form.app layout="horizontal" %} +
    + +
    +
    +
    +
    {% endif %} {% if configs and "create" not in request.GET %} -

    {% trans "Existing app configurations" %}

    - - {% trans "Create a new configuration" %} - -
    - {% csrf_token %} - - - - - - - - - - - - - {% for ac in configs %} +
    +
    +

    {% trans "Existing app configurations" %}

    +
    + + {% csrf_token %} +
    {% trans "ID" %}{% trans "Check-in list" %}{% trans "Items" %}{% trans "Show info" %}{% trans "Allow search" %}
    + - - - - - - + + + + + + - {% endfor %} - -
    - {% if ac.app == "pretixdroid" %} - - {% elif ac.app == "pretixdesk" %} - - {% endif %} - {{ ac.key|slice:"0:8" }}… - - {{ ac.list }} - - {% if ac.all_items %} - {% trans "All" %} - {% else %} - {% for item in ac.items.all %} - {{ item.name }} - {% if forloop.revcounter0 > 0 %}
    {% endif %} - {% endfor %} - {% endif %} -     		{% if ac.show_info %}{% trans "Yes" %}{% else %}{% trans "No" %}{% endif %}{% if ac.allow_search %}{% trans "Yes" %}{% else %}{% trans "No" %}{% endif %} - - {% trans "Configure device" %} - - - {% trans "ID" %}{% trans "Check-in list" %}{% trans "Items" %}{% trans "Show info" %}{% trans "Allow search" %}
    -
    + + + {% for ac in configs %} + + + {% if ac.app == "pretixdroid" %} + + {% elif ac.app == "pretixdesk" %} + + {% endif %} + {{ ac.key|slice:"0:8" }}… + + + {{ ac.list }} + + + {% if ac.all_items %} + {% trans "All" %} + {% else %} + {% for item in ac.items.all %} + {{ item.name }} + {% if forloop.revcounter0 > 0 %}
    {% endif %} + {% endfor %} + {% endif %} + + {% if ac.show_info %}{% trans "Yes" %}{% else %}{% trans "No" %}{% endif %} + {% if ac.allow_search %}{% trans "Yes" %}{% else %}{% trans "No" %}{% endif %} + + + {% trans "Configure device" %} + + + + + {% endfor %} + + + +
    {% endif %} {% endblock %} diff --git a/src/pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration_code.html b/src/pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration_code.html index 7438f9489..7608804e2 100644 --- a/src/pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration_code.html +++ b/src/pretix/plugins/pretixdroid/templates/pretixplugins/pretixdroid/configuration_code.html @@ -5,64 +5,87 @@ {% block title %}{% trans "Device configuration" %}{% endblock %} {% block content %} {% if config.app == "pretixdroid" %} -

    - {% trans "pretixdroid configuration" %} - - {% trans "Back to overview" %} - -

    -

    {% trans "1. Download app" %}

    -

    - - + <div class= +

    +

    {% trans "1. Download app" %}

    +
    +
    +

    + + {% trans - -

    -

    - - {% blocktrans trimmed %} - Android, Google Play and the Google Play logo are trademarks of Google Inc. - {% endblocktrans %} - -

    -

    {% trans "2. Scan code" %}

    -
    - -

    {% trans "3. Start scanning tickets" %}

    - + + + + + + +
    +
    +
    +
    +

    {% trans "3. Start scanning tickets" %}

    +
    +
    {% else %} -

    - {% trans "pretixdesk configuration" %} - - {% trans "Back to overview" %} - -

    -

    {% trans "1. Download pretixdesk" %}

    -

    - - {% trans "Open download page" %} - -

    -

    {% trans "2. Connect device" %}

    -

    - - {% trans "Connect with pretixdesk" %} - -

    -

    - {% blocktrans trimmed %} - If this link does not open the pretixdesk application or if you want to set the application up on a - separate device, copy the following code and paste it into the application: - {% endblocktrans %} -

    -

    - -

    -

    {% trans "3. Start scanning tickets" %}

    - +
    +
    +

    {% trans "1. Download pretixdesk" %}

    +
    +
    + + {% trans "Open download page" %} + +
    +
    +
    +
    +

    {% trans "2. Connect device" %}

    +
    +
    +

    + + {% trans "Connect with pretixdesk" %} + +

    +

    + {% blocktrans trimmed %} + If this link does not open the pretixdesk application or if you want to set the application up + on a + separate device, copy the following code and paste it into the application: + {% endblocktrans %} +

    +

    + +

    +
    +
    +
    +
    +

    {% trans "3. Start scanning tickets" %}

    +
    +
    {% endif %} + {% endblock %} diff --git a/src/pretix/plugins/sendmail/templates/pretixplugins/sendmail/history.html b/src/pretix/plugins/sendmail/templates/pretixplugins/sendmail/history.html index 53accc0c7..b06df6076 100644 --- a/src/pretix/plugins/sendmail/templates/pretixplugins/sendmail/history.html +++ b/src/pretix/plugins/sendmail/templates/pretixplugins/sendmail/history.html @@ -3,8 +3,10 @@ {% load bootstrap3 %} {% block title %}{% trans "Send out emails" %}{% endblock %} {% block content %} -

    {% trans "Email history" %}

    -
    +
    +
    +

    {% trans "Email history" %}

    +
      {% for log in logs %}
    • @@ -36,6 +38,8 @@
      • {% endfor %}
    +
    + {% include "pretixcontrol/pagination.html" %} +
    - {% include "pretixcontrol/pagination.html" %} {% endblock %} diff --git a/src/pretix/plugins/sendmail/templates/pretixplugins/sendmail/send_form.html b/src/pretix/plugins/sendmail/templates/pretixplugins/sendmail/send_form.html index fdfdf2c2e..a5b2cf05a 100644 --- a/src/pretix/plugins/sendmail/templates/pretixplugins/sendmail/send_form.html +++ b/src/pretix/plugins/sendmail/templates/pretixplugins/sendmail/send_form.html @@ -3,20 +3,39 @@ {% load bootstrap3 %} {% block title %}{% trans "Send out emails" %}{% endblock %} {% block content %} -

    {% trans "Send out emails" %}

    - {% block inner %} -
    - {% csrf_token %} - {% bootstrap_field form.sendto layout='horizontal' %} - {% if form.subevent %} - {% bootstrap_field form.subevent layout='horizontal' %} - {% endif %} - {% bootstrap_field form.item layout='horizontal' %} - {% bootstrap_field form.subject layout='horizontal' %} - {% bootstrap_field form.message layout='horizontal' %} - {% if request.method == "POST" %} -
    - {% trans "E-mail preview" %} +
    +
    +

    {% trans "Send out emails" %}

    +
    +
    + {% block inner %} + + {% csrf_token %} + {% bootstrap_field form.sendto layout='horizontal' %} + {% if form.subevent %} + {% bootstrap_field form.subevent layout='horizontal' %} + {% endif %} + {% bootstrap_field form.item layout='horizontal' %} + {% bootstrap_field form.subject layout='horizontal' %} + {% bootstrap_field form.message layout='horizontal' %} +
    + + +
    + + {% endblock %} +
    +
    + {% if request.method == "POST" %} +
    +
    + {% trans "E-mail preview" %} +
    +
    {% for locale, segments in output.items %} 
    {% spaceless %}
@@ -26,16 +45,7 @@
                         {% endspaceless %}
    {% endfor %}
    -
    - {% endif %} -
    - -
    - - {% endblock %} +
    + {% endif %} {% endblock %} diff --git a/src/pretix/plugins/statistics/templates/pretixplugins/statistics/index.html b/src/pretix/plugins/statistics/templates/pretixplugins/statistics/index.html index 543572837..ad2303a81 100644 --- a/src/pretix/plugins/statistics/templates/pretixplugins/statistics/index.html +++ b/src/pretix/plugins/statistics/templates/pretixplugins/statistics/index.html @@ -5,11 +5,12 @@ {% load escapejson %} {% block title %}{% trans "Statistics" %}{% endblock %} {% block content %} -

    {% trans "Statistics" %}

    {% if request.event.has_subevents %} -
    - {% include "pretixcontrol/event/fragment_subevent_choice_simple.html" %} -
    +
    +
    + {% include "pretixcontrol/event/fragment_subevent_choice_simple.html" %} +
    +
    {% endif %} {% if has_orders %}
    @@ -29,7 +30,8 @@ {% if request.GET.subevent %}
    {% blocktrans trimmed context "subevent" %} - If you select a single date, payment method fees will not be listed here as it might not be clear which + If you select a single date, payment method fees will not be listed here as it might not be + clear which date they belong to. {% endblocktrans %}
    diff --git a/src/pretix/plugins/ticketoutputpdf/templates/pretixplugins/ticketoutputpdf/delete.html b/src/pretix/plugins/ticketoutputpdf/templates/pretixplugins/ticketoutputpdf/delete.html index 1906c2fc2..6ca6b4bf0 100644 --- a/src/pretix/plugins/ticketoutputpdf/templates/pretixplugins/ticketoutputpdf/delete.html +++ b/src/pretix/plugins/ticketoutputpdf/templates/pretixplugins/ticketoutputpdf/delete.html @@ -3,18 +3,25 @@ {% load bootstrap3 %} {% block title %}{% trans "Ticket layout" %}{% endblock %} {% block content %} -

    {% trans "Ticket layout" %}

    -
    - {% csrf_token %} -

    {% blocktrans %}Are you sure you want to delete the layout {{ layout }}?{% endblocktrans %}

    -
    - - {% trans "Cancel" %} - - +
    +
    +

    {% trans "Ticket layout" %}

    - +
    +
    + {% csrf_token %} +

    {% blocktrans %}Are you sure you want to delete the layout {{ layout }} + ?{% endblocktrans %}

    +
    + + {% trans "Cancel" %} + + +
    +
    +
    +
    {% endblock %} diff --git a/src/pretix/plugins/ticketoutputpdf/templates/pretixplugins/ticketoutputpdf/edit.html b/src/pretix/plugins/ticketoutputpdf/templates/pretixplugins/ticketoutputpdf/edit.html index 98db645c0..27d4a80d1 100644 --- a/src/pretix/plugins/ticketoutputpdf/templates/pretixplugins/ticketoutputpdf/edit.html +++ b/src/pretix/plugins/ticketoutputpdf/templates/pretixplugins/ticketoutputpdf/edit.html @@ -9,31 +9,39 @@ {% endif %} {% endblock %} {% block content %} - {% if layout %} -

    {% blocktrans with name=layout.name %}Ticket layout: {{ name }}{% endblocktrans %}

    - {% else %} -

    {% trans "Ticket layout" %}

    - {% endif %} -
    - {% csrf_token %} - {% bootstrap_form_errors form %} - {% bootstrap_field form.name layout="control" %} -
    - -
    -

    - {% blocktrans trimmed %} - You can modify the design after you saved this page. - {% endblocktrans %} -

    -
    +
    +
    + + {% if layout %} +

    {% blocktrans with name=layout.name %}Ticket layout: + {{ name }}{% endblocktrans %}

    + {% else %} +

    {% trans "Ticket layout" %}

    + {% endif %}
    -
    - +
    + + {% csrf_token %} + {% bootstrap_form_errors form %} + {% bootstrap_field form.name layout="control" %} +
    + +
    +

    + {% blocktrans trimmed %} + You can modify the design after you saved this page. + {% endblocktrans %} +

    +
    +
    +
    + +
    +
    - +
    {% endblock %} diff --git a/src/pretix/plugins/ticketoutputpdf/templates/pretixplugins/ticketoutputpdf/index.html b/src/pretix/plugins/ticketoutputpdf/templates/pretixplugins/ticketoutputpdf/index.html index 8fcc60dcd..70e204d5c 100644 --- a/src/pretix/plugins/ticketoutputpdf/templates/pretixplugins/ticketoutputpdf/index.html +++ b/src/pretix/plugins/ticketoutputpdf/templates/pretixplugins/ticketoutputpdf/index.html @@ -3,76 +3,85 @@ {% load money %} {% block title %}{% trans "Ticket layouts" %}{% endblock %} {% block content %} -

    {% trans "Ticket layouts" %}

    - {% if layouts|length == 0 %} -
    -

    - {% blocktrans trimmed %} - You haven't created any layouts yet. - {% endblocktrans %} -

    - - {% if "can_change_event_settings" in request.eventpermset %} - {% trans "Create a new layout" %} - - {% endif %} +
    +
    +

    {% trans "Ticket layouts" %}

    - {% else %} -

    - {% if "can_change_event_settings" in request.eventpermset %} - {% trans "Create a new layout" %} - - {% endif %} -

    -
    - - - - - - - - - - {% for l in layouts %} + {% if layouts|length == 0 %} +
    +

    + {% blocktrans trimmed %} + You haven't created any layouts yet. + {% endblocktrans %} +

    + + {% if "can_change_event_settings" in request.eventpermset %} + {% trans "Create a new layout" %} + + {% endif %} +
    + {% else %} +
    + {% if "can_change_event_settings" in request.eventpermset %} + {% trans "Create a new layout" %} + + {% endif %} +
    +
    +
    {% trans "Name" %}{% trans "Default" %}
    + - - + + + + + + {% for l in layouts %} + + + - - - {% endfor %} - -
    - {% if "can_change_event_settings" in request.eventpermset %} - - {{ l.name }} - - {% else %} - {{ l.name }} - {% endif %} - - {% if l.default %} - + {% trans "Name" %}{% trans "Default" %}
    + {% if "can_change_event_settings" in request.eventpermset %} + + {{ l.name }} + + {% else %} + {{ l.name }} + {% endif %} + + {% if l.default %} + {% trans "Default" %} - {% elif "can_change_event_settings" in request.eventpermset %} -
    - {% csrf_token %} - -
    - {% endif %} -     		- {% if "can_change_event_settings" in request.eventpermset %} - - - {% endif %} -
    -
    - {% endif %} - {% include "pretixcontrol/pagination.html" %} + {% elif "can_change_event_settings" in request.eventpermset %} +
    + {% csrf_token %} + +
    + {% endif %} + + + {% if "can_change_event_settings" in request.eventpermset %} + + + {% endif %} + + + {% endfor %} + + +
    +
    + {% include "pretixcontrol/pagination.html" %} +
    + {% endif %} +
    {% endblock %} diff --git a/src/pretix/plugins/ticketoutputpdf/views.py b/src/pretix/plugins/ticketoutputpdf/views.py index 304493a56..dbb97b541 100644 --- a/src/pretix/plugins/ticketoutputpdf/views.py +++ b/src/pretix/plugins/ticketoutputpdf/views.py @@ -77,6 +77,7 @@ class LayoutListView(EventPermissionRequiredMixin, ListView): permission = ('can_change_event_settings') template_name = 'pretixplugins/ticketoutputpdf/index.html' context_object_name = 'layouts' + paginate_by = 25 def get_queryset(self): return self.request.event.ticket_layouts.prefetch_related('item_assignments') diff --git a/src/pretix/static/pretixbase/scss/_theme.scss b/src/pretix/static/pretixbase/scss/_theme.scss index 16e55c6b3..5ab719f1e 100644 --- a/src/pretix/static/pretixbase/scss/_theme.scss +++ b/src/pretix/static/pretixbase/scss/_theme.scss @@ -19,6 +19,14 @@ } } +.dl-left dt { + text-align: left; +} + +.panel-body > dl:last-child, .panel-body > p:last-child { + margin-bottom: 0; +} + .navbar-inverse { box-shadow: 0 2px 5px 0 rgba(78, 50, 92, .1), 0 1px 1px 0 rgba(0, 0, 0, .07); margin: 0; @@ -91,7 +99,14 @@ .panel-heading { padding: 10px 15px; } - +.panel-heading small { + font-size: ceil(($font-size-base * 1.125)); + color: $text-muted; +} +.panel-default > label > .panel-heading { + color: #333333; + border-color: #e5e5e5; +} .panel-heading legend, .panel-heading .panel-title { margin-top: 0; margin-bottom: 0; diff --git a/src/pretix/static/pretixcontrol/scss/_forms.scss b/src/pretix/static/pretixcontrol/scss/_forms.scss index 7bdf035cb..24511a177 100644 --- a/src/pretix/static/pretixcontrol/scss/_forms.scss +++ b/src/pretix/static/pretixcontrol/scss/_forms.scss @@ -74,7 +74,9 @@ div[data-formset-body], div[data-formset-form], div[data-nested-formset-form], d .panel-body .submit-group { box-shadow: none; padding: 0; - +} +.panel-body .submit-group:first-child { + margin: 0 !important; } .panel .form-group:last-child { @@ -351,7 +353,6 @@ table td > .checkbox input[type="checkbox"] { } .panel-default>.accordion-radio>.panel-heading { color: #333; - background-color: #f5f5f5; padding: 12px 15px; input[type=checkbox] { diff --git a/src/pretix/static/pretixcontrol/scss/main.scss b/src/pretix/static/pretixcontrol/scss/main.scss index 81ca79d3a..10975d257 100644 --- a/src/pretix/static/pretixcontrol/scss/main.scss +++ b/src/pretix/static/pretixcontrol/scss/main.scss @@ -480,20 +480,10 @@ body.loading #wrapper { .quick-icon { float: left; width: 100px; - - .fa-ticket, .fa-check-circle { - margin-top: -20px; - } - .fa-wrench { - margin-top: -30px; - } - .fa-money, .fa-envelope { - margin-top: -40px; - } + margin: 0; } .quick-icon .fa { font-size: 100px; - line-height: 170px; display: block; } .quick-content {