diff --git a/src/pretix/control/templates/pretixcontrol/checkin/index.html b/src/pretix/control/templates/pretixcontrol/checkin/index.html index 032b1c07dd..96629e4fa6 100644 --- a/src/pretix/control/templates/pretixcontrol/checkin/index.html +++ b/src/pretix/control/templates/pretixcontrol/checkin/index.html @@ -7,73 +7,93 @@ {% blocktrans with name=checkinlist.name %}Check-in list: {{ name }}{% endblocktrans %} {% endblock %} {% block content %} -

- {% blocktrans with name=checkinlist.name %}Check-in list: {{ name }}{% endblocktrans %} - {% if 'can_change_event_settings' in request.eventpermset %} - - - {% trans "Edit list" %} - - {% endif %} - - - {% trans "PDF" %} - - - - {% trans "CSV" %} - -

-
-
- {% bootstrap_field filter_form.user layout='inline' %} +
+
+
+ + + {% trans "PDF" %} + + + + {% trans "CSV" %} + + {% if 'can_change_event_settings' in request.eventpermset %} + + + {% trans "Edit list" %} + + {% endif %} +
+

+ {% blocktrans with name=checkinlist.name %}Check-in list: {{ name }}{% endblocktrans %} +

-
- {% bootstrap_field filter_form.status layout='inline' %} -
-
- {% bootstrap_field filter_form.item layout='inline' %} -
-
- -
- - {% if entries|length == 0 %} -
-

- {% blocktrans trimmed %} - No attendee record was found. - {% endblocktrans %} -

-
- {% else %} -
- {% csrf_token %} -
+ +
+
+ {% if entries|length == 0 %} +
+

+ {% blocktrans trimmed %} + No attendee record was found. + {% endblocktrans %} +

+
+ {% else %} +
+ {% csrf_token %} - - - - - - + + + + + + @@ -81,11 +101,13 @@
{% trans "Order code" %} - {% trans "Item" %} - {% trans "Email" %} - {% trans "Name" %} - {% trans "Status" %} - {% trans "Timestamp" %} - {% trans "Order code" %} + + + + {% trans "Item" %} + + + + {% trans "Email" %} + + + + {% trans "Name" %} + + + + {% trans "Status" %} + + + {% trans "Timestamp" %} + + +
{% if "can_change_orders" in request.eventpermset %} - + {% endif %} - {{ e.order.code }} + {{ e.order.code }} {% if e.order.status == "n" %} {% trans "unpaid" %} {% endif %} @@ -115,13 +137,17 @@ {% endfor %}
+ {% if "can_change_orders" in request.eventpermset %} +
+ +
+ {% endif %} +
+
+ {% include "pretixcontrol/pagination.html" %}
- {% if "can_change_orders" in request.eventpermset %} - - {% endif %} - - {% include "pretixcontrol/pagination.html" %} - {% endif %} + {% endif %} +
{% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/checkin/list_delete.html b/src/pretix/control/templates/pretixcontrol/checkin/list_delete.html index 99a023cbe1..6ebbce0db7 100644 --- a/src/pretix/control/templates/pretixcontrol/checkin/list_delete.html +++ b/src/pretix/control/templates/pretixcontrol/checkin/list_delete.html @@ -3,23 +3,29 @@ {% load bootstrap3 %} {% block title %}{% trans "Delete check-in list" %}{% endblock %} {% block inside %} -

{% trans "Delete check-in list" %}

-
- {% csrf_token %} -

{% blocktrans with name=checkinlist.name %}Are you sure you want to delete the check-in list {{ name }}?{% endblocktrans %}

- {% if checkinlist.checkins.exists > 0 %} -

{% blocktrans trimmed with num=checkinlist.checkins.count %} - This will delete the information of {{ num }} check-ins as well. - {% endblocktrans %}

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

{% trans "Delete check-in list" %}

+
+
+
+ {% csrf_token %} +

{% blocktrans with name=checkinlist.name %}Are you sure you want to delete the check-in list {{ name }}?{% endblocktrans %}

+ {% if checkinlist.checkins.exists > 0 %} +

{% blocktrans trimmed with num=checkinlist.checkins.count %} + This will delete the information of {{ num }} check-ins as well. + {% endblocktrans %}

+ {% endif %} +
+ + {% trans "Cancel" %} + + +
+
+
+
{% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/checkin/list_edit.html b/src/pretix/control/templates/pretixcontrol/checkin/list_edit.html index 15d31d7492..642f5625b6 100644 --- a/src/pretix/control/templates/pretixcontrol/checkin/list_edit.html +++ b/src/pretix/control/templates/pretixcontrol/checkin/list_edit.html @@ -9,29 +9,38 @@ {% endif %} {% endblock %} {% block inside %} - {% if checkinlist %} -

{% blocktrans with name=checkinlist.name %}Check-in list: {{ name }}{% endblocktrans %}

- {% else %} -

{% trans "Check-in list" %}

- {% endif %}
{% csrf_token %} {% bootstrap_form_errors form %} -
- {% trans "General information" %} - {% bootstrap_field form.name layout="control" %} - {% if form.subevent %} - {% bootstrap_field form.subevent layout="control" %} - {% endif %} - {% bootstrap_field form.include_pending layout="control" %} - {% trans "Products" %} -

- {% blocktrans trimmed %} - Please select the products that should be part of this check-in list. - {% endblocktrans %} -

- {% bootstrap_field form.all_products layout="control" %} - {% bootstrap_field form.limit_products layout="control" %} +
+
+ {% if checkinlist %} +

{% blocktrans with name=checkinlist.name %}Check-in list: {{ name }}{% endblocktrans %}

+ {% else %} +

{% trans "Check-in list" %}

+ {% endif %} +
+
+ {% bootstrap_field form.name layout="control" %} + {% if form.subevent %} + {% bootstrap_field form.subevent layout="control" %} + {% endif %} + {% bootstrap_field form.include_pending layout="control" %} +
+
+
+
+ {% trans "Products" %} +
+
+

+ {% blocktrans trimmed %} + Please select the products that should be part of this check-in list. + {% endblocktrans %} +

+ {% bootstrap_field form.all_products layout="control" %} + {% bootstrap_field form.limit_products layout="control" %} +
-
- - {% else %} -

- {% trans "Your ticket shop is currently not live. It is thus only visible to you and your team, not to any visitors." %} -

- {% if issues|length > 0 %} -
+
+
+

{% trans "Shop status" %}

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

- {% trans "To publish your ticket shop, you first need to resolve the following issues:" %} + {% trans "Your shop is currently live. If you take it down, it will only be visible to you and your team." %}

-
    - {% for issue in issues %} -
  • {{ issue|safe }}
    • - {% endfor %} -
-
- {% else %} -

- {% trans "If you want to, you can publish your ticket shop now." %} -

-
- {% csrf_token %} - + + {% csrf_token %} + -
- -
-
- {% endif %} - {% endif %} +
+ +
+ + {% else %} +

+ {% trans "Your ticket shop is currently not live. It is thus only visible to you and your team, not to any visitors." %} +

+ {% if issues|length > 0 %} +
+

+ {% trans "To publish your ticket shop, you first need to resolve the following issues:" %} +

+
    + {% for issue in issues %} +
  • {{ issue|safe }}
    • + {% endfor %} +
+
+ {% else %} +

+ {% trans "If you want to, you can publish your ticket shop now." %} +

+
+ {% csrf_token %} + + +
+ +
+
+ {% endif %} + {% endif %} +
+
{% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/event/logs.html b/src/pretix/control/templates/pretixcontrol/event/logs.html index 3c8555b661..a704bce312 100644 --- a/src/pretix/control/templates/pretixcontrol/event/logs.html +++ b/src/pretix/control/templates/pretixcontrol/event/logs.html @@ -3,9 +3,11 @@ {% load staticfiles %} {% block title %}{% trans "Event logs" %}{% endblock %} {% block inside %} -

{% trans "Event logs" %}

-
-

+

+
+

{% trans "Event logs" %}

+
+ -

- -
    - {% for log in logs %} -
  • -
    -
    - {{ log.datetime|date:"SHORT_DATETIME_FORMAT" }} - {% if log.shredded %} - - - {% endif %} -
    -
    - {% if log.user %} - {% if log.user.is_staff %} - +
      + {% for log in logs %} +
    • +
      +
      + {{ log.datetime|date:"SHORT_DATETIME_FORMAT" }} + {% if log.shredded %} + + title="{% trans "Personal data was cleared from this log entry." %}"> + + {% endif %} +
      +
      + {% if log.user %} + {% if log.user.is_staff %} + - {% else %} - + {% else %} + + {% endif %} + {{ log.user.get_full_name }} + {% if log.oauth_application %} +
      + {{ log.oauth_application.name }} + {% endif %} + {% elif log.api_token %} + + {{ log.api_token.name }} {% endif %} - {{ log.user.get_full_name }} - {% if log.oauth_application %} -
      - {{ log.oauth_application.name }} +
      +
      + {% if log.display_object %} + {{ log.display_object|safe }} {% endif %} - {% elif log.api_token %} - - {{ log.api_token.name }} - {% endif %} -
      -
      - {% if log.display_object %} - {{ log.display_object|safe }} - {% endif %} -
      -
      - {{ log.display }} +
      +
      + {{ log.display }} +
      +
      • + {% empty %} +
      + {% trans "No results" %}
      - - {% empty %} -
      - {% trans "No results" %} -
      - {% endfor %} -
    - {% include "pretixcontrol/pagination.html" %} + {% endfor %} +
+
+ {% include "pretixcontrol/pagination.html" %} +
+
{% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/items/questions.html b/src/pretix/control/templates/pretixcontrol/items/questions.html index 502aa7939d..f004fef875 100644 --- a/src/pretix/control/templates/pretixcontrol/items/questions.html +++ b/src/pretix/control/templates/pretixcontrol/items/questions.html @@ -12,6 +12,8 @@ example might be to ask your users about dietary requirements. {% endblocktrans %}
+ +
{% if questions|length == 0 %}

diff --git a/src/pretix/control/templates/pretixcontrol/items/quotas.html b/src/pretix/control/templates/pretixcontrol/items/quotas.html index c776af2620..1a1bd6512b 100644 --- a/src/pretix/control/templates/pretixcontrol/items/quotas.html +++ b/src/pretix/control/templates/pretixcontrol/items/quotas.html @@ -15,8 +15,10 @@ 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 %} diff --git a/src/pretix/control/templates/pretixcontrol/vouchers/base.html b/src/pretix/control/templates/pretixcontrol/vouchers/base.html index 54cdcc2848..4cef7a76d4 100644 --- a/src/pretix/control/templates/pretixcontrol/vouchers/base.html +++ b/src/pretix/control/templates/pretixcontrol/vouchers/base.html @@ -3,19 +3,6 @@ {% load bootstrap3 %} {% block title %}{% trans "Vouchers" %}{% endblock %} {% block content %} -

{% trans "Vouchers" %}

- {% block inside %} {% endblock %} {% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/vouchers/bulk.html b/src/pretix/control/templates/pretixcontrol/vouchers/bulk.html index 6e38637a31..5b8bd9c515 100644 --- a/src/pretix/control/templates/pretixcontrol/vouchers/bulk.html +++ b/src/pretix/control/templates/pretixcontrol/vouchers/bulk.html @@ -4,73 +4,83 @@ {% load bootstrap3 %} {% block title %}{% trans "Voucher" %}{% endblock %} {% block inside %} -

{% trans "Create multiple voucher" %}

{% csrf_token %} {% bootstrap_form_errors form %} -
- {% trans "Voucher codes" %} -
-
- -
- -
- - +
+
+ {% trans "Voucher codes" %} +
+
+
+
+ +
+ +
+ + +
-
- {% bootstrap_field form.codes layout="control" %} + {% bootstrap_field form.codes layout="control" %} - {% bootstrap_field form.max_usages layout="control" %} -
-
- {% trans "Voucher details" %} - {% bootstrap_field form.valid_until layout="control" %} - {% bootstrap_field form.block_quota layout="control" %} - {% bootstrap_field form.allow_ignore_quota layout="control" %} -
- -
- {% bootstrap_field form.price_mode show_label=False form_group_class="" %} -
-
- {% bootstrap_field form.value show_label=False form_group_class="" %} -
+ {% bootstrap_field form.max_usages layout="control" %}
- {% bootstrap_field form.itemvar layout="control" %} -
-
-
-
- {% blocktrans trimmed %} - If you choose "any product" for a specific quota and choose to reserve quota for this - voucher above, the product can still be unavailable to the voucher holder if another quota - associated with the product is sold out! - {% endblocktrans %} +
+
+
+ {% trans "Voucher details" %} +
+
+ {% bootstrap_field form.valid_until layout="control" %} + {% bootstrap_field form.block_quota layout="control" %} + {% bootstrap_field form.allow_ignore_quota layout="control" %} +
+ +
+ {% bootstrap_field form.price_mode show_label=False form_group_class="" %} +
+
+ {% bootstrap_field form.value show_label=False form_group_class="" %} +
+
+ {% bootstrap_field form.itemvar layout="control" %} +
+
+
+
+ {% blocktrans trimmed %} + If you choose "any product" for a specific quota and choose to reserve quota for + this + voucher above, the product can still be unavailable to the voucher holder if another + quota + associated with the product is sold out! + {% endblocktrans %} +
+ {% if form.subevent %} + {% bootstrap_field form.subevent layout="control" %} + {% endif %} + {% bootstrap_field form.tag layout="control" %} + {% bootstrap_field form.comment layout="control" %} + {% eventsignal request.event "pretix.control.signals.voucher_form_html" form=form %}
- {% if form.subevent %} - {% bootstrap_field form.subevent layout="control" %} - {% endif %} - {% bootstrap_field form.tag layout="control" %} - {% bootstrap_field form.comment layout="control" %}
- {% eventsignal request.event "pretix.control.signals.voucher_form_html" form=form %}
+
+
+

{% trans "Delete voucher" %}

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

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

+
+ + {% trans "Cancel" %} + + +
+
+
+
{% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/vouchers/detail.html b/src/pretix/control/templates/pretixcontrol/vouchers/detail.html index fa5461382f..4702ef8e08 100644 --- a/src/pretix/control/templates/pretixcontrol/vouchers/detail.html +++ b/src/pretix/control/templates/pretixcontrol/vouchers/detail.html @@ -4,16 +4,16 @@ {% load eventsignal %} {% block title %}{% trans "Voucher" %}{% endblock %} {% block inside %} -

{% trans "Voucher" %}

{% if voucher.redeemed %}
{% trans "This voucher already has been used. It is not recommended to modify it." %}
{% endif %} @@ -22,43 +22,52 @@ {% bootstrap_form_errors form %}
-
- {% trans "Voucher details" %} - {% bootstrap_field form.code layout="control" %} - {% bootstrap_field form.max_usages layout="control" %} - {% bootstrap_field form.valid_until layout="control" %} - {% bootstrap_field form.block_quota layout="control" %} - {% bootstrap_field form.allow_ignore_quota layout="control" %} -
- -
- {% bootstrap_field form.price_mode show_label=False form_group_class="" %} -
-
- {% bootstrap_field form.value show_label=False form_group_class="" %} -
+
+
+ {% trans "Voucher details" %}
- {% bootstrap_field form.itemvar layout="control" %} -
-
-
-
- {% blocktrans trimmed %} - If you choose "any product" for a specific quota and choose to reserve quota for this - voucher above, the product can still be unavailable to the voucher holder if another quota - associated with the product is sold out! - {% endblocktrans %} +
+ {% bootstrap_field form.code layout="control" %} + {% bootstrap_field form.max_usages layout="control" %} + {% bootstrap_field form.valid_until layout="control" %} + {% bootstrap_field form.block_quota layout="control" %} + {% bootstrap_field form.allow_ignore_quota layout="control" %} +
+ +
+ {% bootstrap_field form.price_mode show_label=False form_group_class="" %} +
+
+ {% bootstrap_field form.value show_label=False form_group_class="" %} +
+
+ {% bootstrap_field form.itemvar layout="control" %} +
+
+
+
+ {% blocktrans trimmed %} + If you choose "any product" for a specific quota and choose to reserve quota + for this voucher above, the product can still be unavailable to the voucher holder if + another quota associated with the product is sold out! + {% endblocktrans %} +
+ {% if form.subevent %} + {% bootstrap_field form.subevent layout="control" %} + {% endif %} + {% bootstrap_field form.tag layout="control" %} + {% bootstrap_field form.comment layout="control" %} + {% eventsignal request.event "pretix.control.signals.voucher_form_html" form=form %} +
+ +
- {% if form.subevent %} - {% bootstrap_field form.subevent layout="control" %} - {% endif %} - {% bootstrap_field form.tag layout="control" %} - {% bootstrap_field form.comment layout="control" %}
- {% eventsignal request.event "pretix.control.signals.voucher_form_html" form=form %}
@@ -71,10 +80,5 @@
-
- -
{% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/vouchers/index.html b/src/pretix/control/templates/pretixcontrol/vouchers/index.html index 2f7f1e1fce..96aac6e989 100644 --- a/src/pretix/control/templates/pretixcontrol/vouchers/index.html +++ b/src/pretix/control/templates/pretixcontrol/vouchers/index.html @@ -4,135 +4,146 @@ {% load urlreplace %} {% block title %}{% trans "Vouchers" %}{% endblock %} {% block inside %} -

- {% blocktrans trimmed %} - Vouchers allow you to assign tickets to specific persons for a lower price. They also enable you to - reserve some quota for your very special guests. - {% endblocktrans %} -

-
-
-
- - +
+
+

{% trans "Vouchers" %}

+
+
+ {% blocktrans trimmed %} + Vouchers allow you to assign tickets to specific persons for a lower price. They also enable you to + reserve some quota for your very special guests. + {% endblocktrans %} +
+
+
+
+ +
+ + -
- -
-
- {% bootstrap_field filter_form.search layout='inline' %} -
-
- {% bootstrap_field filter_form.tag layout='inline' %} -
- {% if request.event.has_subevents %} -
- {% bootstrap_field filter_form.status layout='inline' %}
+
+
- {% bootstrap_field filter_form.subevent layout='inline' %} + {% bootstrap_field filter_form.search layout='inline' %}
- {% else %} -
- {% bootstrap_field filter_form.status layout='inline' %} +
+ {% bootstrap_field filter_form.tag layout='inline' %}
- {% endif %} -
- {% bootstrap_field filter_form.itemvar layout='inline' %} -
-
- {% bootstrap_field filter_form.qm layout='inline' %} -
-
- -
- -
- {% if vouchers|length == 0 %} -
-

- {% if request.GET.search or request.GET.tag or request.GET.status or request.GET.subevent %} - {% trans "Your search did not match any vouchers." %} - {% else %} - {% blocktrans trimmed %} - You haven't created any vouchers yet. - {% endblocktrans %} - {% endif %} -

- - {% trans "Create a new voucher" %} - {% trans "Create multiple new vouchers" %} + +
+
- {% else %} -

- {% trans "Create a new voucher" %} - - {% trans "Create multiple new vouchers" %} - - {% trans "Download list" %} -

-
- - - - - - - - - {% if request.event.has_subevents %} - + {% if vouchers|length == 0 %} +
+

+ {% if request.GET.search or request.GET.tag or request.GET.status or request.GET.subevent %} + {% trans "Your search did not match any vouchers." %} + {% else %} + {% blocktrans trimmed %} + You haven't created any vouchers yet. + {% endblocktrans %} {% endif %} -

- - - - {% for v in vouchers %} +

+ + {% trans "Create a new voucher" %} + {% trans "Create multiple new vouchers" %} + + + {% else %} +
+ {% trans "Create a new voucher" %} + + {% trans "Create multiple new vouchers" %} + + {% trans "Download list" %} +
+
+
{% trans "Voucher code" %}{% trans "Redemptions" %}{% trans "Expiry" %}{% trans "Tag" %}{% trans "Product" %}{% trans "Date" context "subevent" %}
+ - - - - - + + + + + {% if request.event.has_subevents %} - + {% endif %} - + - {% endfor %} - -
- {{ v.code }} - {{ v.redeemed }} / {{ v.max_usages }}{{ v.valid_until|date }} - {{ v.tag }} - - {% if v.item %} - {{ v.item }} - {% if v.variation %} - – {{ v.variation }} - {% endif %} - {% else %} - {% blocktrans trimmed with quota=v.quota.name %} - Any product in quota "{{ quota }}" - {% endblocktrans %} - {% endif %} - {% trans "Voucher code" %}{% trans "Redemptions" %}{% trans "Expiry" %}{% trans "Tag" %}{% trans "Product" %}{{ v.subevent.name }} – {{ v.subevent.get_date_range_display }}{% trans "Date" context "subevent" %} - -
-
- {% include "pretixcontrol/pagination.html" %} - {% endif %} + + + {% for v in vouchers %} + + + {{ v.code }} + + {{ v.redeemed }} / {{ v.max_usages }} + {{ v.valid_until|date }} + + {{ v.tag }} + + + {% if v.item %} + {{ v.item }} + {% if v.variation %} + – {{ v.variation }} + {% endif %} + {% else %} + {% blocktrans trimmed with quota=v.quota.name %} + Any product in quota "{{ quota }}" + {% endblocktrans %} + {% endif %} + + {% if request.event.has_subevents %} + {{ v.subevent.name }} – {{ v.subevent.get_date_range_display }} + {% endif %} + + + + + {% endfor %} + + +
+
+ {% include "pretixcontrol/pagination.html" %} +
+ {% endif %} +
{% endblock %} diff --git a/src/pretix/control/templates/pretixcontrol/vouchers/tags.html b/src/pretix/control/templates/pretixcontrol/vouchers/tags.html index 198769ae2d..e20816d5cd 100644 --- a/src/pretix/control/templates/pretixcontrol/vouchers/tags.html +++ b/src/pretix/control/templates/pretixcontrol/vouchers/tags.html @@ -1,47 +1,54 @@ {% extends "pretixcontrol/vouchers/base.html" %} {% load i18n %} {% block inside %} -

- {% blocktrans trimmed %} - If you add a "tag" to a voucher, you can here see statistics on their usage. - {% endblocktrans %} -

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

- {% blocktrans trimmed %} - You haven't added any tags to vouchers yet. - {% endblocktrans %} -

+
+
+

{% trans "Voucher tags" %}

- {% else %} -
- - - - - - - - - {% for t in tags %} +
+ {% blocktrans trimmed %} + If you add a "tag" to a voucher, you can here see statistics on their usage. + {% endblocktrans %} +
+ {% if tags|length == 0 %} +
+

+ {% blocktrans trimmed %} + You haven't added any tags to vouchers yet. + {% endblocktrans %} +

+
+ {% else %} +
+
{% trans "Tag" %}{% trans "Redeemed vouchers" %}
+ - - + + - {% endfor %} - -
- - {{ t.tag }} - ({{ t.redeemed }} / {{ t.total }}) - -
-
-
-
- 		{% trans "Tag" %}{% trans "Redeemed vouchers" %}
-
- {% endif %} + + + {% for t in tags %} + + + + {{ t.tag }} + + ({{ t.redeemed }} / {{ t.total }}) + + +
+
+
+
+ + + {% endfor %} + + +
+ {% endif %} + +
{% endblock %} diff --git a/src/pretix/static/pretixbase/scss/_theme.scss b/src/pretix/static/pretixbase/scss/_theme.scss index 138b76e715..47f03462cb 100644 --- a/src/pretix/static/pretixbase/scss/_theme.scss +++ b/src/pretix/static/pretixbase/scss/_theme.scss @@ -114,7 +114,7 @@ .panel-default { border: none; } -.panel-default > .panel-heading, .panel-default > .panel-footer { +.panel-default > .panel-heading, .panel-default .panel-footer { background: white; }