List aliases on profile page

apps/member/templates/member/base.html

@@ -1,6 +1,7 @@
 {% extends "base.html" %}
-{% load static i18n pretty_money %}
+{% comment %}
-{% load render_table from django_tables2 %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
 
 {# Use a fluid-width container #}
 {% block containertype %}container-fluid{% endblock %}
@@ -9,10 +10,12 @@
 <div class="row mt-4">
     <div class="col-xl-4">
         {% block profile_info %}
+        {% include "member/profile_info.html" %}
         {% endblock %}
     </div>
     <div class="col-xl-8">
         {% block profile_content %}
+        {% include "member/profile_tables.html" %}
         {% endblock %}
     </div>
 </div>

apps/member/templates/member/profile_detail.html

@@ -1,13 +1,5 @@
 {% extends "member/base.html" %}
 
-{% block profile_info %}
-{% include "member/profile_info.html" %}
-{% endblock %}
-
-{% block profile_content %}
-{% include "member/profile_tables.html" %}
-{% endblock %}
-
 {% block extrajavascript %}
 <script>
     function refreshHistory() {

apps/member/templates/member/profile_info.html

@@ -1,4 +1,4 @@
-{% load i18n static pretty_money perms %}
+{% load i18n pretty_money perms %}
 
 <div class="card bg-light shadow">
     <div class="card-header text-center">
@@ -33,7 +33,8 @@
             <dd class="col-xl-6"><a href="mailto:{{ user_object.email }}">{{ user_object.email }}</a></dd>
 
             <dt class="col-xl-6">{% trans 'phone number'|capfirst %}</dt>
-            <dd class="col-xl-6"><a href="tel:{{ user_object.profile.phone_number }}">{{ user_object.profile.phone_number }}</a></dd>
+            <dd class="col-xl-6"><a
+                    href="tel:{{ user_object.profile.phone_number }}">{{ user_object.profile.phone_number }}</a></dd>
 
             <dt class="col-xl-6">{% trans 'address'|capfirst %}</dt>
             <dd class="col-xl-6">{{ user_object.profile.address }}</dd>
@@ -45,20 +46,25 @@
             <dt class="col-xl-6">{% trans 'paid'|capfirst %}</dt>
             <dd class="col-xl-6">{{ user_object.profile.paid|yesno }}</dd>
             {% endif %}
-
-            <dt class="col-xl-6"> <a href="{% url 'member:user_alias' user_object.pk %}">{% trans 'aliases'|capfirst %}</a></dt>
-            <dd class="col-xl-6 text-truncate">{{ user_object.note.alias_set.all|join:", " }}</dd>
         </dl>
 
-        {% if user_object.pk == user_object.pk %}
+        <h4><a href="{% url 'member:user_alias' user_object.pk %}">{% trans 'aliases'|capfirst %}</a></h4>
-        <a class="small" href="{% url 'member:auth_token' %}">{% trans 'Manage auth token' %}</a>
+        {% for alias in user_object.note.alias_set.all %}
-        {% endif %}
+        <span class="badge badge-secondary">{{ alias }}</span>
+        {% endfor %}
+
     </div>
-    <div class="card-footer text-center">
+    <div class="card-footer">
-        <a class="btn btn-primary btn-sm" href="{% url 'member:user_update_profile' user_object.pk %}">{% trans 'Update Profile' %}</a>
+        <a class="btn btn-sm btn-secondary" href="{% url 'member:user_update_profile' user_object.pk %}">
+            <i class="fa fa-edit"></i> {% trans 'Update Profile' %}
+        </a>
         {% url 'member:user_detail' user_object.pk as user_profile_url %}
         {% if request.path_info != user_profile_url %}
-        <a class="btn btn-primary btn-sm" href="{{ user_profile_url }}">{% trans 'View Profile' %}</a>
+        <a class="btn btn-sm btn-primary" href="{{ user_profile_url }}">{% trans 'View Profile' %}</a>
         {% endif %}
     </div>
 </div>
+
+{% if user_object.pk == user_object.pk %}
+<a class="small float-right text-decoration-none" href="{% url 'member:auth_token' %}">{% trans 'Manage auth token' %}</a>
+{% endif %}