Merge branch 'morefront' into 'beta'

Do not list alias on profile page

See merge request bde/nk20!99

apps/member/tables.py

@@ -96,8 +96,8 @@ class MembershipTable(tables.Table):
         t = pretty_money(value)
 
         # If it is required and if the user has the right, the renew button is displayed.
-        if record.club.membership_start is not None:
+        if record.club.membership_start is not None \
-            if record.date_start < record.club.membership_start:  # If the renew is available
+                and record.date_start < record.club.membership_start:
             if not Membership.objects.filter(
                     club=record.club,
                     user=record.user,
@@ -113,9 +113,13 @@ class MembershipTable(tables.Table):
                 )
                 if PermissionBackend.check_perm(get_current_authenticated_user(),
                                                 "member:add_membership", empty_membership):  # If the user has right
-                        t = format_html(t + ' <a class="btn btn-warning" href="{url}">{text}</a>',
+                    renew_url = reverse_lazy('member:club_renew_membership',
-                                        url=reverse_lazy('member:club_renew_membership',
+                                             kwargs={"pk": record.pk})
-                                                         kwargs={"pk": record.pk}), text=_("Renew"))
+                    t = format_html(
+                        t + ' <a class="btn btn-sm btn-warning" title="{text}"'
+                        ' href="{renew_url}"><i class="fa fa-repeat"></i></a>',
+                        renew_url=renew_url, text=_("Renew")
+                    )
         return t
 
     def render_roles(self, record):

apps/member/templates/member/add_members.html

@@ -1,14 +1,15 @@
 {% extends "member/base.html" %}
-{% load crispy_forms_tags %}
+{% comment %}
-{% load static %}
+SPDX-License-Identifier: GPL-3.0-or-later
-{% load i18n %}
+{% endcomment %}
-{% load pretty_money %}
+{% load crispy_forms_tags i18n pretty_money %}
-
-{% block profile_info %}
-{% include "member/club_info.html" %}
-{% endblock %}
 
 {% block profile_content %}
+<div class="card bg-light">
+    <h3 class="card-header text-center">
+        {{ title }}
+    </h3>
+    <div class="card-body">
         {% if additional_fee_renewal %}
         <div class="alert alert-warning">
             {% if renewal %}
@@ -30,6 +31,8 @@
             {{ form|crispy }}
             <button class="btn btn-primary" type="submit">{% trans "Submit" %}</button>
         </form>
+    </div>
+</div>
 {% endblock %}
 
 {% block extrajavascript %}
@@ -38,8 +41,8 @@
         $("#id_last_name").val(user.last_name);
         $("#id_first_name").val(user.first_name);
         $.getJSON("/api/members/profile/" + user.id + "/", function (profile) {
-                let fee = profile.paid ? {{ club.membership_fee_paid }} : {{ club.membership_fee_unpaid }};
+            let fee = profile.paid ? "{{ club.membership_fee_paid }}" : "{{ club.membership_fee_unpaid }}";
-                $("#id_credit_amount").val((fee / 100).toFixed(2));
+            $("#id_credit_amount").val((Number(fee) / 100).toFixed(2));
         });
     }
 

apps/member/templates/member/base.html

@@ -2,6 +2,7 @@
 {% comment %}
 SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}
+{% load i18n perms %}
 {% block contenttitle %}{% endblock %}
 
 {# Use a fluid-width container #}
@@ -11,24 +12,74 @@ SPDX-License-Identifier: GPL-3.0-or-later
 <div class="row mt-4">
     <div class="col-xl-4">
         {% block profile_info %}
-        {% include "member/profile_info.html" %}
+        <div class="card bg-light">
+            <h4 class="card-header text-center">
+                {% if user_object %}
+                {% trans "Account #" %}{{ user_object.pk }}
+                {% elif club %}
+                Club {{ club.name }}
+                {% endif %}
+            </h4>
+            <div class="text-center">
+                {% if user_object %}
+                <a href="{% url 'member:user_update_pic' user_object.pk  %}">
+                    <img src="{{ user_object.note.display_image.url }}" class="img-thumbnail mt-2">
+                </a>
+                {% elif club %}
+                <a href="{% url 'member:club_update_pic' club.pk  %}">
+                    <img src="{{ club.note.display_image.url }}" class="img-thumbnail mt-2">
+                </a>
+                {% endif %}
+            </div>
+            <div class="card-body" id="profile_infos">
+                {% if user_object %}
+                {% include "member/includes/profile_info.html" %}
+                {% elif club %}
+                {% include "member/includes/club_info.html" %}
+                {% endif %}
                 {% endblock %}
             </div>
+            <div class="card-footer">
+                {% if user_object %}
+                <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-sm btn-primary" href="{{ user_profile_url }}">{% trans 'View Profile' %}</a>
+                {% endif %}
+                {% elif club and not club.weiclub %}
+                {% if can_add_members %}
+                <a class="btn btn-sm btn-success" href="{% url 'member:club_add_member' club_pk=club.pk %}"
+                    data-turbolinks="false"> {% trans "Add member" %}</a>
+                {% endif %}
+                {% if ".change_"|has_perm:club %}
+                <a class="btn btn-sm btn-secondary" href="{% url 'member:club_update' pk=club.pk %}"
+                    data-turbolinks="false">
+                    <i class="fa fa-edit"></i> {% trans 'Update Profile' %}
+                </a>
+                {% endif %}
+                {% url 'member:club_detail' club.pk as club_detail_url %}
+                {% if request.path_info != club_detail_url %}
+                <a class="btn btn-sm btn-primary" href="{{ club_detail_url }}">{% trans 'View Profile' %}</a>
+                {% endif %}
+                {% endif %}
+            </div>
+        </div>
+    </div>
     <div class="col-xl-8">
-        {% block profile_content %}
+        {% block profile_content %}{% endblock %}
-        {% include "member/profile_tables.html" %}
-        {% endblock %}
     </div>
 </div>
 {% endblock %}
 
 {% block extrajavascript %}
-<script>
 {% if object %}
+<script>
     function refreshHistory() {
         $("#history_list").load("{% url 'member:user_detail' pk=object.pk %} #history_list");
         $("#profile_infos").load("{% url 'member:user_detail' pk=object.pk %} #profile_infos");
     }
-    {% endif %}
 </script>
+{% endif %}
 {% endblock %}

apps/member/templates/member/club_alias.html

@@ -1,4 +1,7 @@
-{% extends "member/club_detail.html" %}
+{% extends "member/base.html" %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
 {% load static django_tables2 i18n %}
 
 {% block profile_content %}

apps/member/templates/member/club_detail.html

@@ -1,11 +1,50 @@
 {% extends "member/base.html" %}
-
+{% comment %}
-{% block profile_info %}
+SPDX-License-Identifier: GPL-3.0-or-later
-{% include "member/club_info.html" %}
+{% endcomment %}
-{% endblock %}
+{% load render_table from django_tables2 %}
+{% load i18n perms %}
 
 {% block profile_content %}
-{% include "member/club_tables.html" %}
+{% if managers.data %}
+<div class="card">
+    <div class="card-header position-relative" id="clubListHeading">
+        <a class="font-weight-bold">
+            <i class="fa fa-users"></i> {% trans "Club managers" %}
+        </a>
+    </div>
+    {% render_table managers %}
+</div>
+
+<hr>
+{% endif %}
+
+{% if member_list.data %}
+<div class="card">
+    <div class="card-header position-relative" id="clubListHeading">
+        <a class="stretched-link font-weight-bold" href="{% url 'member:club_members' pk=club.pk %}">
+            <i class="fa fa-users"></i> {% trans "Club members" %}
+        </a>
+    </div>
+    {% render_table member_list %}
+</div>
+
+<hr>
+{% endif %}
+
+{% if history_list.data %}
+<div class="card">
+    <div class="card-header position-relative" id="historyListHeading">
+        <a class="stretched-link font-weight-bold" {% if "note.view_note"|has_perm:club.note %}
+            href="{% url 'note:transactions' pk=club.note.pk %}" {% endif %}>
+            <i class="fa fa-euro"></i> {% trans "Transaction history" %}
+        </a>
+    </div>
+    <div id="history_list">
+        {% render_table history_list %}
+    </div>
+</div>
+{% endif %}
 {% endblock %}
 
 {% block extrajavascript %}

apps/member/templates/member/club_form.html

@@ -1,11 +1,11 @@
-{% extends "base.html" %}
+{% extends "member/base.html" %}
 {% comment %}
 SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}
 {% load i18n crispy_forms_tags %}
 {% block contenttitle %}{% endblock %}
 
-{% block content %}
+{% block profile_content %}
 <div class="card bg-light">
     <h3 class="card-header text-center">
         {{ title }}

apps/member/templates/member/club_info.html

@@ -1,80 +0,0 @@
-{% load i18n pretty_money perms %}
-
-<div class="card bg-light">
-    <h4 class="card-header text-center">
-        Club {{ club.name }}
-    </h4>
-    <div class="card-top text-center">
-        <a href="{% url 'member:club_update_pic' club.pk  %}">
-            <img src="{{ club.note.display_image.url }}" class="img-thumbnail mt-2">
-        </a>
-    </div>
-    <div class="card-body" id="profile_infos">
-        <dl class="row">
-            <dt class="col-xl-6">{% trans 'name'|capfirst %}</dt>
-            <dd class="col-xl-6">{{ club.name }}</dd>
-
-            {% if club.parent_club %}
-            <dt class="col-xl-6">
-                <a href="{% url 'member:club_detail' club.parent_club.pk %}">{% trans 'Club Parent'|capfirst %}</a>
-            </dt>
-            <dd class="col-xl-6"> {{ club.parent_club.name }}</dd>
-            {% endif %}
-
-            {% if club.require_memberships %}
-            {% if club.membership_start %}
-            <dt class="col-xl-6">{% trans 'membership start'|capfirst %}</dt>
-            <dd class="col-xl-6">{{ club.membership_start }}</dd>
-            {% endif %}
-
-            {% if club.membership_end %}
-            <dt class="col-xl-6">{% trans 'membership end'|capfirst %}</dt>
-            <dd class="col-xl-6">{{ club.membership_end }}</dd>
-            {% endif %}
-
-            {% if club.membership_duration %}
-            <dt class="col-xl-6">{% trans 'membership duration'|capfirst %}</dt>
-            <dd class="col-xl-6">{{ club.membership_duration }} {% trans "days" %}</dd>
-            {% endif %}
-
-            {% if club.membership_fee_paid == club.membership_fee_unpaid %}
-            <dt class="col-xl-6">{% trans 'membership fee'|capfirst %}</dt>
-            <dd class="col-xl-6">{{ club.membership_fee_paid|pretty_money }}</dd>
-            {% else %}
-            <dt class="col-xl-6">{% trans 'membership fee (paid students)'|capfirst %}</dt>
-            <dd class="col-xl-6">{{ club.membership_fee_paid|pretty_money }}</dd>
-
-            <dt class="col-xl-6">{% trans 'membership fee (unpaid students)'|capfirst %}</dt>
-            <dd class="col-xl-6">{{ club.membership_fee_unpaid|pretty_money }}</dd>
-            {% endif %}
-            {% endif %}
-
-            {% if "note.view_note"|has_perm:club.note %}
-            <dt class="col-xl-6">{% trans 'balance'|capfirst %}</dt>
-            <dd class="col-xl-6">{{ club.note.balance | pretty_money }}</dd>
-            {% endif %}
-
-            <dt class="col-xl-6"><a href="{% url 'member:club_alias' club.pk %}">{% trans 'aliases'|capfirst %}</a></dt>
-            <dd class="col-xl-6 text-truncate">{{ club.note.alias_set.all|join:", " }}</dd>
-
-            <dt class="col-xl-4">{% trans 'email'|capfirst %}</dt>
-            <dd class="col-xl-8"><a href="mailto:{{ club.email }}">{{ club.email }}</a></dd>
-        </dl>
-    </div>
-    {% if not club.weiclub %}
-    <div class="card-footer text-center">
-        {% if can_add_members %}
-        <a class="btn btn-primary btn-sm my-1" href="{% url 'member:club_add_member' club_pk=club.pk %}"
-            data-turbolinks="false"> {% trans "Add member" %}</a>
-        {% endif %}
-        {% if ".change_"|has_perm:club %}
-        <a class="btn btn-primary btn-sm my-1" href="{% url 'member:club_update' pk=club.pk %}" data-turbolinks="false">
-            {% trans "Edit" %}</a>
-        {% endif %}
-        {% url 'member:club_detail' club.pk as club_detail_url %}
-        {%if request.path_info != club_detail_url %}
-        <a class="btn btn-primary btn-sm my-1" href="{{ club_detail_url }}">{% trans 'View Profile' %}</a>
-        {% endif %}
-    </div>
-    {% endif %}
-</div>

apps/member/templates/member/club_members.html

@@ -2,13 +2,13 @@
 {% load i18n %}
 {% load render_table from django_tables2 %}
 
-{% block profile_info %}
-    {% include "member/club_info.html" %}
-{% endblock %}
-
 {% block profile_content %}
-    <input id="searchbar" type="text" class="form-control" placeholder="Nom/prénom/note ...">
+<div class="card bg-light">
-    <div class="form-group">
+    <h3 class="card-header text-center">
+        {{ title }}
+    </h3>
+    <div class="card-body">
+        <input id="searchbar" type="text" class="form-control" placeholder="Nom/prénom/note…">
         <div class="form-check">
             <label class="form-check-label" for="only_active">
                 <input type="checkbox" class="checkboxinput form-check-input" id="only_active"
@@ -16,10 +16,8 @@
                 {% trans "Display only active memberships" %}
             </label>
         </div>
-    </div>
+        <div id="div_id_roles">
-    <div id="div_id_roles" class="form-group">
+            <label for="roles" class="col-form-label">{% trans "Filter roles:" %}</label>
-        <label for="id_roles" class="col-form-label">{% trans "Filter roles:" %}</label>
-        <div class="">
             <select name="roles" class="selectmultiple form-control" id="roles" multiple="">
                 {% for role in applicable_roles %}
                 <option value="{{ role.id }}" selected>{{ role.name }}</option>
@@ -27,8 +25,6 @@
             </select>
         </div>
     </div>
-    <hr>
-
     <div id="memberships_table">
         {% if table.data %}
         {% render_table table %}
@@ -38,6 +34,7 @@
         </div>
         {% endif %}
     </div>
+</div>
 {% endblock %}
 
 {% block extrajavascript %}
@@ -56,9 +53,9 @@
             });
             let roles_str = roles.join(',');
 
-                $("#memberships_table").load(location.pathname + "?search=" + pattern.replace(" ", "%20")
+            $("#memberships_table").load(location.pathname + "?search=" + pattern.replace(" ", "%20") +
-                    + "&only_active=" + (only_active_obj.is(':checked') ? '1' : '0')
+                "&only_active=" + (only_active_obj.is(':checked') ? '1' : '0') +
-                    + "&roles=" + roles_str + " #memberships_table");
+                "&roles=" + roles_str + " #memberships_table");
         }
 
         searchbar_obj.keyup(reloadTable);

apps/member/templates/member/club_picture_update.html

@@ -1,5 +0,0 @@
-{% extends "member/club_detail.html" %}
-
-{% block profile_content%}
-{% include "member/picture_update.html" %}
-{% endblock%}

apps/member/templates/member/club_tables.html

@@ -1,42 +0,0 @@
-{% load render_table from django_tables2 %}
-{% load i18n %}
-{% load perms %}
-
-{% if managers.data %}
-    <div class="card">
-        <div class="card-header position-relative" id="clubListHeading">
-            <a class="font-weight-bold">
-                <i class="fa fa-users"></i> {% trans "Club managers" %}
-            </a>
-        </div>
-        {% render_table managers %}
-    </div>
-
-    <hr>
-{% endif %}
-
-{% if member_list.data %}
-    <div class="card">
-        <div class="card-header position-relative" id="clubListHeading">
-            <a class="stretched-link font-weight-bold" href="{% url 'member:club_members' pk=club.pk %}">
-                <i class="fa fa-users"></i> {% trans "Club members" %}
-            </a>
-        </div>
-        {% render_table member_list %}
-    </div>
-
-    <hr>
-{% endif %}
-
-{% if history_list.data %}
-    <div class="card">
-        <div class="card-header position-relative" id="historyListHeading">
-            <a class="stretched-link font-weight-bold" {% if "note.view_note"|has_perm:club.note %} href="{% url 'note:transactions' pk=club.note.pk %}" {% endif %}>
-                <i class="fa fa-euro"></i> {% trans "Transaction history" %}
-            </a>
-        </div>
-        <div id="history_list">
-            {% render_table history_list %}
-        </div>
-    </div>
-{% endif %}

apps/member/templates/member/includes/club_info.html

@@ -0,0 +1,56 @@
+{% load i18n pretty_money perms %}
+
+<dl class="row">
+    <dt class="col-xl-6">{% trans 'name'|capfirst %}</dt>
+    <dd class="col-xl-6">{{ club.name }}</dd>
+
+    {% if club.parent_club %}
+    <dt class="col-xl-6">
+        <a href="{% url 'member:club_detail' club.parent_club.pk %}">{% trans 'Club Parent'|capfirst %}</a>
+    </dt>
+    <dd class="col-xl-6"> {{ club.parent_club.name }}</dd>
+    {% endif %}
+
+    {% if club.require_memberships %}
+    {% if club.membership_start %}
+    <dt class="col-xl-6">{% trans 'membership start'|capfirst %}</dt>
+    <dd class="col-xl-6">{{ club.membership_start }}</dd>
+    {% endif %}
+
+    {% if club.membership_end %}
+    <dt class="col-xl-6">{% trans 'membership end'|capfirst %}</dt>
+    <dd class="col-xl-6">{{ club.membership_end }}</dd>
+    {% endif %}
+
+    {% if club.membership_duration %}
+    <dt class="col-xl-6">{% trans 'membership duration'|capfirst %}</dt>
+    <dd class="col-xl-6">{{ club.membership_duration }} {% trans "days" %}</dd>
+    {% endif %}
+
+    {% if club.membership_fee_paid == club.membership_fee_unpaid %}
+    <dt class="col-xl-6">{% trans 'membership fee'|capfirst %}</dt>
+    <dd class="col-xl-6">{{ club.membership_fee_paid|pretty_money }}</dd>
+    {% else %}
+    <dt class="col-xl-6">{% trans 'membership fee (paid students)'|capfirst %}</dt>
+    <dd class="col-xl-6">{{ club.membership_fee_paid|pretty_money }}</dd>
+
+    <dt class="col-xl-6">{% trans 'membership fee (unpaid students)'|capfirst %}</dt>
+    <dd class="col-xl-6">{{ club.membership_fee_unpaid|pretty_money }}</dd>
+    {% endif %}
+    {% endif %}
+
+    {% if "note.view_note"|has_perm:club.note %}
+    <dt class="col-xl-6">{% trans 'balance'|capfirst %}</dt>
+    <dd class="col-xl-6">{{ club.note.balance | pretty_money }}</dd>
+    {% endif %}
+
+    <dt class="col-xl-6">{% trans 'aliases'|capfirst %}</dt>
+    <dd class="col-xl-6">
+        <a class="small" href="{% url 'member:club_alias' club.pk %}">
+            {% trans 'Edit aliases' %} ({{ club.note.alias_set.all|length }})
+        </a>
+    </dd>
+
+    <dt class="col-xl-4">{% trans 'email'|capfirst %}</dt>
+    <dd class="col-xl-8"><a href="mailto:{{ club.email }}">{{ club.email }}</a></dd>
+</dl>

apps/member/templates/member/includes/profile_info.html

@@ -0,0 +1,52 @@
+{% load i18n pretty_money perms %}
+
+<dl class="row">
+    <dt class="col-xl-6">{% trans 'name'|capfirst %}, {% trans 'first name' %}</dt>
+    <dd class="col-xl-6">{{ user_object.last_name }} {{ user_object.first_name }}</dd>
+
+    <dt class="col-xl-6">{% trans 'username'|capfirst %}</dt>
+    <dd class="col-xl-6">{{ user_object.username }}</dd>
+
+    {% if user_object.pk == user.pk %}
+    <dt class="col-xl-6">{% trans 'password'|capfirst %}</dt>
+    <dd class="col-xl-6">
+        <a class="small" href="{% url 'password_change' %}">
+            {% trans 'Change password' %}
+        </a>
+    </dd>
+    {% endif %}
+
+    <dt class="col-xl-6">{% trans 'aliases'|capfirst %}</dt>
+    <dd class="col-xl-6">
+        <a class="small" href="{% url 'member:user_alias' user_object.pk %}">
+            {% trans 'Edit aliases' %} ({{ user_object.note.alias_set.all|length }})
+        </a>
+    </dd>
+
+    <dt class="col-xl-6">{% trans 'section'|capfirst %}</dt>
+    <dd class="col-xl-6">{{ user_object.profile.section }}</dd>
+
+    <dt class="col-xl-6">{% trans 'email'|capfirst %}</dt>
+    <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>
+
+    <dt class="col-xl-6">{% trans 'address'|capfirst %}</dt>
+    <dd class="col-xl-6">{{ user_object.profile.address }}</dd>
+
+    {% if "note.view_note"|has_perm:user_object.note %}
+    <dt class="col-xl-6">{% trans 'balance'|capfirst %}</dt>
+    <dd class="col-xl-6">{{ user_object.note.balance | pretty_money }}</dd>
+
+    <dt class="col-xl-6">{% trans 'paid'|capfirst %}</dt>
+    <dd class="col-xl-6">{{ user_object.profile.paid|yesno }}</dd>
+    {% endif %}
+</dl>
+
+{% 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 %}

apps/member/templates/member/manage_auth_tokens.html

@@ -1,5 +1,8 @@
-{% extends "base.html" %}
+{% extends "member/base.html" %}
-{% load i18n static pretty_money django_tables2 %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
+{% load i18n %}
 
 {% block content %}
 <div class="alert alert-info">

apps/member/templates/member/picture_update.html

@@ -1,5 +1,12 @@
+{% extends "member/base.html" %}
 {% load i18n crispy_forms_tags %}
+
 {% block profile_content %}
+<div class="card bg-light">
+  <h3 class="card-header text-center">
+    {{ title }}
+  </h3>
+  <div class="card-body">
     <div class="text-center">
       <form method="post" enctype="multipart/form-data" id="formUpload">
         {% csrf_token %}
@@ -28,7 +35,10 @@
         </div>
       </div>
     </div>
+  </div>
+</div>
 {% endblock %}
+
 {% block extracss %}
 <link href="https://cdnjs.cloudflare.com/ajax/libs/cropperjs/1.5.6/cropper.min.css" rel="stylesheet">
 {% endblock %}
@@ -89,7 +99,6 @@
       $("#id_width").val(cropData["width"]);
       $("#formUpload").submit();
     });
-
   });
 </script>
 {% endblock %}

apps/member/templates/member/profile_alias.html

@@ -1,4 +1,7 @@
-{% extends "member/profile_detail.html" %}
+{% extends "member/base.html" %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
 {% load static django_tables2 i18n %}
 
 {% block profile_content %}

apps/member/templates/member/profile_detail.html

@@ -1,4 +1,42 @@
 {% extends "member/base.html" %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
+{% load render_table from django_tables2 %}
+{% load i18n perms %}
+
+{% block profile_content %}
+{% if not object.profile.email_confirmed and "member.change_profile_email_confirmed"|has_perm:user_object.profile %}
+<div class="alert alert-warning">
+    {% trans "This user doesn't have confirmed his/her e-mail address." %}
+    <a href="{% url "registration:email_validation_resend" pk=user_object.pk %}">
+        {% trans "Click here to resend a validation link." %}
+    </a>
+</div>
+{% endif %}
+
+<div class="card bg-light mb-3">
+    <div class="card-header position-relative" id="clubListHeading">
+        <a class="font-weight-bold">
+            <i class="fa fa-users"></i> {% trans "View my memberships" %}
+        </a>
+    </div>
+    {% render_table club_list %}
+</div>
+
+<div class="card bg-light">
+    <div class="card-header position-relative" id="historyListHeading">
+        <a class="stretched-link font-weight-bold text-decoration-none"
+            {% if "note.view_note"|has_perm:user_object.note %}
+            href="{% url 'note:transactions' pk=user_object.note.pk %}" {% endif %}>
+            <i class="fa fa-euro"></i> {% trans "Transaction history" %}
+        </a>
+    </div>
+    <div id="history_list">
+        {% render_table history_list %}
+    </div>
+</div>
+{% endblock %}
 
 {% block extrajavascript %}
 <script>

apps/member/templates/member/profile_info.html

@@ -1,71 +0,0 @@
-{% load i18n pretty_money perms %}
-
-<div class="card bg-light">
-    <h4 class="card-header text-center">
-        {% trans "Account #" %}{{ user_object.pk }}
-    </h4>
-    <div class="card-top text-center">
-        <a href="{% url 'member:user_update_pic' user_object.pk  %}">
-            <img src="{{ user_object.note.display_image.url }}" class="img-thumbnail mt-2">
-        </a>
-    </div>
-    <div class="card-body" id="profile_infos">
-        <dl class="row">
-            <dt class="col-xl-6">{% trans 'name'|capfirst %}, {% trans 'first name' %}</dt>
-            <dd class="col-xl-6">{{ user_object.last_name }} {{ user_object.first_name }}</dd>
-
-            <dt class="col-xl-6">{% trans 'username'|capfirst %}</dt>
-            <dd class="col-xl-6">{{ user_object.username }}</dd>
-
-            {% if user_object.pk == user.pk %}
-            <dt class="col-xl-6">{% trans 'password'|capfirst %}</dt>
-            <dd class="col-xl-6">
-                <a class="small" href="{% url 'password_change' %}">
-                    {% trans 'Change password' %}
-                </a>
-            </dd>
-            {% endif %}
-
-            <dt class="col-xl-6">{% trans 'section'|capfirst %}</dt>
-            <dd class="col-xl-6">{{ user_object.profile.section }}</dd>
-
-            <dt class="col-xl-6">{% trans 'email'|capfirst %}</dt>
-            <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>
-
-            <dt class="col-xl-6">{% trans 'address'|capfirst %}</dt>
-            <dd class="col-xl-6">{{ user_object.profile.address }}</dd>
-
-            {% if "note.view_note"|has_perm:user_object.note %}
-            <dt class="col-xl-6">{% trans 'balance'|capfirst %}</dt>
-            <dd class="col-xl-6">{{ user_object.note.balance | pretty_money }}</dd>
-
-            <dt class="col-xl-6">{% trans 'paid'|capfirst %}</dt>
-            <dd class="col-xl-6">{{ user_object.profile.paid|yesno }}</dd>
-            {% endif %}
-        </dl>
-
-        <h4><a href="{% url 'member:user_alias' user_object.pk %}">{% trans 'aliases'|capfirst %}</a></h4>
-        {% for alias in user_object.note.alias_set.all %}
-        <span class="badge badge-secondary">{{ alias }}</span>
-        {% endfor %}
-    </div>
-    <div class="card-footer">
-        <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-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 %}

apps/member/templates/member/profile_picture_update.html

@@ -1,5 +0,0 @@
-{% extends "member/profile_detail.html" %}
-
-{% block profile_content%}
-{% include "member/picture_update.html" %}
-{% endblock%}

apps/member/templates/member/profile_tables.html

@@ -1,32 +0,0 @@
-{% load render_table from django_tables2 %}
-{% load i18n %}
-{% load perms %}
-
-{% if not object.profile.email_confirmed and "member.change_profile_email_confirmed"|has_perm:user_object.profile %}
-    <div class="alert alert-warning">
-        {% trans "This user doesn't have confirmed his/her e-mail address." %}
-        <a href="{% url "registration:email_validation_resend" pk=user_object.pk %}">{% trans "Click here to resend a validation link." %}</a>
-    </div>
-{% endif %}
-
-<div class="card">
-    <div class="card-header position-relative" id="clubListHeading">
-        <a class="font-weight-bold">
-            <i class="fa fa-users"></i> {% trans "View my memberships" %}
-        </a>
-    </div>
-    {% render_table club_list %}
-</div>
-
-<hr>
-
-<div class="card">
-    <div class="card-header position-relative" id="historyListHeading">
-            <a class="stretched-link font-weight-bold" {% if "note.view_note"|has_perm:user_object.note %} href="{% url 'note:transactions' pk=user_object.note.pk %}" {% endif %}>
-            <i class="fa fa-euro"></i> {% trans "Transaction history" %}
-        </a>
-    </div>
-    <div id="history_list">
-        {% render_table history_list %}
-    </div>
-</div>

apps/member/templates/member/profile_update.html

@@ -1,11 +1,11 @@
-{% extends "base.html" %}
+{% extends "member/base.html" %}
-{% load i18n crispy_forms_tags %}
 {% comment %}
 SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}
+{% load i18n crispy_forms_tags %}
 {% block contenttitle %}{% endblock %}
 
-{% block content %}
+{% block profile_content %}
 <div class="card bg-light">
     <h3 class="card-header text-center">
         {{ title }}

apps/member/views.py

@@ -273,7 +273,7 @@ class PictureUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin, Det
 
 class ProfilePictureUpdateView(PictureUpdateView):
     model = User
-    template_name = 'member/profile_picture_update.html'
+    template_name = 'member/picture_update.html'
     context_object_name = 'user_object'
 
 
@@ -452,7 +452,7 @@ class ClubPictureUpdateView(PictureUpdateView):
     Update the profile picture of a club.
     """
     model = Club
-    template_name = 'member/club_picture_update.html'
+    template_name = 'member/picture_update.html'
     context_object_name = 'club'
 
     def get_success_url(self):

apps/note/templates/note/search_transactions.html

@@ -1,32 +1,34 @@
-{% extends "member/base.html" %}
+{% extends "base.html" %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
 {% load render_table from django_tables2 %}
 {% load crispy_forms_tags %}
+{% block contenttitle %}{% endblock %}
 
-{% block profile_info %}
+{# Use a fluid-width container #}
-    {% if note.club.weiclub %}
+{% block containertype %}container-fluid{% endblock %}
-        {% with club=note.club.weiclub %}
-            {% include "wei/weiclub_info.html" %}
-        {% endwith %}
-    {% elif note.club %}
-        {% with club=note.club %}
-            {% include "member/club_info.html" %}
-        {% endwith %}
-    {% elif note.user %}
-        {% with user_object=note.user %}
-            {% include "member/profile_info.html"  %}
-        {% endwith %}
-    {% endif %}
-{% endblock %}
-
-{% block profile_content %}
-    {% crispy form %}
-{% endblock %}
 
 {% block content %}
-    {{ block.super }}
+<div class="row mt-4">
+    <div class="col-xl-4">
+        <div class="card bg-light mb-3">
+            <h3 class="card-header text-center">
+                {{ title }}
+            </h3>
+            <div class="card-body">
+                {% crispy form %}
+            </div>
+        </div>
+    </div>
+    <div class="col-xl-8">
+        <div class="card bg-light">
             <div id="table">
                 {% render_table table %}
             </div>
+        </div>
+    </div>
+</div>
 {% endblock %}
 
 {% block extrajavascript %}

apps/wei/templates/wei/weiclub_detail.html

@@ -1,8 +1,5 @@
 {% extends "wei/base.html" %}
 
-{# Use a fluid-width container #}
-{% block containertype %}container-fluid{% endblock %}
-
 {% block profile_info %}
 {% include "wei/weiclub_info.html" %}
 {% endblock %}

note_kfet/inputs.py

@@ -21,7 +21,7 @@ class AmountInput(NumberInput):
 
 
 class Autocomplete(TextInput):
-    template_name = "member/autocomplete_model.html"
+    template_name = "autocomplete_model.html"
 
     def __init__(self, model, resetable=False, attrs=None):
         super().__init__(attrs)