Template formating on member app

apps/member/templates/member/base.html

@@ -2,6 +2,7 @@
 {% comment %}
 SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}
+{% block contenttitle %}{% endblock %}
 
 {# Use a fluid-width container #}
 {% block containertype %}container-fluid{% endblock %}

apps/member/templates/member/club_info.html

@@ -1,11 +1,12 @@
-{% load i18n static pretty_money perms %}
-<div class="card bg-light shadow">
-    <div class="card-header text-center">
-        <h4> Club {{ club.name }} </h4>
-    </div>
+{% 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 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">
@@ -14,43 +15,45 @@
             <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>
+            <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_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_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_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>
+            {% 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 %}
+            <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>
+            <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>
 
@@ -59,17 +62,19 @@
         </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>
+    <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>
+</div>

apps/member/templates/member/club_picture_update.html

@@ -1,5 +1,4 @@
 {% extends "member/club_detail.html" %}
-{% load i18n static pretty_money django_tables2 crispy_forms_tags %}
 
 {% block profile_content%}
 {% include "member/picture_update.html" %}

apps/member/templates/member/profile_info.html

@@ -1,9 +1,9 @@
 {% load i18n pretty_money perms %}
 
-<div class="card bg-light shadow">
-    <div class="card-header text-center">
-        <h4>{% trans "Account #" %}{{ user_object.pk }}</h4>
-    </div>
+<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">
@@ -52,7 +52,6 @@
         {% 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 %}">
@@ -66,5 +65,7 @@
 </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>
+<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 +1,4 @@
 {% extends "member/profile_detail.html" %}
-{% load i18n static pretty_money django_tables2 crispy_forms_tags %}
 
 {% block profile_content%}
 {% include "member/picture_update.html" %}

apps/member/templates/member/profile_update.html

@@ -3,14 +3,22 @@
 {% comment %}
 SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}
+{% block contenttitle %}{% endblock %}
 
 {% block content %}
-<form method="post">
-    {% csrf_token %}
-    {{ form|crispy }}
-    {{ profile_form|crispy }}
-    <button class="btn btn-primary" type="submit">
-        {% trans "Save Changes" %}
-    </button>
-</form>
-{% endblock %}
+<div class="card bg-light">
+    <h3 class="card-header text-center">
+        {{ title }}
+    </h3>
+    <div class="card-body">
+        <form method="post">
+            {% csrf_token %}
+            {{ form | crispy }}
+            {{ profile_form | crispy }}
+            <button class="btn btn-primary" type="submit">
+                {% trans "Save Changes" %}
+            </button>
+        </form>
+    </div>
+</div>
+{% endblock %}