diff --git a/apps/member/templates/member/add_members.html b/apps/member/templates/member/add_members.html
index 8f429541dbf8e6999a764f63e1c0b98510b17b64..909e72b330c05804a894e9abfdec9fb288dfdba3 100644
--- a/apps/member/templates/member/add_members.html
+++ b/apps/member/templates/member/add_members.html
@@ -1,4 +1,4 @@
-{% extends "member/noteowner_detail.html" %}
+{% extends "member/base.html" %}
{% load crispy_forms_tags %}
{% load static %}
{% load i18n %}
diff --git a/apps/member/templates/member/noteowner_detail.html b/apps/member/templates/member/base.html
similarity index 76%
rename from apps/member/templates/member/noteowner_detail.html
rename to apps/member/templates/member/base.html
index 4f5f7a1d17342ec130e35f2f619a46f3619ae86e..b61d869cc4f751f592944e98c9315dd0fe1d1482 100644
--- a/apps/member/templates/member/noteowner_detail.html
+++ b/apps/member/templates/member/base.html
@@ -1,6 +1,8 @@
{% extends "base.html" %}
-{% load static i18n pretty_money %}
-{% load render_table from django_tables2 %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
+{% block contenttitle %}{% endblock %}
{# Use a fluid-width container #}
{% block containertype %}container-fluid{% endblock %}
@@ -9,15 +11,15 @@
<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>
-
-{% block extra_content %}{% endblock %}
{% endblock %}
{% block extrajavascript %}
diff --git a/apps/member/templates/member/club_detail.html b/apps/member/templates/member/club_detail.html
index bd6e8399a254304a42c940bf47a6607dcd73ab6c..c3afee7b8e4356e9471e114113c76284abfc48e1 100644
--- a/apps/member/templates/member/club_detail.html
+++ b/apps/member/templates/member/club_detail.html
@@ -1,4 +1,4 @@
-{% extends "member/noteowner_detail.html" %}
+{% extends "member/base.html" %}
{% block profile_info %}
{% include "member/club_info.html" %}
diff --git a/apps/member/templates/member/club_info.html b/apps/member/templates/member/club_info.html
index 8dcf5baae7963a5979b225237ef76b622dfcbcfc..bc76385b16447148fe60a57d0b79ba987811c54e 100644
--- a/apps/member/templates/member/club_info.html
+++ b/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>
\ No newline at end of file
diff --git a/apps/member/templates/member/club_members.html b/apps/member/templates/member/club_members.html
index ed2debe46437086b15ffa717cf7299bef18cfd2e..9faff271f1f10618db1a4403ea37b20b753a6401 100644
--- a/apps/member/templates/member/club_members.html
+++ b/apps/member/templates/member/club_members.html
@@ -1,4 +1,4 @@
-{% extends "member/noteowner_detail.html" %}
+{% extends "member/base.html" %}
{% load i18n %}
{% load render_table from django_tables2 %}
diff --git a/apps/member/templates/member/club_picture_update.html b/apps/member/templates/member/club_picture_update.html
index 4f72efec88cb13bc4a2955ad3a91def1870c49f7..358fdd6e882399c2cb9654e9f650f35ba6d2b554 100644
--- a/apps/member/templates/member/club_picture_update.html
+++ b/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" %}
diff --git a/apps/member/templates/member/profile_detail.html b/apps/member/templates/member/profile_detail.html
index 297af21ca4214fd7d1c08c59de98ad9d4aa0c983..9df28c9fe365550ace46b55943096073ad2ee591 100644
--- a/apps/member/templates/member/profile_detail.html
+++ b/apps/member/templates/member/profile_detail.html
@@ -1,18 +1,10 @@
-{% extends "member/noteowner_detail.html" %}
-
-{% block profile_info %}
-{% include "member/profile_info.html" %}
-{% endblock %}
-
-{% block profile_content %}
-{% include "member/profile_tables.html" %}
-{% endblock %}
+{% extends "member/base.html" %}
{% block extrajavascript %}
- <script>
- function refreshHistory() {
- $("#history_list").load("{% url 'member:user_detail' pk=user_object.pk %} #history_list");
- $("#profile_infos").load("{% url 'member:user_detail' pk=user_object.pk %} #profile_infos");
- }
- </script>
-{% endblock %}
+<script>
+ function refreshHistory() {
+ $("#history_list").load("{% url 'member:user_detail' pk=user_object.pk %} #history_list");
+ $("#profile_infos").load("{% url 'member:user_detail' pk=user_object.pk %} #profile_infos");
+ }
+</script>
+{% endblock %}
\ No newline at end of file
diff --git a/apps/member/templates/member/profile_info.html b/apps/member/templates/member/profile_info.html
index 5d849a0a1bdc65545f40ed723e79c9eeb102a279..3fbf5e3dcc96be54a96eb623e17c94256b2f6122 100644
--- a/apps/member/templates/member/profile_info.html
+++ b/apps/member/templates/member/profile_info.html
@@ -1,12 +1,12 @@
-{% load i18n static pretty_money perms %}
+{% 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" >
+ <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">
@@ -18,12 +18,12 @@
<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>
+ <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>
@@ -33,32 +33,39 @@
<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>
{% 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 '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>
+ <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 %}
- <a class="small" href="{% url 'member:auth_token' %}">{% trans 'Manage auth token' %}</a>
- {% endif %}
+ <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 text-center">
- <a class="btn btn-primary btn-sm" href="{% url 'member:user_update_profile' user_object.pk %}">{% trans 'Update Profile' %}</a>
+ <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-primary btn-sm" href="{{ user_profile_url }}">{% trans 'View Profile' %}</a>
+ {% 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 %}
\ No newline at end of file
diff --git a/apps/member/templates/member/profile_picture_update.html b/apps/member/templates/member/profile_picture_update.html
index 4be78dc899e5f9c84768d6bf7e0ccbf23ad87c18..c50a82996b010535a06aca837e29a5c9239c82a0 100644
--- a/apps/member/templates/member/profile_picture_update.html
+++ b/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" %}
diff --git a/apps/member/templates/member/profile_update.html b/apps/member/templates/member/profile_update.html
index a47a147bdc9d1c07b62c6a411396bfa68b681f6b..19d971892bd038c28464b39393c2abec8ceab9f1 100644
--- a/apps/member/templates/member/profile_update.html
+++ b/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 %}
\ No newline at end of file
diff --git a/apps/note/templates/note/search_transactions.html b/apps/note/templates/note/search_transactions.html
index 89e571b01fc231b81c97de6b652a60486cc48e64..2364a0b336e8d1e1c312378239128b2548438052 100644
--- a/apps/note/templates/note/search_transactions.html
+++ b/apps/note/templates/note/search_transactions.html
@@ -1,4 +1,4 @@
-{% extends "member/noteowner_detail.html" %}
+{% extends "member/base.html" %}
{% load render_table from django_tables2 %}
{% load crispy_forms_tags %}
@@ -22,7 +22,8 @@
{% crispy form %}
{% endblock %}
-{% block extra_content %}
+{% block content %}
+ {{ block.super }}
<div id="table">
{% render_table table %}
</div>
diff --git a/apps/wei/templates/wei/base.html b/apps/wei/templates/wei/base.html
new file mode 100644
index 0000000000000000000000000000000000000000..24778bafd54aad52f63f389e1957a170dd627b69
--- /dev/null
+++ b/apps/wei/templates/wei/base.html
@@ -0,0 +1 @@
+{% extends "member/base.html" %}
diff --git a/apps/wei/templates/wei/bus_detail.html b/apps/wei/templates/wei/bus_detail.html
index 1b335be8763e0e9d37a70a37230f68cc97822d80..fc5d14a27537173dc351851b4d33a0360b6b7587 100644
--- a/apps/wei/templates/wei/bus_detail.html
+++ b/apps/wei/templates/wei/bus_detail.html
@@ -1,4 +1,4 @@
-{% extends "member/noteowner_detail.html" %}
+{% extends "wei/base.html" %}
{% block profile_info %}
{% include "wei/weiclub_info.html" %}
diff --git a/apps/wei/templates/wei/bus_form.html b/apps/wei/templates/wei/bus_form.html
index 4c7b22ce4a2ba0db9c912b3613043cb292108f72..3a2abfae112135305e5eb7eec13d67e30d75535b 100644
--- a/apps/wei/templates/wei/bus_form.html
+++ b/apps/wei/templates/wei/bus_form.html
@@ -1,4 +1,4 @@
-{% extends "member/noteowner_detail.html" %}
+{% extends "wei/base.html" %}
{% load crispy_forms_tags %}
{% load i18n %}
diff --git a/apps/wei/templates/wei/busteam_detail.html b/apps/wei/templates/wei/busteam_detail.html
index 481e24ea6de01740a233d1ce668d0e7e58ca5a2f..e262d64fc061d38ae3ce818e5e91294ac287d824 100644
--- a/apps/wei/templates/wei/busteam_detail.html
+++ b/apps/wei/templates/wei/busteam_detail.html
@@ -1,4 +1,4 @@
-{% extends "member/noteowner_detail.html" %}
+{% extends "wei/base.html" %}
{% block profile_info %}
{% include "wei/weiclub_info.html" %}
diff --git a/apps/wei/templates/wei/busteam_form.html b/apps/wei/templates/wei/busteam_form.html
index 4c7b22ce4a2ba0db9c912b3613043cb292108f72..3a2abfae112135305e5eb7eec13d67e30d75535b 100644
--- a/apps/wei/templates/wei/busteam_form.html
+++ b/apps/wei/templates/wei/busteam_form.html
@@ -1,4 +1,4 @@
-{% extends "member/noteowner_detail.html" %}
+{% extends "wei/base.html" %}
{% load crispy_forms_tags %}
{% load i18n %}
diff --git a/apps/wei/templates/wei/survey.html b/apps/wei/templates/wei/survey.html
index 36553849eaf0d41a03c313d97db58b0c38578c43..357693fbfe1fa64c5856eb68bce341b5970413a8 100644
--- a/apps/wei/templates/wei/survey.html
+++ b/apps/wei/templates/wei/survey.html
@@ -1,4 +1,4 @@
-{% extends "member/noteowner_detail.html" %}
+{% extends "wei/base.html" %}
{% load i18n %}
{% load crispy_forms_tags %}
diff --git a/apps/wei/templates/wei/survey_closed.html b/apps/wei/templates/wei/survey_closed.html
index 28c182ef73c093ff223936c6f4f0b0b58d94fd22..719168bea2071de3cbfee4ec0d14d53840db997b 100644
--- a/apps/wei/templates/wei/survey_closed.html
+++ b/apps/wei/templates/wei/survey_closed.html
@@ -1,4 +1,4 @@
-{% extends "member/noteowner_detail.html" %}
+{% extends "wei/base.html" %}
{% load i18n %}
{% load crispy_forms_tags %}
diff --git a/apps/wei/templates/wei/survey_end.html b/apps/wei/templates/wei/survey_end.html
index 888290f7893b226322d0bc2356508f82deb2a449..a141a0369a8cb04f1dacbeeafac01d22affe793a 100644
--- a/apps/wei/templates/wei/survey_end.html
+++ b/apps/wei/templates/wei/survey_end.html
@@ -1,4 +1,4 @@
-{% extends "member/noteowner_detail.html" %}
+{% extends "wei/base.html" %}
{% load i18n %}
{% load crispy_forms_tags %}
diff --git a/apps/wei/templates/wei/weiclub_detail.html b/apps/wei/templates/wei/weiclub_detail.html
index f359933f56447a71536a4519620cfcfae2e1bc70..4282964cd183b8f65807fb57f4646fc07efd352b 100644
--- a/apps/wei/templates/wei/weiclub_detail.html
+++ b/apps/wei/templates/wei/weiclub_detail.html
@@ -1,4 +1,4 @@
-{% extends "member/noteowner_detail.html" %}
+{% extends "wei/base.html" %}
{# Use a fluid-width container #}
{% block containertype %}container-fluid{% endblock %}
diff --git a/apps/wei/templates/wei/weiclub_form.html b/apps/wei/templates/wei/weiclub_form.html
index 64edf7986b2b8776eacd11ee7c6827195fe43c7a..30af2ea78c8c1a64cda08a567d21e92fb976a764 100644
--- a/apps/wei/templates/wei/weiclub_form.html
+++ b/apps/wei/templates/wei/weiclub_form.html
@@ -1,4 +1,4 @@
-{% extends "member/noteowner_detail.html" %}
+{% extends "wei/base.html" %}
{% load crispy_forms_tags %}
{% load i18n %}
diff --git a/apps/wei/templates/wei/weimembership_form.html b/apps/wei/templates/wei/weimembership_form.html
index 9a1a4d97b7c02f3f67fa8f5b2d5898d9b0844838..ba4401ef87a74dc2d6152fa41d8c7b0f0c399d87 100644
--- a/apps/wei/templates/wei/weimembership_form.html
+++ b/apps/wei/templates/wei/weimembership_form.html
@@ -1,4 +1,4 @@
-{% extends "member/noteowner_detail.html" %}
+{% extends "wei/base.html" %}
{% load crispy_forms_tags %}
{% load i18n %}
{% load pretty_money %}
diff --git a/apps/wei/templates/wei/weimembership_list.html b/apps/wei/templates/wei/weimembership_list.html
index d058211f32b861e9191815b559ae4911cbc75f59..e0ed72fae42572295e55d4ffecf80a38fcda8710 100644
--- a/apps/wei/templates/wei/weimembership_list.html
+++ b/apps/wei/templates/wei/weimembership_list.html
@@ -1,4 +1,4 @@
-{% extends "member/noteowner_detail.html" %}
+{% extends "wei/base.html" %}
{% load i18n %}
{% load render_table from django_tables2 %}
diff --git a/apps/wei/templates/wei/weiregistration_confirm_delete.html b/apps/wei/templates/wei/weiregistration_confirm_delete.html
index 51bfc030d3c8633cdc7bd9483cd63cc6e7970c89..68d9c4a34e4357d5d4a42237f91e77ea71ae5862 100644
--- a/apps/wei/templates/wei/weiregistration_confirm_delete.html
+++ b/apps/wei/templates/wei/weiregistration_confirm_delete.html
@@ -1,4 +1,4 @@
-{% extends "member/noteowner_detail.html" %}
+{% extends "wei/base.html" %}
{% load i18n %}
{% load crispy_forms_tags %}
diff --git a/apps/wei/templates/wei/weiregistration_form.html b/apps/wei/templates/wei/weiregistration_form.html
index 06a14be5cffa4f263aa00e89434d6866a3745cd4..5bec2c0fd471c91ffcaed89e180614efefc248c6 100644
--- a/apps/wei/templates/wei/weiregistration_form.html
+++ b/apps/wei/templates/wei/weiregistration_form.html
@@ -1,4 +1,4 @@
-{% extends "member/noteowner_detail.html" %}
+{% extends "wei/base.html" %}
{% load i18n %}
{% load crispy_forms_tags %}
diff --git a/apps/wei/templates/wei/weiregistration_list.html b/apps/wei/templates/wei/weiregistration_list.html
index 88c217aa44f6428b3a36e6195f7fecde10034d27..0fa8ef0f8e3384c6487307a0afe1290519c6c036 100644
--- a/apps/wei/templates/wei/weiregistration_list.html
+++ b/apps/wei/templates/wei/weiregistration_list.html
@@ -1,4 +1,4 @@
-{% extends "member/noteowner_detail.html" %}
+{% extends "wei/base.html" %}
{% load i18n %}
{% load render_table from django_tables2 %}
diff --git a/note_kfet/templates/400.html b/note_kfet/templates/400.html
index 35606525f45e6862b9c3a41a244c89adc825466d..8b96e81753c633a4877e028dd752bf9c1c23e335 100644
--- a/note_kfet/templates/400.html
+++ b/note_kfet/templates/400.html
@@ -1,8 +1,23 @@
{% extends "base.html" %}
-
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
{% load i18n %}
+{% block contenttitle %}{% endblock %}
{% block content %}
- <h1>{% trans "Bad request" %}</h1>
- {% blocktrans %}Sorry, your request was bad. Don't know what could be wrong. An email has been sent to webmasters with the details of the error. You can now drink a coke.{% endblocktrans %}
+<div class="card text-white bg-secondary">
+ <h3 class="card-header text-center">
+ {% trans "Bad request" %}
+ </h3>
+ <div class="card-body">
+ <p>
+ {% blocktrans trimmed %}
+ Sorry, your request was bad. Don't know what could be wrong.
+ An email has been sent to webmasters with the details of the error.
+ You can now drink a coke.
+ {% endblocktrans %}
+ </p>
+ </div>
+</div>
{% endblock %}
\ No newline at end of file
diff --git a/note_kfet/templates/403.html b/note_kfet/templates/403.html
index 317865f241bb7ce5a1bf97eb3434f2a7b8abc4c7..1019904315d6bfd55a49cf3477a4e82da49ff8c2 100644
--- a/note_kfet/templates/403.html
+++ b/note_kfet/templates/403.html
@@ -1,13 +1,20 @@
{% extends "base.html" %}
-
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
{% load i18n %}
+{% block contenttitle %}{% endblock %}
{% block content %}
- <h1>{% trans "Permission denied" %}</h1>
- {% blocktrans %}You don't have the right to perform this request.{% endblocktrans %}
- {% if exception %}
- <div>
- {% trans "Exception message:" %} {{ exception }}
- </div>
- {% endif %}
+<div class="card text-white bg-secondary">
+ <h3 class="card-header text-center">
+ {% trans "Permission denied" %}
+ </h3>
+ <div class="card-body">
+ <p>{% blocktrans %}You don't have the right to perform this request.{% endblocktrans %}</p>
+ {% if exception %}
+ <p>{% trans "Exception message:" %} {{ exception }}</p>
+ {% endif %}
+ </div>
+</div>
{% endblock %}
\ No newline at end of file
diff --git a/note_kfet/templates/404.html b/note_kfet/templates/404.html
index 8477f914d72460f4faae2d8176feac17362d163b..435bb7ecfbe41dbfc65151ac2dae1e4baf0e57a3 100644
--- a/note_kfet/templates/404.html
+++ b/note_kfet/templates/404.html
@@ -1,13 +1,24 @@
{% extends "base.html" %}
-
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
{% load i18n %}
+{% block contenttitle %}{% endblock %}
{% block content %}
- <h1>{% trans "Page not found" %}</h1>
- {% blocktrans %}The requested path <code>{{ request_path }}</code> was not found on the server.{% endblocktrans %}
- {% if exception != "Resolver404" %}
- <div>
- {% trans "Exception message:" %} {{ exception }}
- </div>
- {% endif %}
+<div class="card text-white bg-secondary">
+ <h3 class="card-header text-center">
+ {% trans "Page not found" %}
+ </h3>
+ <div class="card-body">
+ <p>
+ {% blocktrans trimmed %}
+ The requested path <code>{{ request_path }}</code> was not found on the server.
+ {% endblocktrans %}
+ </p>
+ {% if exception != "Resolver404" %}
+ <p>{% trans "Exception message:" %} {{ exception }}</p>
+ {% endif %}
+ </div>
+</div>
{% endblock %}
\ No newline at end of file
diff --git a/note_kfet/templates/500.html b/note_kfet/templates/500.html
index 50b62bc2a080aea5111a69d96045b35bb45abff5..ba4b587597142e12647d7ca8658066b0fbee304a 100644
--- a/note_kfet/templates/500.html
+++ b/note_kfet/templates/500.html
@@ -1,8 +1,23 @@
{% extends "base.html" %}
-
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
{% load i18n %}
+{% block contenttitle %}{% endblock %}
{% block content %}
- <h1>{% trans "Server error" %}</h1>
- {% blocktrans %}Sorry, an error occurred when processing your request. An email has been sent to webmasters with the detail of the error, and this will be fixed soon. You can now drink a beer.{% endblocktrans %}
+<div class="card text-white bg-secondary">
+ <h3 class="card-header text-center">
+ {% trans "Server error" %}
+ </h3>
+ <div class="card-body">
+ <p>
+ {% blocktrans trimmed %}
+ Sorry, an error occurred when processing your request.
+ An email has been sent to webmasters with the detail of the error,
+ and this will be fixed soon. You can now drink a beer.
+ {% endblocktrans %}
+ </p>
+ </div>
+</div>
{% endblock %}
\ No newline at end of file