use more icon-helper

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 %}
     <h2>
@@ -15,10 +16,18 @@
                 {% endif %}
                 <dd>
                     <ul class="list-inline">
-                        <li><a href="{% eventurl request.organizer "presale:organizer.customer.change" %}">
+                        <li>
-                                                        <span class="fa fa-edit" aria-hidden=true></span> {% trans "Change account information" %}</a></li>
+                            <a href="{% eventurl request.organizer "presale:organizer.customer.change" %}">
-                        <li><a href="{% eventurl request.organizer "presale:organizer.customer.password" %}">
+                                {% icon "edit" %}
-                                                        <span class="fa fa-key" aria-hidden=true></span> {% trans "Change password" %}</a></li>
+                                {% trans "Change account information" %}
+                            </a>
+                        </li>
+                        <li>
+                            <a href="{% eventurl request.organizer "presale:organizer.customer.password" %}">
+                                {% icon "key" %}
+                                {% trans "Change password" %}
+                            </a>
+                        </li>
                     </ul>
                 </dd>
                 <dd>
@@ -34,7 +43,7 @@
             {% for nav in sub_nav %}
                 <li>
                     <a href="{{ nav.url }}"{% if nav.active %} class="active"{% endif %}>
-                        <span class="fa fa-{{ nav.icon }}" aria-hidden="true"></span>{{ nav.label }}
+                        {% icon nav.icon %}{{ nav.label }}
                     </a>
                 </li>
             {% endfor %}

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 %}
                     <div class="form-group buttons">
                         <button type="submit" class="btn btn-primary btn-lg btn-block">
-                            <span class="fa fa-sign-in" aria-hidden="true"></span>
+                            {% icon "sign-in" %}
                             {% trans "Log in" %}
                         </button>
                     </div>
@@ -36,7 +36,7 @@
                         <div class="col-md-6">
                             <a class="btn btn-link btn-block"
                                href="{% eventurl request.organizer "presale:organizer.customer.register" %}">
-                               <span class="fa fa-address-book-o" aria-hidden="true"></span>
+                               {% icon "address-book-o" %}
                                 {% trans "Create account" %}
                             </a>
                         </div>

src/pretix/presale/templates/pretixpresale/organizers/customer_membership.html

@@ -70,7 +70,7 @@
                             <dt class="sr-only">{% trans "Order" %}</dt>
                             <dd><strong>
                                     <a href="{% abseventurl op.order.event "presale:event.order" order=op.order.code secret=op.order.secret %}" target="_blank">
-                                        <i class="fa fa-shopping-cart" aria-hidden="true"></i>
+                                        {% icon "shopping-cart" %}
                                         {{ op.order.code }}-{{ op.positionid }}
                                     </a>
                                 </strong>
@@ -110,7 +110,7 @@
                             <dd class="text-right">
                                 <a href="{% abseventurl op.order.event "presale:event.order" order=op.order.code secret=op.order.secret %}"
                                target="_blank">
-                                <span class="fa fa-list-ul" aria-hidden="true"></span>
+                                {% icon "list-ul" %}
                                 {% trans "Details" %}
                             </a></dd>
                         </div>

src/pretix/presale/templates/pretixpresale/organizers/customer_memberships.html

@@ -26,12 +26,14 @@
                                     </a>
                                     {% if m.canceled %}</del>{% endif %}
                                     {% if m.membership_type.transferable %}
-                                        <span class="text-muted fa fa-users" aria-hidden="true" title="{% trans "Membership is transferable" %}"></span>
+                                        <span class="text-muted" data-toggle="tooltip" title="{% trans "Membership is transferable" %}">
+                                            {% icon "users" %}
+                                        </span>
                                     {% endif %}
                                 </dt>
                                 <dd class="text-muted">
                                     {% if not m.membership_type.transferable %}
-                                        <span class="fa fa-id-badge" aria-hidden="true"></span>
+                                        {% icon "id-badge" %}
                                     {% endif %}
                                     {{ m.attendee_name|default_if_none:"" }}
                                 </dd>

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 @@
     <div class="panel panel-default">
         <div class="panel-heading">
             <h3 class="panel-title">
-                <span class="fa fa-shopping-cart" aria-hidden="true"></span> <b>{% trans "Orders" %}</b> ({{ page_obj.paginator.count }})
+                {% icon "shopping-cart" %}
+                <b>{% trans "Orders" %}</b> ({{ page_obj.paginator.count }})
             </h3>
         </div>
         <div class="panel-body">
@@ -25,10 +27,10 @@
                                             {{ o.code }}</a>
                                     </strong>
                                     {% if o.customer_id != customer.pk %}
-                                        <span class="fa fa-compress text-muted"
+                                        <span class="text-muted" data-toggle="tooltip"
-                                              data-toggle="tooltip"
+                                              title="{% trans "Matched to the account based on the email address." %}">
-                                              title="{% trans "Matched to the account based on the email address." %}"
+                                            {% icon "compress" %}
-                                        ></span>
+                                        </span>
                                     {% endif %}
                                     <small>{% include "pretixpresale/event/fragment_order_status.html" with order=o event=o.event %}</small>
                                 </dd>

src/pretix/presale/templates/pretixpresale/organizers/customer_profile.html

@@ -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 %}
-    <h2>
-        {% trans "Your account" %}
-    </h2>
-        <div class="blank-after">
-            <dl class="row">
-                <div class="col-sm-6">
-                    <dt>{{ customer.name }}</dt>
-                    <dd>{{ customer.email }}</dd>
-                    {% if customer.phone %}
-                        <dd><spani class="fa fa-phone" aria-hidden="true"></span> {{ customer.phone }}</dd>
-                    {% endif %}
-                    <dd>
-                        <ul class="list-inline">
-                            <li><a href="{% eventurl request.organizer "presale:organizer.customer.change" %}">
-                                                            <span class="fa fa-edit" aria-hidden=true></span> {% trans "Change account information" %}</a></li>
-                            <li><a href="{% eventurl request.organizer "presale:organizer.customer.password" %}">
-                                                            <span class="fa fa-key" aria-hidden=true></span> {% trans "Change password" %}</a></li>
-                        </ul>
-                    </dd>
-                    <dd>
-                    </dd>
-                </div>
-                <div class="col-sm-6 text-right">
-                    <dt>{% trans "Customer ID" %}</dt>
-                    <dd>#{{ customer.identifier }}</dd>
-                </div>
-            </dl>
-            <nav class="row" aria-label="{% trans "customer account information" %}">
-                <ul class="list-inline blank-after col-xs-12">
-                    <li>
-                        <a href="{% eventurl request.organizer "presale:organizer.customer.index" %}">
-                            <span class="fa fa-shopping-cart" aria-hidden="true"></span>{% trans "Orders" %}
-                        </a>
-                    </li>
-                    <li>
-                        <a href="{% eventurl request.organizer "presale:organizer.customer.memberships" %}">
-                            <span class="fa fa-unlock-alt" aria-hidden="true"></span>{% trans "Memberships" %}
-                        </a>
-                    </li>
-                    <li>
-                        <a href="{% eventurl request.organizer "presale:organizer.customer.addresses" %}">
-                            <span class="fa fa-address-card-o" aria-hidden="true"></span>{% trans "Addresses" %}
-                        </a>
-                    </li>
-                    <li>
-                        <a href="{% eventurl request.organizer "presale:organizer.customer.profiles" %}">
-                            <span class="fa fa-users" aria-hidden="true"></span>{% trans "Attendee profiles" %}
-                        </a>
-                    </li>
-                </ul>
-            </nav>
-        </div>
-    <div>
-
-    <div class="panel panel-default">
-        <div class="panel-heading">
-            <h3 class="panel-title">
-                <span class="fa fa-shopping-cart" aria-hidden="true"></span> <b>{% trans "Orders" %}</b> ({{ page_obj.paginator.count }})
-            </h3>
-        </div>
-        <div class="panel-body">
-            {% if orders %}
-                <ol class="full-width-list alternating-rows">
-                    {% for o in orders %}
-                    <li class="row">
-                        <dl>
-                            <div class="col-md-4 col-sm-5 col-xs-8">
-                                <dt class="sr-only">{% trans "Order" %}</dt>
-                                <dd><strong>
-                                        <a href="{% abseventurl o.event "presale:event.order" order=o.code secret=o.secret %}" target="_blank">
-                                            <i class="fa fa-shopping-cart" aria-hidden="true"></i>
-                                            {{ o.code }}</a>
-                                    </strong>
-                                    {% if o.customer_id != customer.pk %}
-                                        <span class="fa fa-compress text-muted"
-                                              data-toggle="tooltip"
-                                              title="{% trans "Matched to the account based on the email address." %}"
-                                        ></span>
-                                    {% endif %}
-                                    <small>{% include "pretixpresale/event/fragment_order_status.html" with order=o event=o.event %}</small>
-                                </dd>
-                                <dd><time datetime="{{ o.datetime|date:"Y-m-d H:i" }}" class="text-muted small">{{ o.datetime|date:"SHORT_DATETIME_FORMAT" }}</time></dd>
-                                {% if o.testmode and False %}
-                                    <dd><span class="label label-warning">{% trans "TEST MODE" %}</span></dd>
-                                {% endif %}
-                            </div>
-                            <div class="col-md-2 col-sm-2 col-xs-4 text-right">
-                                <dt class="sr-only">{% trans "Order total" %}</dt>
-                                <dd>{{ o.total|money:o.event.currency }}</dd>
-                                <dt class="sr-only">{% trans "Positions" %}</dt>
-                                <dd class="text-muted"><small>{% blocktranslate count counter=o.count_positions|default_if_none:0 %}{{ counter }} item{% plural %}{{ counter }} items{% endblocktranslate %}</small>
-                                </dd>
-                            </div>
-                            <div class="col-md-4 col-sm-3 col-xs-8">
-                                <dt class="sr-only">{% trans "Event" %}</dt>
-                                <dd>
-                                    {{ o.event }}
-                                    {% if not o.event.has_subevents and o.event.settings.show_dates_on_frontpage %}
-                                        <br><small class="text-muted">{{ o.event.get_date_range_display }}</small>
-                                    {% endif %}
-                                </dd>
-                            </div>
-                            <div class="col-sm-2 col-xs-4">
-                                <dt class="sr-only">{% trans "Actions" %}</dt>
-                                <dd class="text-right">
-                                    <a href="{% abseventurl o.event "presale:event.order" order=o.code secret=o.secret %}"
-                                   target="_blank">
-                                    <span class="fa fa-list-ul" aria-hidden="true"></span>
-                                    {% trans "Details" %}
-                                </a></dd>
-                            </div>
-                        </dl>
-                    </li>
-                    {% endfor %}
-                </ol>
-            {% else %}
-                <p class="text-center">{% trans "You don’t have any orders in your account yet." %}</p>
-            {% endif %}
-        </div>
-    </div>
-    {% include "pretixcontrol/pagination.html" %}
-
-            <div role="tabpanel" class="tab-pane" id="memberships">
-                <table class="panel-body table table-hover">
-                    <caption class="sr-only">{% trans "Memberships" %}</caption>
-                    <thead>
-                    <tr>
-                        <th>{% trans "Membership type" %}</th>
-                        <th>{% trans "Valid from" %}</th>
-                        <th>{% trans "Valid until" %}</th>
-                        <th>{% trans "Attendee name" %}</th>
-                        <th>{% trans "Usages" %}</th>
-                        <th></th>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    {% for m in memberships %}
-                        <tr>
-                            <td>
-                                {% if m.canceled %}<del>{% endif %}
-                                {{ m.membership_type.name }}
-                                {% if m.canceled %}</del>{% endif %}
-                                {% if m.testmode %}<span class="label label-warning">{% trans "TEST MODE" %}</span>{% endif %}
-                            </td>
-                            <td>
-                                {{ m.date_start|date:"SHORT_DATETIME_FORMAT" }}
-                            </td>
-                            <td>
-                                {{ m.date_end|date:"SHORT_DATETIME_FORMAT" }}
-                            </td>
-                            <td>
-                                {{ m.attendee_name }}
-                            </td>
-                            <td>
-                                <div class="quotabox">
-                                    <div class="progress">
-                                        <div class="progress-bar progress-bar-success progress-bar-{{ m.percent }}">
-                                        </div>
-                                    </div>
-                                    <div class="numbers">
-                                        {{ m.usages }} /
-                                        {{ m.membership_type.max_usages|default_if_none:"∞" }}
-                                    </div>
-                                </div>
-                            </td>
-                            <td class="text-right flip">
-                                <a href="{% abseventurl request.organizer "presale:organizer.customer.membership" id=m.id %}"
-                                   data-toggle="tooltip"
-                                   title="{% trans "Details" %}"
-                                   class="btn btn-default">
-                                    <i class="fa fa-list"></i>
-                                </a>
-                            </td>
-                        </tr>
-                    {% empty %}
-                        <tr>
-                            <td colspan="6" class="text-center">{% trans "No memberships are stored in your account." %}</td>
-                        </tr>
-                    {% endfor %}
-                    </tbody>
-                </table>
-            </div>
-            <div role="tabpanel" class="tab-pane" id="addresses">
-                <table class="panel-body table table-hover">
-                    <thead>
-                    <tr>
-                        <th>{% trans "Address" %}</th>
-                        <th></th>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    {% for ia in invoice_addresses %}
-                        <tr>
-                            <td>
-                                {{ ia.describe|linebreaksbr }}
-                            </td>
-                            <td class="text-right flip">
-                                <a href="{% abseventurl request.organizer "presale:organizer.customer.address.delete" id=ia.id %}"
-                                   data-toggle="tooltip"
-                                   title="{% trans "Delete" %}"
-                                   class="btn btn-danger">
-                                    <i class="fa fa-trash"></i>
-                                </a>
-                            </td>
-                        </tr>
-                        {% empty %}
-                        <tr>
-                            <td colspan="2" class="text-center">
-                                {% trans "No addresses are stored in your account." %}
-                            </td>
-                        </tr>
-                    {% endfor %}
-                    </tbody>
-                </table>
-            </div>
-            <div role="tabpanel" class="tab-pane" id="profiles">
-                <table class="panel-body table table-hover">
-                    <thead>
-                    <tr>
-                        <th>{% trans "Profile" %}</th>
-                        <th></th>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    {% for ap in attendee_profiles %}
-                        <tr>
-                            <td>
-                                {{ ap.describe|linebreaksbr }}
-                            </td>
-                            <td class="text-right flip">
-                                <a href="{% abseventurl request.organizer "presale:organizer.customer.profile.delete" id=ap.id %}"
-                                   data-toggle="tooltip"
-                                   title="{% trans "Delete" %}"
-                                   class="btn btn-danger">
-                                    <i class="fa fa-trash"></i>
-                                </a>
-                            </td>
-                        </tr>
-                    {% empty %}
-                        <tr>
-                            <td colspan="2" class="text-center">
-                                {% trans "No attendee profiles are stored in your account." %}
-                            </td>
-                        </tr>
-                    {% endfor %}
-                    </tbody>
-                </table>
-            </div>
-        </div>
-    </div>
-{% endblock %}

src/pretix/presale/templates/pretixpresale/organizers/customer_profiles.html

@@ -7,7 +7,8 @@
     <div class="panel panel-default">
         <div class="panel-heading">
             <h3 class="panel-title">
-                <span class="fa fa-users" aria-hidden="true"></span> <b>{% trans "Attendee profiles" %}</b> ({{ page_obj.paginator.count }})
+                {% icon "users" %}
+                <b>{% trans "Attendee profiles" %}</b> ({{ page_obj.paginator.count }})
             </h3>
         </div>
         <div class="panel-body">