From de6f6025e2d9cee609f0ac370849a450b07b5215 Mon Sep 17 00:00:00 2001 From: Richard Schreiber Date: Fri, 22 Nov 2024 11:12:57 +0100 Subject: [PATCH] update templates --- .../organizers/customer_address_delete.html | 34 ++-- .../organizers/customer_addresses.html | 11 +- .../organizers/customer_base.html | 1 - .../organizers/customer_membership.html | 167 +++++++++++------- .../organizers/customer_memberships.html | 29 +-- .../organizers/customer_orders.html | 13 +- .../organizers/customer_profile_delete.html | 34 ++-- .../organizers/customer_profiles.html | 31 ++-- 8 files changed, 188 insertions(+), 132 deletions(-) diff --git a/src/pretix/presale/templates/pretixpresale/organizers/customer_address_delete.html b/src/pretix/presale/templates/pretixpresale/organizers/customer_address_delete.html index 9da35f9dba..8715783319 100644 --- a/src/pretix/presale/templates/pretixpresale/organizers/customer_address_delete.html +++ b/src/pretix/presale/templates/pretixpresale/organizers/customer_address_delete.html @@ -1,33 +1,39 @@ -{% extends "pretixpresale/organizers/base.html" %} +{% extends "pretixpresale/organizers/customer_base.html" %} {% load i18n %} +{% load icon %} {% load eventurl %} {% block title %}{% trans "Delete address" %}{% endblock %} -{% block content %} -

- {% trans "Delete address" %} -

+{% block inner %} +
+
+

+ {% icon "address-card-o" %} {% trans "Delete address" %} +

+
+ +
{% csrf_token %} -

- {% trans "Do you really want to delete the following address from your account?" %} -

-
- {{ address.describe|linebreaksbr }} -
+ href="{% abseventurl request.organizer "presale:organizer.customer.addresses" %}"> {% trans "Go back" %}
-
-
{% endblock %} diff --git a/src/pretix/presale/templates/pretixpresale/organizers/customer_addresses.html b/src/pretix/presale/templates/pretixpresale/organizers/customer_addresses.html index b85e2cc844..ca11366595 100644 --- a/src/pretix/presale/templates/pretixpresale/organizers/customer_addresses.html +++ b/src/pretix/presale/templates/pretixpresale/organizers/customer_addresses.html @@ -1,15 +1,14 @@ {% extends "pretixpresale/organizers/customer_base.html" %} {% load i18n %} +{% load icon %} {% load eventurl %} -{% load urlreplace %} -{% load money %} -{% load bootstrap3 %} -{% block title %}{% trans "Your account" %}{% endblock %} +{% block title %}{% trans "Addresses" %}{% endblock %} {% block inner %}

- {% trans "Addresses" %} ({{ page_obj.paginator.count }}) + {% icon "address-card-o" %} + {% trans "Addresses" %} ({{ page_obj.paginator.count }})

@@ -26,7 +25,7 @@

- + {% icon "trash" %} {% trans "Delete" %}

diff --git a/src/pretix/presale/templates/pretixpresale/organizers/customer_base.html b/src/pretix/presale/templates/pretixpresale/organizers/customer_base.html index 158ec92245..cc18330675 100644 --- a/src/pretix/presale/templates/pretixpresale/organizers/customer_base.html +++ b/src/pretix/presale/templates/pretixpresale/organizers/customer_base.html @@ -1,7 +1,6 @@ {% extends "pretixpresale/organizers/base.html" %} {% load i18n %} {% load eventurl %} -{% load bootstrap3 %} {% block content %}

{% trans "Your account" %} diff --git a/src/pretix/presale/templates/pretixpresale/organizers/customer_membership.html b/src/pretix/presale/templates/pretixpresale/organizers/customer_membership.html index 73cac2fac5..6f4a0dcfcf 100644 --- a/src/pretix/presale/templates/pretixpresale/organizers/customer_membership.html +++ b/src/pretix/presale/templates/pretixpresale/organizers/customer_membership.html @@ -1,96 +1,127 @@ -{% extends "pretixpresale/organizers/base.html" %} +{% extends "pretixpresale/organizers/customer_base.html" %} {% load i18n %} +{% load icon %} {% load eventurl %} -{% load urlreplace %} -{% load money %} -{% load bootstrap3 %} +{% load textblob %} {% block title %}{% trans "Your membership" %}{% endblock %} -{% block content %} -

- {% trans "Your membership" %} -

-
+{% block inner %} +

- {% trans "Details" %} + {% if membership.membership_type.transferable %} + {% icon "users" %} + {% else %} + {% icon "id-badge" %} + {% endif %} + {% trans "Your membership" %} + {% if membership.testmode %} + + {% textblob "warning" %} + {% trans "TEST MODE" %} + {% endtextblob %} + + {% endif %}

{% trans "Membership type" %}
-
{{ membership.membership_type.name }}
+
{% if membership.canceled %}{% endif %} + {{ membership.membership_type.name }} + {% if membership.canceled %} + + {% textblob "danger" icon="times" %} + {% trans "Canceled" %} + {% endtextblob %} + + {% endif %} +
+ {% if membership.membership_type.transferable %} + ({% trans "transferable" %}) + {% else %} + ({% trans "not transferable" %}) + {% endif %} + +
{% trans "Valid from" %}
{{ membership.date_start|date:"SHORT_DATETIME_FORMAT" }}
{% trans "Valid until" %}
{{ membership.date_end|date:"SHORT_DATETIME_FORMAT" }}
{% trans "Attendee name" %}
-
{{ membership.attendee_name }} +
{{ membership.attendee_name|default_if_none:"–" }}
{% trans "Maximum usages" %}
{{ membership.membership_type.max_usages|default_if_none:"–" }}
-
+

{% trans "Usages" %}

- - - - - - - - - - - - - +
+ {% if usages %} +
    {% for op in usages %} -
- - - - - - - - {% endfor %} - -
{% trans "Usages" %}
{% trans "Order code" %}{% trans "Event" %}{% trans "Product" %}{% trans "Order date" %}{% trans "Status" %}
- - {{ op.order.code }}-{{ op.positionid }} - - {% if op.order.testmode %} - {% trans "TEST MODE" %} - {% endif %} - - {{ op.order.event }} - {% if op.subevent %} -
- {{ op.subevent|default:"" }} - {% endif %} - 		- {{ op.item.name }} - {% if op.variation %}– {{ op.variation }}{% endif %} - - {{ op.order.datetime|date:"SHORT_DATETIME_FORMAT" }} - - {% if op.canceled %} - {% trans "Canceled" %} - {% else %} - {% include "pretixcontrol/orders/fragment_order_status.html" with order=op.order %} - {% endif %} - - - {% trans "Details" %} - -
- {% include "pretixcontrol/pagination.html" %} +
  • +
    +
    +
    {% trans "Order" %}
    +
    + + + {{ op.order.code }}-{{ op.positionid }} + + + {% include "pretixpresale/event/fragment_order_status.html" with order=op.order event=op.order.event %} +
    +
    + {% if op.order.testmode %} +
    + + {% textblob "warning" %} + {% trans "TEST MODE" %} + {% endtextblob %} + +
    + {% endif %} +
    +
    +
    {% trans "Product" %}
    +
    {{ op.item.name }} + {% if op.variation %} - {{ op.variation }}{% endif %} +
    +
    {% trans "Event" %}
    +
    + + {{ op.order.event }} + {% if op.subevent %} +
    {{ op.subevent }} + {% endif %} + {% if not op.order.event.has_subevents and op.order.event.settings.show_dates_on_frontpage %} +
    {{ op.order.event.get_date_range_display }} + {% endif %} +     +
    +
    +
    +
    {% trans "Actions" %}
    +
    + + + {% trans "Details" %} +
    +
    +
    +
    • + {% endfor %} + + {% else %} +

    {% trans "You haven’t used this membership yet." %}

    + {% endif %} +
    + {% include "pretixcontrol/pagination.html" %} {% endblock %} diff --git a/src/pretix/presale/templates/pretixpresale/organizers/customer_memberships.html b/src/pretix/presale/templates/pretixpresale/organizers/customer_memberships.html index d2b9a19c52..251d8de427 100644 --- a/src/pretix/presale/templates/pretixpresale/organizers/customer_memberships.html +++ b/src/pretix/presale/templates/pretixpresale/organizers/customer_memberships.html @@ -1,16 +1,15 @@ {% extends "pretixpresale/organizers/customer_base.html" %} {% load i18n %} +{% load icon %} {% load eventurl %} -{% load urlreplace %} -{% load money %} -{% load bootstrap3 %} {% load textblob %} -{% block title %}{% trans "Your account" %}{% endblock %} +{% block title %}{% trans "Memberships" %}{% endblock %} {% block inner %}

    - {% trans "Memberships" %} ({{ page_obj.paginator.count }}) + {% icon "id-badge" %} + {% trans "Memberships" %} ({{ page_obj.paginator.count }})

    @@ -22,7 +21,9 @@
    {% if m.canceled %}{% endif %} - {{ m.membership_type.name }} + + {{ m.membership_type.name }} + {% if m.membership_type.transferable %} {% endif %} @@ -33,7 +34,11 @@ {% endtextblob %} {% endif %} - {% if m.testmode %}{% trans "TEST MODE" %}{% endif %} + {% if m.testmode %} + {% textblob "warning" %} + {% trans "TEST MODE" %} + {% endtextblob %} + {% endif %}
    {% if not m.membership_type.transferable %} @@ -61,11 +66,11 @@
    {% trans "Actions" %}
    - - - {% trans "Details" %} -
    + + {% icon "list-ul" %} + {% trans "Details" %} + +
    diff --git a/src/pretix/presale/templates/pretixpresale/organizers/customer_orders.html b/src/pretix/presale/templates/pretixpresale/organizers/customer_orders.html index cc40bd7e02..939648f381 100644 --- a/src/pretix/presale/templates/pretixpresale/organizers/customer_orders.html +++ b/src/pretix/presale/templates/pretixpresale/organizers/customer_orders.html @@ -1,9 +1,8 @@ {% extends "pretixpresale/organizers/customer_base.html" %} {% load i18n %} {% load eventurl %} -{% load urlreplace %} {% load money %} -{% load bootstrap3 %} +{% load textblob %} {% block title %}{% trans "Your account" %}{% endblock %} {% block inner %}
    @@ -34,8 +33,14 @@ {% include "pretixpresale/event/fragment_order_status.html" with order=o event=o.event %}
    - {% if o.testmode and False %} -
    {% trans "TEST MODE" %}
    + {% if o.testmode %} +
    + + {% textblob "warning" %} + {% trans "TEST MODE" %} + {% endtextblob %} + +
    {% endif %}
    diff --git a/src/pretix/presale/templates/pretixpresale/organizers/customer_profile_delete.html b/src/pretix/presale/templates/pretixpresale/organizers/customer_profile_delete.html index 341e4a9fb2..700492d11a 100644 --- a/src/pretix/presale/templates/pretixpresale/organizers/customer_profile_delete.html +++ b/src/pretix/presale/templates/pretixpresale/organizers/customer_profile_delete.html @@ -1,33 +1,39 @@ -{% extends "pretixpresale/organizers/base.html" %} +{% extends "pretixpresale/organizers/customer_base.html" %} {% load i18n %} +{% load icon %} {% load eventurl %} {% block title %}{% trans "Delete profile" %}{% endblock %} -{% block content %} -

    - {% trans "Delete profile" %} -

    +{% block inner %} +
    +
    +

    + {% icon "user" %} {% trans "Delete profile" %} +

    +
    +
    +

    + {% trans "Do you really want to delete the following profile from your account?" %} +

    +

    + {{ profile.describe|linebreaksbr }} +

    +
    +
    {% csrf_token %} -

    - {% trans "Do you really want to delete the following profile from your account?" %} -

    -
    - {{ profile.describe|linebreaksbr }} -
    + href="{% abseventurl request.organizer "presale:organizer.customer.profiles" %}"> {% trans "Go back" %}
    -
    -
    {% endblock %} diff --git a/src/pretix/presale/templates/pretixpresale/organizers/customer_profiles.html b/src/pretix/presale/templates/pretixpresale/organizers/customer_profiles.html index a41dc4af4c..be31acffa6 100644 --- a/src/pretix/presale/templates/pretixpresale/organizers/customer_profiles.html +++ b/src/pretix/presale/templates/pretixpresale/organizers/customer_profiles.html @@ -1,10 +1,8 @@ {% extends "pretixpresale/organizers/customer_base.html" %} {% load i18n %} +{% load icon %} {% load eventurl %} -{% load urlreplace %} -{% load money %} -{% load bootstrap3 %} -{% block title %}{% trans "Your account" %}{% endblock %} +{% block title %}{% trans "Attendee profiles" %}{% endblock %} {% block inner %}
    @@ -15,17 +13,24 @@
    {% if attendee_profiles %}
      - {% for ap in attendee_profiles %}
    1. - {{ ap.describe|linebreaksbr }} - - - - {% trans "Delete" %} - -
      2. + {% for ap in attendee_profiles %} + {% if forloop.counter0 and forloop.counter0|divisibleby:4 %} + +
    2. + {% endif %} +
      +

      {{ ap.describe|linebreaksbr }}

      +

      + + {% icon "trash" %} + {% trans "Delete" %} + +

      +
      {% endfor %} +
    {% else %}

    {% trans "You don’t have any attendee profiles in your account yet." %}