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

@@ -15,10 +16,18 @@ {% endif %}
@@ -34,7 +43,7 @@ {% for nav in sub_nav %}
  • - {{ nav.label }} + {% icon nav.icon %}{{ nav.label }}
    • {% endfor %} diff --git a/src/pretix/presale/templates/pretixpresale/organizers/customer_login.html b/src/pretix/presale/templates/pretixpresale/organizers/customer_login.html index bea21a54fc..e9fc07fa2a 100644 --- a/src/pretix/presale/templates/pretixpresale/organizers/customer_login.html +++ b/src/pretix/presale/templates/pretixpresale/organizers/customer_login.html @@ -1,7 +1,7 @@ {% extends "pretixpresale/organizers/base.html" %} {% load i18n %} +{% load icon %} {% load eventurl %} -{% load urlreplace %} {% load bootstrap3 %} {% block title %}{% trans "Log in" %}{% endblock %} {% block content %} @@ -18,7 +18,7 @@ {% bootstrap_form form %}
    @@ -36,7 +36,7 @@
    - + {% icon "address-book-o" %} {% trans "Create account" %}
    diff --git a/src/pretix/presale/templates/pretixpresale/organizers/customer_membership.html b/src/pretix/presale/templates/pretixpresale/organizers/customer_membership.html index 20b3f93327..d79fbbf9a2 100644 --- a/src/pretix/presale/templates/pretixpresale/organizers/customer_membership.html +++ b/src/pretix/presale/templates/pretixpresale/organizers/customer_membership.html @@ -70,7 +70,7 @@
    {% trans "Order" %}
    - + {% icon "shopping-cart" %} {{ op.order.code }}-{{ op.positionid }} @@ -110,7 +110,7 @@
    - + {% icon "list-ul" %} {% trans "Details" %}
    diff --git a/src/pretix/presale/templates/pretixpresale/organizers/customer_memberships.html b/src/pretix/presale/templates/pretixpresale/organizers/customer_memberships.html index 98ad28d892..7b71154948 100644 --- a/src/pretix/presale/templates/pretixpresale/organizers/customer_memberships.html +++ b/src/pretix/presale/templates/pretixpresale/organizers/customer_memberships.html @@ -26,12 +26,14 @@ {% if m.canceled %}{% endif %} {% if m.membership_type.transferable %} - + + {% icon "users" %} + {% endif %}
    {% if not m.membership_type.transferable %} - + {% icon "id-badge" %} {% endif %} {{ m.attendee_name|default_if_none:"" }}
    diff --git a/src/pretix/presale/templates/pretixpresale/organizers/customer_orders.html b/src/pretix/presale/templates/pretixpresale/organizers/customer_orders.html index 659d9f2b7a..511f97c01c 100644 --- a/src/pretix/presale/templates/pretixpresale/organizers/customer_orders.html +++ b/src/pretix/presale/templates/pretixpresale/organizers/customer_orders.html @@ -1,5 +1,6 @@ {% extends "pretixpresale/organizers/customer_base.html" %} {% load i18n %} +{% load icon %} {% load eventurl %} {% load money %} {% load textbubble %} @@ -8,7 +9,8 @@

    - {% trans "Orders" %} ({{ page_obj.paginator.count }}) + {% icon "shopping-cart" %} + {% trans "Orders" %} ({{ page_obj.paginator.count }})

    @@ -25,10 +27,10 @@ {{ o.code }} {% if o.customer_id != customer.pk %} - + + {% icon "compress" %} + {% endif %} {% include "pretixpresale/event/fragment_order_status.html" with order=o event=o.event %} diff --git a/src/pretix/presale/templates/pretixpresale/organizers/customer_profile.html b/src/pretix/presale/templates/pretixpresale/organizers/customer_profile.html deleted file mode 100644 index 154d8accac..0000000000 --- a/src/pretix/presale/templates/pretixpresale/organizers/customer_profile.html +++ /dev/null @@ -1,259 +0,0 @@ -{% extends "pretixpresale/organizers/base.html" %} -{% load i18n %} -{% load eventurl %} -{% load urlreplace %} -{% load money %} -{% load bootstrap3 %} -{% block title %}{% trans "Your account" %}{% endblock %} -{% block content %} -

    - {% trans "Your account" %} -

    -
    -
    -
    -
    {{ customer.name }}
    -
    {{ customer.email }}
    - {% if customer.phone %} -
    - {% endif %} -
    - -
    -
    -
    -
    -
    -
    {% trans "Customer ID" %}
    -
    #{{ customer.identifier }}
    -
    -
    - -
    -
    - -
    -
    -

    - {% trans "Orders" %} ({{ page_obj.paginator.count }}) -

    -
    -
    - {% if orders %} -
      - {% for o in orders %} -
    1. -
      -
      -
      {% trans "Order" %}
      -
      - - - {{ o.code }} - - {% if o.customer_id != customer.pk %} - - {% endif %} - {% include "pretixpresale/event/fragment_order_status.html" with order=o event=o.event %} -
      -
      - {% if o.testmode and False %} -
      {% trans "TEST MODE" %}
      - {% endif %} -
      -
      -
      {% trans "Order total" %}
      -
      {{ o.total|money:o.event.currency }}
      -
      {% trans "Positions" %}
      -
      {% blocktranslate count counter=o.count_positions|default_if_none:0 %}{{ counter }} item{% plural %}{{ counter }} items{% endblocktranslate %} -
      -
      -
      -
      {% trans "Event" %}
      -
      - {{ o.event }} - {% if not o.event.has_subevents and o.event.settings.show_dates_on_frontpage %} -
      {{ o.event.get_date_range_display }} - {% endif %} -
      -
      -
      -
      {% trans "Actions" %}
      -
      - - - {% trans "Details" %} -
      -
      -
      -
      2. - {% endfor %} -
    - {% else %} -

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

    - {% endif %} -
    -
    - {% include "pretixcontrol/pagination.html" %} - -
    - - - - - - - - - - - - - - {% for m in memberships %} - - - - - - - - - {% empty %} - - - - {% endfor %} - -
    {% trans "Memberships" %}
    {% trans "Membership type" %}{% trans "Valid from" %}{% trans "Valid until" %}{% trans "Attendee name" %}{% trans "Usages" %}
    - {% if m.canceled %}{% endif %} - {{ m.membership_type.name }} - {% if m.canceled %}{% endif %} - {% if m.testmode %}{% trans "TEST MODE" %}{% endif %} - - {{ m.date_start|date:"SHORT_DATETIME_FORMAT" }} - - {{ m.date_end|date:"SHORT_DATETIME_FORMAT" }} - - {{ m.attendee_name }} - -
    -
    -
    -
    -
    -
    - {{ m.usages }} / - {{ m.membership_type.max_usages|default_if_none:"∞" }} -
    -
    -     		- - - -
    {% trans "No memberships are stored in your account." %}
    -
    -
    - - - - - - - - - {% for ia in invoice_addresses %} - - - - - {% empty %} - - - - {% endfor %} - -
    {% trans "Address" %}
    - {{ ia.describe|linebreaksbr }} - - - - -
    - {% trans "No addresses are stored in your account." %} -
    -
    -
    - - - - - - - - - {% for ap in attendee_profiles %} - - - - - {% empty %} - - - - {% endfor %} - -
    {% trans "Profile" %}
    - {{ ap.describe|linebreaksbr }} - - - - -
    - {% trans "No attendee profiles are stored in your account." %} -
    -
    -
    -
    -{% endblock %} diff --git a/src/pretix/presale/templates/pretixpresale/organizers/customer_profiles.html b/src/pretix/presale/templates/pretixpresale/organizers/customer_profiles.html index be31acffa6..8196b1dd8b 100644 --- a/src/pretix/presale/templates/pretixpresale/organizers/customer_profiles.html +++ b/src/pretix/presale/templates/pretixpresale/organizers/customer_profiles.html @@ -7,7 +7,8 @@

    - {% trans "Attendee profiles" %} ({{ page_obj.paginator.count }}) + {% icon "users" %} + {% trans "Attendee profiles" %} ({{ page_obj.paginator.count }})