diff --git a/src/pretix/control/templates/pretixcontrol/event/base.html b/src/pretix/control/templates/pretixcontrol/event/base.html index dae2dc08c..672c3110b 100644 --- a/src/pretix/control/templates/pretixcontrol/event/base.html +++ b/src/pretix/control/templates/pretixcontrol/event/base.html @@ -31,7 +31,7 @@
  • + {% if "event.settings.payment" in url_name %}class="active"{% endif %}> {% trans "Payment" %}
    • diff --git a/src/pretix/control/templates/pretixcontrol/event/delete.html b/src/pretix/control/templates/pretixcontrol/event/delete.html index cd6f09c71..095f913cd 100644 --- a/src/pretix/control/templates/pretixcontrol/event/delete.html +++ b/src/pretix/control/templates/pretixcontrol/event/delete.html @@ -2,81 +2,89 @@ {% load i18n %} {% load bootstrap3 %} {% block content %} -

    {% trans "Delete event" %}

    - {% if request.event.allow_delete %} - {% bootstrap_form_errors form layout="inline" %} -

    - {% blocktrans trimmed %} - This operation will destroy your event including all configuration, products, quotas, questions, - vouchers, lists, etc. - {% endblocktrans %} -

    -

    - {% blocktrans trimmed %} - This operation is irreversible and there is no way to bring your data back. - {% endblocktrans %} -

    -
    - {% csrf_token %} +
    +
    +

    {% trans "Delete event" %}

    +
    +
    + {% if request.event.allow_delete %} + {% bootstrap_form_errors form layout="inline" %}

    - {% blocktrans trimmed with slug=request.event.slug %} - To confirm you really want this, please type out the event's short name ("{{ slug }}") here: + {% blocktrans trimmed %} + This operation will destroy your event including all configuration, products, quotas, questions, + vouchers, lists, etc. {% endblocktrans %}

    - {% bootstrap_field form.slug layout="inline" %} -

    - {% blocktrans trimmed with slug=request.event.slug %} - Also, to make sure it's really you, please enter your user password here: +

    + {% blocktrans trimmed %} + This operation is irreversible and there is no way to bring your data back. {% endblocktrans %} -

    - {% bootstrap_field form.user_pw layout="inline" %} - -
    - -
    - - {% else %} -

    - {% trans "Your event can not be deleted as it already contains orders." %} -

    -

    - {% blocktrans trimmed %} - pretix does not allow deleting orders once they have been placed in order to be audit-proof and - trustable by financial authorities. - {% endblocktrans %} -

    - {% if request.event.live %} -

    - {% trans "You can instead take your shop offline. This will hide it from everyone except from the organizer teams you configured to have access to the event." %} -

    -
    +

    + {% csrf_token %} - +

    + {% blocktrans trimmed with slug=request.event.slug %} + To confirm you really want this, please type out the event's short name ("{{ slug }}") here: + {% endblocktrans %} +

    + {% bootstrap_field form.slug layout="inline" %} +

    + {% blocktrans trimmed with slug=request.event.slug %} + Also, to make sure it's really you, please enter your user password here: + {% endblocktrans %} +

    + {% bootstrap_field form.user_pw layout="inline" %}
    - - - {% trans "Delete personal data" %} - -
    {% else %}

    - {% trans "However, since your shop is offline, it is only visible to the organizing team according to the permissions you configured." %} + {% trans "Your event can not be deleted as it already contains orders." %} +

    +

    + {% blocktrans trimmed %} + pretix does not allow deleting orders once they have been placed in order to be audit-proof and + trustable by financial authorities. + {% endblocktrans %} +

    + {% if request.event.live %} +

    + {% trans "You can instead take your shop offline. This will hide it from everyone except from the organizer teams you configured to have access to the event." %} +

    +
    + {% csrf_token %} + + +
    + + + {% trans "Delete personal data" %} + + +
    +
    + {% else %} +

    + {% trans "However, since your shop is offline, it is only visible to the organizing team according to the permissions you configured." %}

    - + {% trans "Delete personal data" %}
    -

    +

    + {% endif %} {% endif %} - {% endif %} +
    +
    {% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/event/index.html b/src/pretix/control/templates/pretixcontrol/event/index.html index 59d504464..64854f8db 100644 --- a/src/pretix/control/templates/pretixcontrol/event/index.html +++ b/src/pretix/control/templates/pretixcontrol/event/index.html @@ -5,16 +5,20 @@ {% load staticfiles %} {% block title %}{{ request.event.name }}{% endblock %} {% block content %} -

    - {{ request.event.name }} - - {% if request.event.has_subevents %} - {% trans "Event series" %} - {% else %} - {{ request.event.get_date_range_display }} - {% endif %} - -

    +
    +
    +

    + {{ request.event.name }} + + {% if request.event.has_subevents %} + {% trans "Event series" %} + {% else %} + {{ request.event.get_date_range_display }} + {% endif %} + +

    +
    +
    {% if actions|length > 0 %}
    @@ -71,7 +75,6 @@ {% endfor %}
    -

     

    diff --git a/src/pretix/control/templates/pretixcontrol/event/invoicing.html b/src/pretix/control/templates/pretixcontrol/event/invoicing.html index 709ffcdf9..ef8085b46 100644 --- a/src/pretix/control/templates/pretixcontrol/event/invoicing.html +++ b/src/pretix/control/templates/pretixcontrol/event/invoicing.html @@ -5,33 +5,38 @@
    {% csrf_token %} {% bootstrap_form_errors form %} -
    - {% trans "Invoicing" %} - {% bootstrap_field form.invoice_address_asked layout="control" %} - {% bootstrap_field form.invoice_address_required layout="control" %} - {% bootstrap_field form.invoice_name_required layout="control" %} - {% bootstrap_field form.invoice_generate layout="control" %} - {% bootstrap_field form.invoice_email_attachment layout="control" %} - {% bootstrap_field form.invoice_address_vatid layout="control" %} - {% bootstrap_field form.invoice_numbers_consecutive layout="control" %} - {% bootstrap_field form.invoice_numbers_prefix layout="control" %} - {% bootstrap_field form.invoice_renderer layout="control" %} - {% bootstrap_field form.invoice_language layout="control" %} - {% bootstrap_field form.invoice_include_free layout="control" %} - {% bootstrap_field form.invoice_attendee_name layout="control" %} - {% bootstrap_field form.invoice_address_from layout="control" %} - {% bootstrap_field form.invoice_introductory_text layout="control" %} - {% bootstrap_field form.invoice_additional_text layout="control" %} - {% bootstrap_field form.invoice_footer_text layout="control" %} - {% bootstrap_field form.invoice_logo_image layout="control" %} +
    +
    + {% trans "Invoicing" %} +
    +
    + {% bootstrap_field form.invoice_address_asked layout="control" %} + {% bootstrap_field form.invoice_address_required layout="control" %} + {% bootstrap_field form.invoice_name_required layout="control" %} + {% bootstrap_field form.invoice_generate layout="control" %} + {% bootstrap_field form.invoice_email_attachment layout="control" %} + {% bootstrap_field form.invoice_address_vatid layout="control" %} + {% bootstrap_field form.invoice_numbers_consecutive layout="control" %} + {% bootstrap_field form.invoice_numbers_prefix layout="control" %} + {% bootstrap_field form.invoice_renderer layout="control" %} + {% bootstrap_field form.invoice_language layout="control" %} + {% bootstrap_field form.invoice_include_free layout="control" %} + {% bootstrap_field form.invoice_attendee_name layout="control" %} + {% bootstrap_field form.invoice_address_from layout="control" %} + {% bootstrap_field form.invoice_introductory_text layout="control" %} + {% bootstrap_field form.invoice_additional_text layout="control" %} + {% bootstrap_field form.invoice_footer_text layout="control" %} + {% bootstrap_field form.invoice_logo_image layout="control" %} +
    + + +
    +
    -
    - - -
    {% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/event/mail.html b/src/pretix/control/templates/pretixcontrol/event/mail.html index 139f6fc8e..157553631 100644 --- a/src/pretix/control/templates/pretixcontrol/event/mail.html +++ b/src/pretix/control/templates/pretixcontrol/event/mail.html @@ -17,7 +17,7 @@ {% bootstrap_field form.mail_bcc layout="control" %}

    -
    +
    {% blocktrans asvar title_placed_order %}Placed order{% endblocktrans %} {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="order_placed" title=title_placed_order items="mail_text_order_placed" %} diff --git a/src/pretix/control/templates/pretixcontrol/event/payment.html b/src/pretix/control/templates/pretixcontrol/event/payment.html index 399a1a0b0..e32695dfa 100644 --- a/src/pretix/control/templates/pretixcontrol/event/payment.html +++ b/src/pretix/control/templates/pretixcontrol/event/payment.html @@ -58,12 +58,12 @@ {% bootstrap_field form.payment_term_expire_automatically layout="control" %} {% bootstrap_field form.payment_term_accept_late layout="control" %} {% bootstrap_field form.tax_rate_default layout="control" %} +
    + +
    -
    - -
    {% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/event/payment_provider.html b/src/pretix/control/templates/pretixcontrol/event/payment_provider.html index d859f21f1..86c088e1b 100644 --- a/src/pretix/control/templates/pretixcontrol/event/payment_provider.html +++ b/src/pretix/control/templates/pretixcontrol/event/payment_provider.html @@ -4,30 +4,37 @@ {% block inside %}
    {% csrf_token %} -
    - - - - {% trans "Back" %} - - {% trans "Payment provider:" %} {{ provider.verbose_name }} - - {% bootstrap_form form layout='control' %} - {% if settings_content %}{{ settings_content|safe }}{% endif %} -

     

    -
    - {% trans "Warning:" %} - {% blocktrans trimmed %} - Please note that EU Directive 2015/2366 bans surcharging payment fees for most common payment - methods within the European Union. If in doubt, consult a lawyer or refrain from charging payment - fees. - {% endblocktrans %} -
    - {% blocktrans trimmed %} - In simple terms, this means you need to pay any fees imposed by the payment providers and cannot - pass it on to your customers. - {% endblocktrans %} +

    + + + {% trans "Back" %} + +

    +
    +
    + + {% trans "Payment provider:" %} {{ provider.verbose_name }} + +
    +
    + {% bootstrap_form form layout='control' %} + {% if settings_content %}{{ settings_content|safe }}{% endif %} +

     

    +
    + {% trans "Warning:" %} + {% blocktrans trimmed %} + Please note that EU Directive 2015/2366 bans surcharging payment fees for most common payment + methods within the European Union. If in doubt, consult a lawyer or refrain from charging + payment + fees. + {% endblocktrans %} +
    + {% blocktrans trimmed %} + In simple terms, this means you need to pay any fees imposed by the payment providers and cannot + pass it on to your customers. + {% endblocktrans %} +
    diff --git a/src/pretix/control/templates/pretixcontrol/event/tax_delete.html b/src/pretix/control/templates/pretixcontrol/event/tax_delete.html index 4dd4bd0f9..ac7b8d3d1 100644 --- a/src/pretix/control/templates/pretixcontrol/event/tax_delete.html +++ b/src/pretix/control/templates/pretixcontrol/event/tax_delete.html @@ -3,24 +3,33 @@ {% load bootstrap3 %} {% block title %}{% trans "Delete tax rule" %}{% endblock %} {% block inside %} - {% trans "Delete tax rule" %} - {% csrf_token %} - {% if possible %} -

    {% blocktrans %}Are you sure you want to delete the tax rule {{ taxrule }}?{% endblocktrans %}

    - {% else %} -

    {% blocktrans %}You cannot delete a tax rule that is in use for a product or has been in use for any existing orders.{% endblocktrans %}

    - {% endif %} -
    - +
    + {% trans "Delete tax rule" %} +
    +
    + {% csrf_token %} + {% if possible %} +

    {% blocktrans %}Are you sure you want to delete the tax rule {{ taxrule }} + ?{% endblocktrans %}

    + {% else %} +

    {% blocktrans %}You cannot delete a tax rule that is in use for a product or has been in use for + any existing orders.{% endblocktrans %}

    + {% endif %} +
    + - {% trans "Cancel" %} - - {% if possible %} - - {% endif %} + {% trans "Cancel" %} + + {% if possible %} + + {% endif %} +
    +
    {% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/event/tax_edit.html b/src/pretix/control/templates/pretixcontrol/event/tax_edit.html index 39fd12da9..042d0e5c9 100644 --- a/src/pretix/control/templates/pretixcontrol/event/tax_edit.html +++ b/src/pretix/control/templates/pretixcontrol/event/tax_edit.html @@ -10,19 +10,25 @@ {% endif %} {% endblock %} {% block inside %} - {% if rule %} - {% blocktrans with name=rule.name %}Tax rule: {{ name }}{% endblocktrans %} - {% else %} - {% trans "Tax rule" %} - {% endif %}
    - {% csrf_token %} - {% bootstrap_form_errors form %} - {% bootstrap_field form.name layout="control" %} - {% bootstrap_field form.rate addon_after="%" layout="control" %} +
    +
    + {% if rule %} + {% blocktrans with name=rule.name %}Tax rule: {{ name }}{% endblocktrans %} + {% else %} + {% trans "Tax rule" %} + {% endif %} +
    + {% csrf_token %} +
    + {% bootstrap_form_errors form %} + {% bootstrap_field form.name layout="control" %} + {% bootstrap_field form.rate addon_after="%" layout="control" %} +
    +
    + {% if rule.eu_reverse_charge or rule.has_custom_rules or form.errors %}open{% endif %}>

    {% trans "Advanced settings" %} @@ -31,7 +37,6 @@

    - {% trans "Advanced settings" %}
    {% blocktrans trimmed with docs="https://docs.pretix.eu/en/latest/user/events/taxes.html" %} These settings are intended for advanced users. See the @@ -47,8 +52,10 @@
    {% blocktrans trimmed %} These settings are intended for professional users with very specific taxation situations. - If you create any rule here, the reverse charge settings above will be ignored. The rules will be - checked in order and once the first rule matches the order, it will be used and all further rules will + If you create any rule here, the reverse charge settings above will be ignored. The rules + will be + checked in order and once the first rule matches the order, it will be used and all further + rules will be ignored. If no rule matches, tax will be charged. {% endblocktrans %} {% trans "All of these rules will only apply if an invoice address is set." %} diff --git a/src/pretix/control/templates/pretixcontrol/event/tax_index.html b/src/pretix/control/templates/pretixcontrol/event/tax_index.html index 88ff2355d..ba07af709 100644 --- a/src/pretix/control/templates/pretixcontrol/event/tax_index.html +++ b/src/pretix/control/templates/pretixcontrol/event/tax_index.html @@ -2,50 +2,60 @@ {% load i18n %} {% block title %}{% trans "Tax rules" %}{% endblock %} {% block inside %} - {% trans "Tax rules" %} - {% if taxrules|length == 0 %} -
    -

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

    +
    +
    + {% trans "Tax rules" %} +
    + {% if taxrules|length == 0 %} +
    +

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

    - {% trans "Create a new tax rule" %} -
    - {% else %} -

    - {% trans "Create a new tax rule" %} - -

    -
    - - - - - - - - - - {% for tr in taxrules %} + {% trans "Create a new tax rule" %} + + {% else %} +
    + {% trans "Create a new tax rule" %} + +
    +
    +
    {% trans "Name" %}{% trans "Rate" %}
    + - - - + + + - {% endfor %} - -
    - - {{ tr.name }} - - {{ tr.rate }} % - - - {% trans "Name" %}{% trans "Rate" %}
    -
    - {% endif %} - {% include "pretixcontrol/pagination.html" %} + + + {% for tr in taxrules %} + + + + {{ tr.name }} + + + {{ tr.rate }} % + + + + + + {% endfor %} + + +
    +
    + {% include "pretixcontrol/pagination.html" %} +
    + {% endif %} +
    {% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/event/widget.html b/src/pretix/control/templates/pretixcontrol/event/widget.html index 737ba60d1..23c922c3c 100644 --- a/src/pretix/control/templates/pretixcontrol/event/widget.html +++ b/src/pretix/control/templates/pretixcontrol/event/widget.html @@ -5,47 +5,55 @@ {% load eventurl %} {% load eventsignal %} {% block inside %} - {% trans "Widget" %} -

    - {% blocktrans trimmed %} - The pretix widget is a way to embed your ticket shop into your event website. This way, your visitors can - buy their ticket right away without leaving your website. - {% endblocktrans %} -

    - {% if valid %} -

    - {% blocktrans trimmed %} - To embed the widget onto your website, simply copy the following code to the <head> - section of your website: - {% endblocktrans %} -

    - 
    <link rel="stylesheet" type="text/css" href="{% abseventurl request.event "presale:event.widget.css" %}">
+    
    
+        
    
+            {% trans "Widget" %}
+        
    
+        
    
+            
    
+                {% blocktrans trimmed %}
+                    The pretix widget is a way to embed your ticket shop into your event website. This way, your
+                    visitors can
+                    buy their ticket right away without leaving your website.
+                {% endblocktrans %}
+            
    
+            {% if valid %}
+                
    
+                    {% blocktrans trimmed %}
+                        To embed the widget onto your website, simply copy the following code to the
+                        <head>
+                        section of your website:
+                    {% endblocktrans %}
+                
    
+                
    <link rel="stylesheet" type="text/css" href="{% abseventurl request.event "presale:event.widget.css" %}">
 <script type="text/javascript" src="{{ urlprefix }}{% url "presale:widget.js" lang=form.cleaned_data.language %}" async></script>
    
-        
    
-            {% blocktrans trimmed %}
-                Then, copy the following code to the place of your website where you want the widget to show up:
-            {% endblocktrans %}
-        
    
-        {% if form.cleaned_data.subevent %}
-            {% abseventurl request.event "presale:event.index" subevent=form.cleaned_data.subevent.pk as indexurl %}
-        {% else %}
-          {% abseventurl request.event "presale:event.index" as indexurl %}
-        {% endif %}
-        {% if form.cleaned_data.compatibility_mode %}
-            
    <div class="pretix-widget-compat" event="{% abseventurl request.event "presale:event.index" %}"{% if form.cleaned_data.subevent %} subevent="{{ form.cleaned_data.subevent.pk }}"{% endif %}{% if form.cleaned_data.voucher %} voucher="{{ form.cleaned_data.voucher }}"{% endif %}></div>
+                
    
+                    {% blocktrans trimmed %}
+                        Then, copy the following code to the place of your website where you want the widget to show up:
+                    {% endblocktrans %}
+                
    
+                {% if form.cleaned_data.subevent %}
+                    {% abseventurl request.event "presale:event.index" subevent=form.cleaned_data.subevent.pk as indexurl %}
+                {% else %}
+                    {% abseventurl request.event "presale:event.index" as indexurl %}
+                {% endif %}
+                {% if form.cleaned_data.compatibility_mode %}
+                    
    <div class="pretix-widget-compat" event="{% abseventurl request.event "presale:event.index" %}"
+                        {% if form.cleaned_data.subevent %} subevent="{{ form.cleaned_data.subevent.pk }}"{% endif %}
+                        {% if form.cleaned_data.voucher %} voucher="{{ form.cleaned_data.voucher }}"{% endif %}></div>
 <noscript>
    <div class="pretix-widget">
         <div class="pretix-widget-info-message">
-                {% blocktrans trimmed with a_attr='target="_blank" rel="noopener" href="'|add:indexurl|add:'"'|safe %}
-                    JavaScript is disabled in your browser. To access our ticket shop without JavaScript,
-                    please <a {{ a_attr }}>click here</a>.
-                {% endblocktrans %}
-                </div>
+                        {% blocktrans trimmed with a_attr='target="_blank" rel="noopener" href="'|add:indexurl|add:'"'|safe %}
+                            JavaScript is disabled in your browser. To access our ticket shop without JavaScript,
+                            please <a {{ a_attr }}>click here</a>.
+                        {% endblocktrans %}
+                        </div>
     </div>
 </noscript>
 
    
-        {% else %}
-        
    <pretix-widget event="{% abseventurl request.event "presale:event.index" %}"{% if form.cleaned_data.subevent %} subevent="{{ form.cleaned_data.subevent.pk }}"{% endif %}{% if form.cleaned_data.voucher %} voucher="{{ form.cleaned_data.voucher }}"{% endif %}></pretix-widget>
+                {% else %}
+                    
    <pretix-widget event="{% abseventurl request.event "presale:event.index" %}" {% if form.cleaned_data.subevent %} subevent="{{ form.cleaned_data.subevent.pk }}"{% endif %} {% if form.cleaned_data.voucher %} voucher="{{ form.cleaned_data.voucher }}"{% endif %}></pretix-widget>
 <noscript>
    <div class="pretix-widget">
         <div class="pretix-widget-info-message">
@@ -57,30 +65,32 @@
     </div>
 </noscript>
 
    
+                {% endif %}
+                
    
+                    
+                        
+                        {% trans "Read our documentation for more information" %}
+                    
+                
    
+            {% else %}
+                
    
+                    {% blocktrans trimmed %}
+                        Using this form, you can generate a code to copy and paste to your website source.
+                    {% endblocktrans %}
+                
    
+                
+                    {% csrf_token %}
+                    {% bootstrap_form form layout="control" %}
+                    
    
+                        
    
+                            
+                        
    
+                    
    
+                
             {% endif %}
-        
    
-            
-                
-                {% trans "Read our documentation for more information" %}
-            
-        
    
-    {% else %}
-        
    
-            {% blocktrans trimmed %}
-                Using this form, you can generate a code to copy and paste to your website source.
-            {% endblocktrans %}
-        
    
-        
    
-            {% csrf_token %}
-            {% bootstrap_form form layout="control" %}
-            
    
-                
    
-                    
-                
    
-            
    
-        
    
-    {% endif %}
-    {% eventsignal request.event "pretix.control.signals.event_settings_widget" request=request  %}
+        
    
+    
    
+    {% eventsignal request.event "pretix.control.signals.event_settings_widget" request=request %}
 {% endblock %}
diff --git a/src/pretix/control/templates/pretixcontrol/item/addons.html b/src/pretix/control/templates/pretixcontrol/item/addons.html
index dfca470bb..0ebb224ba 100644
--- a/src/pretix/control/templates/pretixcontrol/item/addons.html
+++ b/src/pretix/control/templates/pretixcontrol/item/addons.html
@@ -3,17 +3,21 @@
 {% load bootstrap3 %}
 {% load formset_tags %}
 {% block inside %}
-    
    
-        {% blocktrans trimmed %}
-            With add-ons, you can specify products that can be bought as an addition to this product. For example, if
-            you host a conference with a base conference ticket and a number of workshops, you could define the
-            workshops as add-ons to the conference ticket. With this configuration, the workshops cannot be bought
-            on their own but only in combination with a conference ticket. You can here specify categories of products
-            that can be used as add-ons to this product. You can also specify the minimum and maximum number of
-            add-ons of the given category that can or need to be chosen. The user can buy every add-on from the
-            category at most once. If an add-on product has multiple variations, only one of them can be bought.
-        {% endblocktrans %}
-    
    
+    
    
+        
    
+            {% blocktrans trimmed %}
+                With add-ons, you can specify products that can be bought as an addition to this product. For example,
+                if
+                you host a conference with a base conference ticket and a number of workshops, you could define the
+                workshops as add-ons to the conference ticket. With this configuration, the workshops cannot be bought
+                on their own but only in combination with a conference ticket. You can here specify categories of
+                products
+                that can be used as add-ons to this product. You can also specify the minimum and maximum number of
+                add-ons of the given category that can or need to be chosen. The user can buy every add-on from the
+                category at most once. If an add-on product has multiple variations, only one of them can be bought.
+            {% endblocktrans %}
+        
    
+    
    
     
    
         {% csrf_token %}
         
    
diff --git a/src/pretix/control/templates/pretixcontrol/item/base.html b/src/pretix/control/templates/pretixcontrol/item/base.html
index 048398b59..24dc6fccf 100644
--- a/src/pretix/control/templates/pretixcontrol/item/base.html
+++ b/src/pretix/control/templates/pretixcontrol/item/base.html
@@ -3,34 +3,35 @@
 {% block title %}{{ object.name }} :: {% trans "Product" %}{% endblock %}
 {% block content %}
     {% if object.id %}
-        
    {% trans "Modify product:" %} {{ object.name }}
    
-        
-    {% else %}
-        
    {% trans "Create product" %}
    
-        
    {% blocktrans trimmed %}
-            You will be able to adjust further settings in the next step.
-        {% endblocktrans %}
    
+        
    
+            
    
+                
    {% trans "Modify product:" %} {{ object.name }}
    
+            
    
+            
    
+                
+            
    
+        
    
     {% endif %}
     {% if object.id and not object.quotas.exists %}
-        
    
+        
    
             {% blocktrans trimmed %}
                 Please note that your product will not be available for sale until you have added your
                 item to an existing or newly created quota.
diff --git a/src/pretix/control/templates/pretixcontrol/item/create.html b/src/pretix/control/templates/pretixcontrol/item/create.html
index c34dfade2..a8077bf7b 100644
--- a/src/pretix/control/templates/pretixcontrol/item/create.html
+++ b/src/pretix/control/templates/pretixcontrol/item/create.html
@@ -1,40 +1,55 @@
 {% extends "pretixcontrol/item/base.html" %}
 {% load i18n %}
 {% load bootstrap3 %}
-{% block inside %}
 {% load static %}
-
+{% block inside %}
+    
 
     
         {% csrf_token %}
-        
    
-            {% trans "General information" %}
-            {% bootstrap_field form.name layout="control" %}
-            
    
-                {% bootstrap_field form.internal_name layout="control" %}
+        
    
+            
    
+                {% trans "General information" %}
+            
    
+            
    
+                
    {% blocktrans trimmed %}
+                    You will be able to adjust further settings in the next step.
+                {% endblocktrans %}
    
+                {% bootstrap_field form.name layout="control" %}
+                
    
+                    {% bootstrap_field form.internal_name layout="control" %}
+                
    
+                {% bootstrap_field form.copy_from layout="control" %}
+                {% bootstrap_field form.has_variations layout="control" %}
+                {% bootstrap_field form.category layout="control" %}
+                {% bootstrap_field form.admission layout="control" %}
             
    
-            {% bootstrap_field form.copy_from layout="control" %}
-            {% bootstrap_field form.has_variations layout="control" %}
-            {% bootstrap_field form.category layout="control" %}
-            {% bootstrap_field form.admission layout="control" %}
         
    
         {% if form.quota_option %}
-            
    
-                {% trans "Quota settings" %}
-                {% bootstrap_field form.quota_option layout="control" %}
-                
    
-                    {% bootstrap_field form.quota_add_existing layout="control" %}
+            
    
+                
    
+                    {% trans "Quota settings" %}
                 
    
-                
    
-                    {% bootstrap_field form.quota_add_new_name layout="control" %}
-                    {% bootstrap_field form.quota_add_new_size layout="control" %}
+                
    
+                    {% bootstrap_field form.quota_option layout="control" %}
+                    
    
+                        {% bootstrap_field form.quota_add_existing layout="control" %}
+                    
    
+                    
    
+                        {% bootstrap_field form.quota_add_new_name layout="control" %}
+                        {% bootstrap_field form.quota_add_new_size layout="control" %}
+                    
    
                 
    
             
    
         {% endif %}
-        
    
-            {% trans "Price settings" %}
-            {% bootstrap_field form.default_price layout="control" %}
-            {% bootstrap_field form.tax_rule layout="control" %}
+        
    
+            
    
+                {% trans "Price settings" %}
+            
    
+            
    
+                {% bootstrap_field form.default_price layout="control" %}
+                {% bootstrap_field form.tax_rule layout="control" %}
+            
    
         
    
         
    
             
+                
    
             
    
             
    
                 
    
@@ -57,10 +82,5 @@
                 
    
             
    
         
    
-        
    
-            
-        
    
     
 {% endblock %}
diff --git a/src/pretix/control/templates/pretixcontrol/items/categories.html b/src/pretix/control/templates/pretixcontrol/items/categories.html
index 9e140ad20..8068fd411 100644
--- a/src/pretix/control/templates/pretixcontrol/items/categories.html
+++ b/src/pretix/control/templates/pretixcontrol/items/categories.html
@@ -2,56 +2,65 @@
 {% load i18n %}
 {% block title %}{% trans "Product categories" %}{% endblock %}
 {% block inside %}
-    
    {% trans "Product categories" %}
    
-    
    
-        {% blocktrans trimmed %}
-            You can use categories to group multiple products together in an organized way.
-        {% endblocktrans %}
-    
    
-    {% if categories|length == 0 %}
-        
    
-            
    
-                {% blocktrans trimmed %}
-                    You haven't created any categories yet.
-                {% endblocktrans %}
-            
    
+    
    
+        
    
+            
    {% trans "Product categories" %}
    
+        
    
+        {% if categories|length == 0 %}
+            
    
+                
    
+                    {% blocktrans trimmed %}
+                        You haven't created any categories yet.
+                    {% endblocktrans %}
+                
    
 
-             {% trans "Create a new category" %}
-        
    
-    {% else %}
-        
    
-             {% trans "Create a new category" %}
-            
-        
    
-        
    
-            
-                
-                
-                    
-                    
-                    
-                
-                
-                
-                {% for c in categories %}
+                 {% trans "Create a new category" %}
+            
+        {% else %}
+            
    
+                 {% trans "Create a new category" %}
+                
+            
    
+            
    
+                
    {% trans "Product categories" %}
    
+                    
-                        
-                        
-                        
+                        
+                        
+                        
-                {% endfor %}
-                
-            
    
                     
    
-                            {{ c.name }}
-                        
-                            
-                            
-                        
-                            
-                            
-                        {% trans "Product categories" %}
                     
    
-        
    
-        {% include "pretixcontrol/pagination.html" %}
-    {% endif %}
+                    
+                    
+                    {% for c in categories %}
+                        
+                            
+                                {{ c.name }}
+                            
+                            
+                                
+                                
+                            
+                            
+                                
+                                
+                            
+                        
+                    {% endfor %}
+                    
+                
+            
    
+            
    
+                {% include "pretixcontrol/pagination.html" %}
+            
    
+        {% endif %}
+    
    
 {% endblock %}
diff --git a/src/pretix/control/templates/pretixcontrol/items/category.html b/src/pretix/control/templates/pretixcontrol/items/category.html
index b2b9c16ec..b75effa25 100644
--- a/src/pretix/control/templates/pretixcontrol/items/category.html
+++ b/src/pretix/control/templates/pretixcontrol/items/category.html
@@ -3,20 +3,28 @@
 {% load bootstrap3 %}
 {% block title %}{% trans "Product category" %}{% endblock %}
 {% block inside %}
-	
    {% trans "Product category" %}
    
-	
    
-		{% csrf_token %}
+    
+        {% csrf_token %}
         {% bootstrap_form_errors form %}
         
    
             
    
-                
    
-                    {% trans "General information" %}
-                    {% bootstrap_field form.name layout="control" %}
-                    
    
-                        {% bootstrap_field form.internal_name layout="control" %}
+                
    
+                    
    
+                        {% trans "Product category" %}
+                    
    
+                    
    
+                        {% bootstrap_field form.name layout="control" %}
+                        
    
+                            {% bootstrap_field form.internal_name layout="control" %}
+                        
    
+                        {% bootstrap_field form.description layout="control" %}
+                        {% bootstrap_field form.is_addon layout="control" %}
+                    
    
+                    
    
+                        
                     
    
-                    {% bootstrap_field form.description layout="control" %}
-                    {% bootstrap_field form.is_addon layout="control" %}
                 
    
             
    
             {% if category %}
@@ -32,10 +40,5 @@
                 
    
             {% endif %}
         
    
-		
    
-            
-		
    
-	
    
+    
 {% endblock %}
diff --git a/src/pretix/control/templates/pretixcontrol/items/category_delete.html b/src/pretix/control/templates/pretixcontrol/items/category_delete.html
index eed8e3b7e..3b59cdaf2 100644
--- a/src/pretix/control/templates/pretixcontrol/items/category_delete.html
+++ b/src/pretix/control/templates/pretixcontrol/items/category_delete.html
@@ -3,19 +3,26 @@
 {% load bootstrap3 %}
 {% block title %}{% trans "Delete product category" %}{% endblock %}
 {% block inside %}
-	
    {% trans "Delete product category" %}
    
-	
    
-		{% csrf_token %}
-		
    {% blocktrans trimmed with name=category.name %}
-            Are you sure you want to delete the category {{ name }}?
-        {% endblocktrans %}
    
-		
    
-            
-                {% trans "Cancel" %}
-            
-            
-		
    
-	
    
+    
    
+        
    
+            
    {% trans "Delete product category" %}
    
+        
    
+        
    
+            
    
+                {% csrf_token %}
+                
    {% blocktrans trimmed with name=category.name %}
+                    Are you sure you want to delete the category {{ name }}?
+                {% endblocktrans %}
    
+                
    
+                    
+                        {% trans "Cancel" %}
+                    
+                    
+                
    
+            
    
+        
    
+    
    
 {% endblock %}
diff --git a/src/pretix/control/templates/pretixcontrol/items/index.html b/src/pretix/control/templates/pretixcontrol/items/index.html
index 8df1ac1ec..6a07c81ff 100644
--- a/src/pretix/control/templates/pretixcontrol/items/index.html
+++ b/src/pretix/control/templates/pretixcontrol/items/index.html
@@ -2,94 +2,101 @@
 {% load i18n %}
 {% block title %}{% trans "Products" %}{% endblock %}
 {% block inside %}
-    
    {% trans "Products" %}
    
-    
    
-        {% blocktrans trimmed %}
-            Below, you find a list of all available products. You can click on a product name to inspect and change
-            product details. You can also use the buttons on the right to change the order of products within a
-            give category.
-        {% endblocktrans %}
-    
    
-    {% if items|length == 0 %}
-        
    
-            
    
-                {% blocktrans trimmed %}
-                    You haven't created any products yet.
-                {% endblocktrans %}
-            
    
+    
    
+        
    
+            
    {% trans "Products" %}
    
+        
    
+        {% if items|length == 0 %}
+            
    
+                
    
+                    {% blocktrans trimmed %}
+                        You haven't created any products yet.
+                    {% endblocktrans %}
+                
    
 
-             {% trans "Create a new product" %}
-        
    
-    {% else %}
-        
    
-             {% trans "Create a new product" %}
-        
    
-        
    
-            
-                
-                
-                    
-                    
-                    
-                    
-                    
-                    
-                    
-                    
-                
-                
-                
-                {% regroup items by category as cat_list %}
-                {% for c in cat_list %}
-                    {% for i in c.list %}
-                        
-                            
+                
    {% trans "Product name" %}{% trans "Category" %}
    
-                                {% if not i.active %}{% endif %}
-                                 {% trans "Create a new product" %}
+            
+        {% else %}
+            
    
+                 {% trans "Create a new product" %}
+            
    
+            
    
+                
+                    
+                    
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                    
+                    
+                    
+                    {% regroup items by category as cat_list %}
+                    {% for c in cat_list %}
+                        {% for i in c.list %}
+                            
+                                
-                            
+                                
-                            
-                            
-                            
-                            
-                            
-                            
-                        
+                                    {% endif %}
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                            
+                        {% endfor %}
                     {% endfor %}
-                {% endfor %}
-                
-            
    {% trans "Product name" %}{% trans "Category" %}
    
+                                    {% if not i.active %}{% endif %}
+                                    {{ i }}
-                                {% if not i.active %}{% endif %}
-                            
-                            
-                                {% if i.available_from or i.available_until %}
-                                    
+                                    {% if not i.active %}{% endif %}
+                                
+                                
+                                    {% if i.available_from or i.available_until %}
+                                        
                                     
-                                {% endif %}
-                            
-                                {% if i.admission %}
-                                    
-                                {% endif %}
-                            
-                                {% if i.var_count %}
-                                    
-                                {% endif %}
-                            
-                                {% if i.hide_without_voucher %}
-                                    
-                                {% elif i.require_voucher %}
-                                    
-                                {% endif %}
-                            {% if i.category %}{{ i.category.name }}{% endif %}
-                                
-                                
-                            
-                                
-                                
-                            
    
+                                    {% if i.admission %}
+                                        
+                                    {% endif %}
+                                
+                                    {% if i.var_count %}
+                                        
+                                    {% endif %}
+                                
+                                    {% if i.hide_without_voucher %}
+                                        
+                                        {% elif i.require_voucher %}
+                                        
+                                    {% endif %}
+                                {% if i.category %}{{ i.category.name }}{% endif %}
+                                    
+                                    
+                                
+                                    
+                                    
+                                
    
-        
    
-        {% include "pretixcontrol/pagination.html" %}
-    {% endif %}
+                    
    
+            
    
+        {% endif %}
+    
    
 {% endblock %}
diff --git a/src/pretix/control/templates/pretixcontrol/items/question.html b/src/pretix/control/templates/pretixcontrol/items/question.html
index a27308f5f..1e9708622 100644
--- a/src/pretix/control/templates/pretixcontrol/items/question.html
+++ b/src/pretix/control/templates/pretixcontrol/items/question.html
@@ -5,84 +5,114 @@
 {% load formset_tags %}
 {% block title %}{% blocktrans with name=question.question %}Question: {{ name }}{% endblocktrans %}{% endblock %}
 {% block inside %}
-    
    
-        {% blocktrans with name=question.question %}Question: {{ name }}{% endblocktrans %}
-        
-            
-            {% trans "Edit question" %}
-        
-    
    
-    
    
-        
    
-            
-            
-            
-        
    
-    
    
+    
    
+        
    
+            
+                
+                {% trans "Edit question" %}
+            
+            
    
+                {% blocktrans with name=question.question %}Question: {{ name }}{% endblocktrans %}
+            
    
+        
    
+        
    
+            
    
+                
    
+                    
+                    
+                    
+                
    
+            
    
+        
    
+    
    
     
    
         {% if not stats %}
-            
    
-                
    
-                    {% blocktrans trimmed %}
-                        No matching answers found.
-                    {% endblocktrans %}
-                
    
-                {% if not items %}
-                    
    
-                        {% trans "You need to assign the question to a product to collect answers." %}
-                    
    
+            
    
+                
    
+                    
    
+                        
    
+                            {% blocktrans trimmed %}
+                                No matching answers found.
+                            {% endblocktrans %}
+                        
    
+                        {% if not items %}
+                            
    
+                                {% trans "You need to assign the question to a product to collect answers." %}
+                            
    
 
-                     {% trans "Edit question" %}
-                {% endif %}
+                             {% trans "Edit question" %}
+                        {% endif %}
+                    
    
+                
    
             
    
         {% else %}
             
    
-                
    
+                
    
+                    
    
+                        
    
 
+                        
    
+                        
+                    
    
                 
    
-                
             
    
             
    
-                
-                    
-                    
-                        
-                        
-                    
-                    
-                    
-                    {% for stat in stats %}
+                
    
+                    
    {% trans "Answer" %}{% trans "Count" %}
    
+                        
-                            
-                            
+                            
+                            
-                    {% endfor %}
-                    
-                
    
                         
    
-                                
-                                    {{ stat.answer }}
-                                
-                            {{ stat.count }}{% trans "Answer" %}{% trans "Count" %}
                         
    
+                        
+                        
+                        {% for stat in stats %}
+                            
+                                
+                                    
+                                        {{ stat.answer }}
+                                    
+                                
+                                {{ stat.count }}
+                            
+                        {% endfor %}
+                        
+                    
+                
    
             
    
         {% endif %}
         
    
diff --git a/src/pretix/control/templates/pretixcontrol/items/question_delete.html b/src/pretix/control/templates/pretixcontrol/items/question_delete.html
index 36aaf3e88..88f7440f1 100644
--- a/src/pretix/control/templates/pretixcontrol/items/question_delete.html
+++ b/src/pretix/control/templates/pretixcontrol/items/question_delete.html
@@ -3,23 +3,36 @@
 {% load bootstrap3 %}
 {% block title %}{% trans "Delete question" %}{% endblock %}
 {% block inside %}
-	
    {% trans "Delete question" %}
    
-	
    
-		{% csrf_token %}
-		
    {% blocktrans %}Are you sure you want to delete the question {{ question }}?{% endblocktrans %}
    
-		{% if dependent|length > 0 %}
-			
    {% blocktrans %}All answers to the question given by the buyers of the following products will be lost.{% endblocktrans %}
    
-			{% for item in dependent %}
-				
  • {{ item.name }}
    • 
-			{% endfor %}
-		{% endif %}
-		
    
-            
-                {% trans "Cancel" %}
-            
-            
-		
    
-	
    
+    
    
+        
    
+            
    {% trans "Delete question" %}
    
+        
    
+        
    
+            
    
+                {% csrf_token %}
+                
    {% blocktrans %}Are you sure you want to delete the question {{ question }}
+                    ?{% endblocktrans %}
    
+                {% if dependent|length > 0 %}
+                    
    {% blocktrans %}All answers to the question given by the buyers of the following products will be
+                        lost.{% endblocktrans %}
    
+                    
+                {% endif %}
+                
    
+                    
+                        {% trans "Cancel" %}
+                    
+                    
+                
    
+            
    
+        
    
+    
    
 {% endblock %}
diff --git a/src/pretix/control/templates/pretixcontrol/items/question_edit.html b/src/pretix/control/templates/pretixcontrol/items/question_edit.html
index 6b8e08586..343597198 100644
--- a/src/pretix/control/templates/pretixcontrol/items/question_edit.html
+++ b/src/pretix/control/templates/pretixcontrol/items/question_edit.html
@@ -10,26 +10,34 @@
     {% endif %}
 {% endblock %}
 {% block inside %}
-    {% if question %}
-        
    {% blocktrans with name=question.question %}Question: {{ name }}{% endblocktrans %}
    
-    {% else %}
-        
    {% trans "Question" %}
    
-    {% endif %}
     
    
         {% csrf_token %}
         {% bootstrap_form_errors form %}
-        
    
-            {% trans "General information" %}
-            {% bootstrap_field form.question layout="control" %}
-            {% bootstrap_field form.help_text layout="control" %}
-            {% bootstrap_field form.type layout="control" %}
-            {% bootstrap_field form.identifier layout="control" %}
-            {% bootstrap_field form.ask_during_checkin layout="control" %}
-            {% bootstrap_field form.required layout="control" %}
+        
    
+            
    
+                {% if question %}
+                    
    {% blocktrans with name=question.question %}Question:
+                        {{ name }}{% endblocktrans %}
    
+                {% else %}
+                    
    {% trans "Question" %}
    
+                {% endif %}
+            
    
+            
    
+                {% bootstrap_field form.question layout="control" %}
+                {% bootstrap_field form.help_text layout="control" %}
+                {% bootstrap_field form.type layout="control" %}
+                {% bootstrap_field form.identifier layout="control" %}
+                {% bootstrap_field form.ask_during_checkin layout="control" %}
+                {% bootstrap_field form.required layout="control" %}
+            
    
         
    
-        
    
-            {% trans "Apply to products" %}
-            {% bootstrap_field form.items layout="control" %}
+        
    
+            
    
+                {% trans "Apply to products" %}
+            
    
+            
    
+                {% bootstrap_field form.items layout="control" %}
+            
    
         
    
         
    
             {% blocktrans trimmed %}
@@ -37,77 +45,81 @@
                 accepted. If you want to allow both options, do not make this field required.
             {% endblocktrans %}
         
    
-        
    
-            {% trans "Answer options" %}
-            
-            
    
-                {{ formset.management_form }}
-                {% bootstrap_formset_errors formset %}
-                
    
-                    {% for form in formset %}
-                        
    
-                            
    
-                                {{ form.id }}
-                                {% bootstrap_field form.DELETE form_group_class="" layout="inline" %}
-                                {% bootstrap_field form.ORDER form_group_class="" layout="inline" %}
-                            
    
-                            
    
-                                
    
+        
    
+            
    
+                {% trans "Answer options" %}
+            
    
+            
    
+                
+                
    
+                    {{ formset.management_form }}
+                    {% bootstrap_formset_errors formset %}
+                    
    
+                        {% for form in formset %}
+                            
    
+                                
    
+                                    {{ form.id }}
+                                    {% bootstrap_field form.DELETE form_group_class="" layout="inline" %}
+                                    {% bootstrap_field form.ORDER form_group_class="" layout="inline" %}
+                                
    
+                                
    
+                                    
    
                                     
                                         {% blocktrans trimmed with id=form.instance.identifier %}
                                             Answer option {{ id }}
                                         {% endblocktrans %}
                                     
-                                    {% bootstrap_form_errors form %}
-                                    {% bootstrap_field form.answer layout='inline' form_group_class="" %}
-                                
    
-                                
    
-                                     
    
-                                    
-                                    
-                                    
+                                        {% bootstrap_form_errors form %}
+                                        {% bootstrap_field form.answer layout='inline' form_group_class="" %}
+                                    
    
+                                    
    
+                                         
    
+                                        
+                                        
+                                        
+                                    
    
                                 
    
                             
    
-                        
    
-                    {% endfor %}
-                
    
-                
-                
    
-                    
-                
    
+                        {% endescapescript %}
+                    
+                    
    
+                        
+                    
    
+                
    
             
    
         
    
         
    
diff --git a/src/pretix/control/templates/pretixcontrol/items/questions.html b/src/pretix/control/templates/pretixcontrol/items/questions.html
index 035b0882c..502aa7939 100644
--- a/src/pretix/control/templates/pretixcontrol/items/questions.html
+++ b/src/pretix/control/templates/pretixcontrol/items/questions.html
@@ -2,74 +2,89 @@
 {% load i18n %}
 {% block title %}{% trans "Questions" %}{% endblock %}
 {% block inside %}
-    
    {% trans "Questions" %}
    
-    
    
-        {% blocktrans trimmed %}
-            Questions allow your attendees to fill in additional data about their ticket. If you provide food, one
-            example might be to ask your users about dietary requirements.
-        {% endblocktrans %}
-    
    
-    {% if questions|length == 0 %}
-        
    
-            
    
-                {% blocktrans trimmed %}
-                    You haven't created any questions yet.
-                {% endblocktrans %}
-            
    
+    
    
+        
    
+            
    {% trans "Questions" %}
    
+        
    
+        
    
+            {% blocktrans trimmed %}
+                Questions allow your attendees to fill in additional data about their ticket. If you provide food, one
+                example might be to ask your users about dietary requirements.
+            {% endblocktrans %}
+        
    
+        {% if questions|length == 0 %}
+            
    
+                
    
+                    {% blocktrans trimmed %}
+                        You haven't created any questions yet.
+                    {% endblocktrans %}
+                
    
 
-             {% trans "Create a new question" %}
-        
    
-    {% else %}
-        
    
-             {% trans "Create a new question" %}
-            
-        
    
-        
    
-            
-                
-                
-                    
-                    
-                    
-                    
-                    
-                
-                
-                
-                {% for q in questions %}
+                 {% trans "Create a new question" %}
+            
+        {% else %}
+            
    
+                 {% trans "Create a new question" %}
+                
+            
    
+            
    
+                
    {% trans "Question" %}{% trans "Type" %}{% trans "Products" %}
    
+                    
-                        
-                        
-                        
-                        
-                        
+                        
+                        
+                        
+                        
+                        
-                {% endfor %}
-                
-            
    
                     
    {{ q.question }}
-                        
-                            {{ q.get_type_display }}
-                            {% if q.required %}
-                                
-                                
-                            {% endif %}
-                        
-                            
      
-                                {% for item in q.items.all %}
-                                    
    • {{ item }}
      • 
-                                {% endfor %}
-                            
    
-                            		
-                            
-                            
-                        
-                            
-                            
-                        {% trans "Question" %}{% trans "Type" %}{% trans "Products" %}
                     
    
-        
    
-        {% include "pretixcontrol/pagination.html" %}
-    {% endif %}
+                    
+                    
+                    {% for q in questions %}
+                        
+                            {{ q.question }}
+                            
+                            
+                                {{ q.get_type_display }}
+                                {% if q.required %}
+                                    
+                                
+                                {% endif %}
+                            
+                            
+                                
      
+                                    {% for item in q.items.all %}
+                                        
    • 
+                                            {{ item }}
+                                        
      • 
+                                    {% endfor %}
+                                
    
+                            
+                            
+                                
+                                
+                            
+                            
+                                
+                                
+                            
+                        
+                    {% endfor %}
+                    
+                
+            
    
+            
    
+                {% include "pretixcontrol/pagination.html" %}
+            
    
+        {% endif %}
+    
    
 {% endblock %}
diff --git a/src/pretix/control/templates/pretixcontrol/items/quota.html b/src/pretix/control/templates/pretixcontrol/items/quota.html
index 251b710df..33c6408ff 100644
--- a/src/pretix/control/templates/pretixcontrol/items/quota.html
+++ b/src/pretix/control/templates/pretixcontrol/items/quota.html
@@ -5,16 +5,21 @@
 {% load eventsignal %}
 {% block title %}{% blocktrans with name=quota.name %}Quota: {{ name }}{% endblocktrans %}{% endblock %}
 {% block inside %}
-    
    
-        {% blocktrans with name=quota.name %}Quota: {{ name }}{% endblocktrans %}
-        {% if 'can_change_items' in request.eventpermset %}
-            
-                
-                {% trans "Edit quota" %}
-            
-        {% endif %}
-    
    
+    
    
+        
    
+            {% 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 }}
@@ -22,48 +27,60 @@
     {% endif %}
     
    
         
    
-            {% trans "Usage overview" %}
-            
    
+            
    
+                
    
+                    {% trans "Usage overview" %}
+                
    
+                
    
+                    
    
 
+                    
    
+                    
+                
    
             
    
-            
         
    
         
    
-            {% trans "Availability calculation" %}
+            
    
+                
    
+                    {% trans "Availability calculation" %}
+                
    
+                
    
 
-            
    
-                
    {% trans "Total quota" %}
    
-                
    
-                    {% if quota.size == None %}{% trans "Infinite" %}{% else %}{{ quota.size }}{% 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 %}
                 
    
             
    
-            {% 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 %}
         
    
         
    
             
    
diff --git a/src/pretix/control/templates/pretixcontrol/items/quota_delete.html b/src/pretix/control/templates/pretixcontrol/items/quota_delete.html
index 2b8175f0b..f48f08069 100644
--- a/src/pretix/control/templates/pretixcontrol/items/quota_delete.html
+++ b/src/pretix/control/templates/pretixcontrol/items/quota_delete.html
@@ -3,23 +3,36 @@
 {% load bootstrap3 %}
 {% block title %}{% trans "Delete quota" %}{% endblock %}
 {% block inside %}
-	
    {% trans "Delete quota" %}
    
-	
-		{% csrf_token %}
-		
    {% blocktrans %}Are you sure you want to delete the quota {{ quota }}?{% endblocktrans %}
    
-		{% if dependent|length > 0 %}
-			
    {% blocktrans %}The following products might be no longer available for sale:{% endblocktrans %}
    
-			{% for item in dependent %}
-				
  • {{ item.name }}
    • 
-			{% endfor %}
-		{% endif %}
-		
    
-            
-                {% trans "Cancel" %}
-            
-            
-		
    
-	
+    
    
+        
    
+            
    {% trans "Delete quota" %}
    
+        
    
+        
    
+            
    
+                {% csrf_token %}
+                
    {% blocktrans %}Are you sure you want to delete the quota {{ quota }}
+                    ?{% endblocktrans %}
    
+                {% if dependent|length > 0 %}
+                    
    {% blocktrans %}The following products might be no longer available for
+                        sale:{% endblocktrans %}
    
+                    
+                {% endif %}
+                
    
+                    
+                        {% trans "Cancel" %}
+                    
+                    
+                
    
+            
    
+        
    
+    
    
 {% endblock %}
diff --git a/src/pretix/control/templates/pretixcontrol/items/quota_edit.html b/src/pretix/control/templates/pretixcontrol/items/quota_edit.html
index 787cd6653..57f3ad650 100644
--- a/src/pretix/control/templates/pretixcontrol/items/quota_edit.html
+++ b/src/pretix/control/templates/pretixcontrol/items/quota_edit.html
@@ -9,36 +9,37 @@
     {% endif %}
 {% endblock %}
 {% block inside %}
-    {% if question %}
-        
    {% blocktrans with name=quota.name %}Quota: {{ name }}{% endblocktrans %}
    
-    {% else %}
-        
    {% trans "Quota" %}
    
-    {% endif %}
-    
    
-        {% csrf_token %}
-        {% bootstrap_form_errors form %}
-        
    
-            {% trans "General information" %}
-            {% bootstrap_field form.name layout="control" %}
-            {% bootstrap_field form.size layout="control" %}
-            {% if form.subevent %}
-                {% bootstrap_field form.subevent layout="control" %}
+    
    
+        
    
+            {% if quota %}
+                
    {% blocktrans with name=quota.name %}Quota: {{ name }}{% endblocktrans %}
    
+            {% else %}
+                
    {% trans "Quota" %}
    
             {% endif %}
-            {% trans "Items" %}
-            
    
-                {% blocktrans trimmed %}
-                    Please select the products or product variations this quota should be applied to. If you apply two
-                    quotas to the same product, it will only be available if
-                    both quotas have capacity
-                    left.
-                {% endblocktrans %}
-            
    
-            {% bootstrap_field form.itemvars layout="control" %}
-        
    
-        
    
-            
         
    
-    
    
+        
    
+            {% csrf_token %}
+            {% bootstrap_form_errors form %}
+            
    
+                {% bootstrap_field form.name layout="control" %}
+                {% bootstrap_field form.size layout="control" %}
+                {% if form.subevent %}
+                    {% bootstrap_field form.subevent layout="control" %}
+                {% endif %}
+                {% bootstrap_field form.itemvars layout="control" %}
+                
    
+                    {% blocktrans trimmed %}
+                        Please select the products or product variations this quota should be applied to. If you apply
+                        two quotas to the same product, it will only be available if both quotas have capacity
+                        left.
+                    {% endblocktrans %}
+                
    
+            
    
+            
    
+                
+            
    
+        
    
+    
    
 {% endblock %}
diff --git a/src/pretix/control/templates/pretixcontrol/items/quotas.html b/src/pretix/control/templates/pretixcontrol/items/quotas.html
index 52c74722b..c776af262 100644
--- a/src/pretix/control/templates/pretixcontrol/items/quotas.html
+++ b/src/pretix/control/templates/pretixcontrol/items/quotas.html
@@ -2,82 +2,93 @@
 {% load i18n %}
 {% block title %}{% trans "Quotas" %}{% endblock %}
 {% block inside %}
-    
    {% trans "Quotas" %}
    
-    
    
-        {% blocktrans trimmed %}
-            To make your products actually available, you also need quotas. Quotas define, how many instances of
-            your product pretix will sell. This way, you can configure whether your event can take an unlimited
-            number of attendees or the number of attendees is limited. You can assign a product to multiple quotas
-            to fulfil more complex requirements, e.g. if you want to limit the total number of tickets sold and the
-            number of a specific ticket type at the same time.
-        {% endblocktrans %}
-    
    
-    {% if request.event.has_subevents %}
-        
    
-            {% include "pretixcontrol/event/fragment_subevent_choice_simple.html" %}
-        
    
-    {% endif %}
-    {% if quotas|length == 0 %}
-        
    
-            
    
-                {% if request.GET.subevent %}
-                    {% trans "Your search did not match any quotas." %}
-                {% else %}
-                    {% blocktrans trimmed %}
-                        You haven't created any quotas yet.
-                    {% endblocktrans %}
-                {% endif %}
-            
    
-
-             {% trans "Create a new quota" %}
+    
    
+        
    
+            
    {% trans "Quotas" %}
    
         
    
-    {% else %}
-        
    
-             {% trans "Create a new quota" %}
-            
-        
    
-        
    
-            
-                
-                
-                    
-                    
-                    {% if request.event.has_subevents %}
-                        
+        
    
+            {% blocktrans trimmed %}
+                To make your products actually available, you also need quotas. Quotas define, how many instances of
+                your product pretix will sell. This way, you can configure whether your event can take an unlimited
+                number of attendees or the number of attendees is limited. You can assign a product to multiple quotas
+                to fulfil more complex requirements, e.g. if you want to limit the total number of tickets sold and the
+                number of a specific ticket type at the same time.
+            {% endblocktrans %}
+        
    
+        {% if request.event.has_subevents %}
+            
+                {% include "pretixcontrol/event/fragment_subevent_choice_simple.html" %}
+            
+        {% endif %}
+        {% if quotas|length == 0 %}
+            
    
+                
    
+                    {% if request.GET.subevent %}
+                        {% trans "Your search did not match any quotas." %}
+                    {% else %}
+                        {% blocktrans trimmed %}
+                            You haven't created any quotas yet.
+                        {% endblocktrans %}
                     {% endif %}
-                    
    
-                    
-                    
-                
-                
-                
-                {% for q in quotas %}
+                
    
+
+                 {% trans "Create a new quota" %}
+            
+        {% else %}
+            
    
+                 {% trans "Create a new quota" %}
+                
+            
    
+            
    
+                
    {% trans "Quota name" %}{% trans "Products" %}{% trans "Date" context "subevent" %}
    {% trans "Total capacity" %}{% trans "Capacity left" %}
    
+                    
-                        
-                        
+                        
+                        
                         {% if request.event.has_subevents %}
-                            
+                            
                         {% endif %}
-                        
-                        
-                        
+                        
+                        
+                        
-                {% endfor %}
-                
-            
    
                     
    
-                            {{ q.name }}
-                        
-                            
      
-                                {% for item in q.items.all %}
-                                    
    • {{ item }}
      • 
-                                {% endfor %}
-                            
    
-                            		{% trans "Quota name" %}{% trans "Products" %}{{ q.subevent.name }} – {{ q.subevent.get_date_range_display }}{% trans "Date" context "subevent" %}{% if q.size == None %}Unlimited{% else %}{{ q.size }}{% endif %}{% include "pretixcontrol/items/fragment_quota_availability.html" with availability=q.availability %}
-                            
-                            
-                        {% trans "Total capacity" %}{% trans "Capacity left" %}
                     
    
-        
    
-    {% endif %}
-    {% include "pretixcontrol/pagination.html" %}
+                    
+                    
+                    {% for q in quotas %}
+                        
+                            
+                                {{ q.name }}
+                            
+                            
+                                
      
+                                    {% for item in q.items.all %}
+                                        
    • 
+                                            {{ item }}
+                                        
      • 
+                                    {% endfor %}
+                                
    
+                            
+                            {% if request.event.has_subevents %}
+                                {{ q.subevent.name }} – {{ q.subevent.get_date_range_display }}
+                            {% endif %}
+                            {% if q.size == None %}Unlimited{% else %}{{ q.size }}{% endif %}
+                            {% include "pretixcontrol/items/fragment_quota_availability.html" with availability=q.availability %}
+                            
+                                
+                                
+                            
+                        
+                    {% endfor %}
+                    
+                
+            
    
+            
    
+                {% include "pretixcontrol/pagination.html" %}
+            
    
+        {% endif %}
+    
    
 {% endblock %}
diff --git a/src/pretix/control/templates/pretixcontrol/pagination.html b/src/pretix/control/templates/pretixcontrol/pagination.html
index 3e77cae63..a71f4774f 100644
--- a/src/pretix/control/templates/pretixcontrol/pagination.html
+++ b/src/pretix/control/templates/pretixcontrol/pagination.html
@@ -1,8 +1,8 @@
 {% load i18n %}
 {% load urlreplace %}
 
diff --git a/src/pretix/control/templates/pretixcontrol/shredder/download.html b/src/pretix/control/templates/pretixcontrol/shredder/download.html
index d3bd0b282..115eb7b59 100644
--- a/src/pretix/control/templates/pretixcontrol/shredder/download.html
+++ b/src/pretix/control/templates/pretixcontrol/shredder/download.html
@@ -4,48 +4,57 @@
 {% load order_overview %}
 {% block title %}{% trans "Data shredder" %}{% endblock %}
 {% block content %}
-    
    
-        {% trans "Data shredder" %}
-    
    
     
    
         {% csrf_token %}
-        
    
-            {% trans "Step 1: Download data" %}
-            
    
-                {% blocktrans trimmed %}
-                    You are about to permamanently delete data from the server, even though you might be required to
-                    keep
-                    some of this data on file. You should therefore download the following file and store it in a safe
-                    place:
-                {% endblocktrans %}
-            
    
-            
    
-                
-                    {% trans "Download data" %}
-                
-            
    
+        
    
+            
    
+                {% trans "Step 1: Download data" %}
+            
    
+            
    
+                
    
+                    {% blocktrans trimmed %}
+                        You are about to permamanently delete data from the server, even though you might be required to
+                        keep some of this data on file. You should therefore download the following file and store it in a
+                        safe place:
+                    {% endblocktrans %}
+                
    
+                
    
+                    
+                        {% trans "Download data" %}
+                    
+                
    
+            
    
         
    
-        
    
-            {% trans "Step 2: Confirm download" %}
-            
    
-                {% blocktrans trimmed %}
-                    In the downloaded file, there is a text file named "CONFIRM_CODE.txt" with a six-character code.
-                    Please enter this code here to confirm that you successfully downloaded the file.
-                {% endblocktrans %}
-            
    
-            
-            
    
+        
    
+            
    
+                {% trans "Step 2: Confirm download" %}
+            
    
+            
    
+                
    
+                    {% blocktrans trimmed %}
+                        In the downloaded file, there is a text file named "CONFIRM_CODE.txt" with a six-character code.
+                        Please enter this code here to confirm that you successfully downloaded the file.
+                    {% endblocktrans %}
+                
    
+                
+                
    
         
    
-        
    
-            {% trans "Step 3: Confirm deletion" %}
-            
    
-                {% blocktrans trimmed with event=request.event.name %}
-                Please re-check that you are fully certain that you want to delete the selected categories of data from the event {{ event }}.
-                    In this case, please enter your user password here:
-                {% endblocktrans %}
-            
    
-            
+        
    
+            
    
+                {% trans "Step 3: Confirm deletion" %}
+            
    
+            
    
+                
    
+                    {% blocktrans trimmed with event=request.event.name %}
+                        Please re-check that you are fully certain that you want to delete the selected categories of
+                        data from the event {{ event }}.
+                        In this case, please enter your user password here:
+                    {% endblocktrans %}
+                
    
+                
         
    
         
         
    
diff --git a/src/pretix/control/templates/pretixcontrol/shredder/index.html b/src/pretix/control/templates/pretixcontrol/shredder/index.html
index 90c32550e..c6259337e 100644
--- a/src/pretix/control/templates/pretixcontrol/shredder/index.html
+++ b/src/pretix/control/templates/pretixcontrol/shredder/index.html
@@ -4,37 +4,44 @@
 {% load order_overview %}
 {% block title %}{% trans "Data shredder" %}{% endblock %}
 {% block content %}
-    
    
-        {% trans "Data shredder" %}
-    
    
-    
    
-        {% blocktrans trimmed %}
-            This feature allows you to remove personal data from this event. You will first select what kind of data
-            you want to shred, then you are able to download the affected data and after you confirmed the download,
-            the data will be removed from the server's database. The data might still exist in backups for a limited
-            period of time.
-        {% endblocktrans %}
-        
-            {% blocktrans trimmed %}
-                Using this will not remove the orders for your event, it just scrubs them of data that can be linked
-                to individual persons.
-            {% endblocktrans %}
-        
-    
    
-    
    
-        
-            {% blocktrans trimmed %}
-                It is within your own responsibility to check if you are allowed to delete the affected data in your
-                legislation, e.g. for reasons of taxation. In many countries, you need to keep some data in the live
-                system in case of an audit.
-            {% endblocktrans %}
-        
-        {% blocktrans trimmed %}
-            For most categories of data, you will be able to partially download the data to store it offline. Some
-            kinds of data (such as some payment information) as well as historical log data cannot be downloaded at
-            the moment.
-        {% endblocktrans %}
-        
    
+    
    
+        
    
+            
    
+                {% trans "Data shredder" %}
+            
    
+        
    
+        
    
+
+            
    
+                {% blocktrans trimmed %}
+                    This feature allows you to remove personal data from this event. You will first select what kind of
+                    data you want to shred, then you are able to download the affected data and after you confirmed the
+                    download, the data will be removed from the server's database. The data might still exist in backups for a
+                    limited period of time.
+                {% endblocktrans %}
+                
+                    {% blocktrans trimmed %}
+                        Using this will not remove the orders for your event, it just scrubs them of data that can be
+                        linked to individual persons.
+                    {% endblocktrans %}
+                
+            
    
+            
    
+                
+                    {% blocktrans trimmed %}
+                        It is within your own responsibility to check if you are allowed to delete the affected data in
+                        your legislation, e.g. for reasons of taxation. In many countries, you need to keep some data in the
+                        live system in case of an audit.
+                    {% endblocktrans %}
+                
+                {% blocktrans trimmed %}
+                    For most categories of data, you will be able to partially download the data to store it offline.
+                    Some kinds of data (such as some payment information) as well as historical log data cannot be downloaded
+                    at the moment.
+                {% endblocktrans %}
+                
    
+            
    
+        
    
     
    
     {% if constraints %}
         
    
@@ -42,10 +49,9 @@
         
    
     {% else %}
         
-            {% trans "Data selection" %}
+              method="post" class="form-horizontal" data-asynctask>
             {% csrf_token %}
-            
    
+            
    
                 {% for ident, shredder in shredders.items %}