From e3898d0b1e38426b78f6c2be543eb5396e51674f Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Sun, 23 Aug 2020 09:51:03 +0200 Subject: [PATCH 1/6] Cards on error pages --- note_kfet/templates/400.html | 20 +++++++++++++++++--- note_kfet/templates/403.html | 22 ++++++++++++++-------- note_kfet/templates/404.html | 26 ++++++++++++++++++-------- note_kfet/templates/500.html | 20 +++++++++++++++++--- 4 files changed, 66 insertions(+), 22 deletions(-) diff --git a/note_kfet/templates/400.html b/note_kfet/templates/400.html index 35606525..89d7ba85 100644 --- a/note_kfet/templates/400.html +++ b/note_kfet/templates/400.html @@ -1,8 +1,22 @@ {% extends "base.html" %} - +{% comment %} +SPDX-License-Identifier: GPL-3.0-or-later +{% endcomment %} {% load i18n %} {% block content %} -

{% trans "Bad request" %}

- {% 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 %} +
+

+ {% trans "Bad request" %} +

+
+

+ {% 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 %} +

+
+
{% endblock %} \ No newline at end of file diff --git a/note_kfet/templates/403.html b/note_kfet/templates/403.html index 317865f2..5256e32d 100644 --- a/note_kfet/templates/403.html +++ b/note_kfet/templates/403.html @@ -1,13 +1,19 @@ {% extends "base.html" %} - +{% comment %} +SPDX-License-Identifier: GPL-3.0-or-later +{% endcomment %} {% load i18n %} {% block content %} -

{% trans "Permission denied" %}

- {% blocktrans %}You don't have the right to perform this request.{% endblocktrans %} - {% if exception %} -
- {% trans "Exception message:" %} {{ exception }} -
- {% endif %} +
+

+ {% trans "Permission denied" %} +

+
+

{% blocktrans %}You don't have the right to perform this request.{% endblocktrans %}

+ {% if exception %} +

{% trans "Exception message:" %} {{ exception }}

+ {% endif %} +
+
{% endblock %} \ No newline at end of file diff --git a/note_kfet/templates/404.html b/note_kfet/templates/404.html index 8477f914..03b81658 100644 --- a/note_kfet/templates/404.html +++ b/note_kfet/templates/404.html @@ -1,13 +1,23 @@ {% extends "base.html" %} - +{% comment %} +SPDX-License-Identifier: GPL-3.0-or-later +{% endcomment %} {% load i18n %} {% block content %} -

{% trans "Page not found" %}

- {% blocktrans %}The requested path {{ request_path }} was not found on the server.{% endblocktrans %} - {% if exception != "Resolver404" %} -
- {% trans "Exception message:" %} {{ exception }} -
- {% endif %} +
+

+ {% trans "Page not found" %} +

+
+

+ {% blocktrans trimmed %} + The requested path {{ request_path }} was not found on the server. + {% endblocktrans %} +

+ {% if exception != "Resolver404" %} +

{% trans "Exception message:" %} {{ exception }}

+ {% endif %} +
+
{% endblock %} \ No newline at end of file diff --git a/note_kfet/templates/500.html b/note_kfet/templates/500.html index 50b62bc2..fb7d1c69 100644 --- a/note_kfet/templates/500.html +++ b/note_kfet/templates/500.html @@ -1,8 +1,22 @@ {% extends "base.html" %} - +{% comment %} +SPDX-License-Identifier: GPL-3.0-or-later +{% endcomment %} {% load i18n %} {% block content %} -

{% trans "Server error" %}

- {% 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 %} +
+

+ {% trans "Server error" %} +

+
+

+ {% 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 %} +

+
+
{% endblock %} \ No newline at end of file From 1c16d6ef183104316d983a34f46941cb5d2b9071 Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Sun, 23 Aug 2020 09:56:42 +0200 Subject: [PATCH 2/6] Use block.parent to extend content --- apps/member/templates/member/noteowner_detail.html | 2 -- apps/note/templates/note/search_transactions.html | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/apps/member/templates/member/noteowner_detail.html b/apps/member/templates/member/noteowner_detail.html index 4f5f7a1d..a27f61da 100644 --- a/apps/member/templates/member/noteowner_detail.html +++ b/apps/member/templates/member/noteowner_detail.html @@ -16,8 +16,6 @@ {% endblock %} - -{% block extra_content %}{% endblock %} {% endblock %} {% block extrajavascript %} diff --git a/apps/note/templates/note/search_transactions.html b/apps/note/templates/note/search_transactions.html index 89e571b0..9239ee87 100644 --- a/apps/note/templates/note/search_transactions.html +++ b/apps/note/templates/note/search_transactions.html @@ -22,7 +22,8 @@ {% crispy form %} {% endblock %} -{% block extra_content %} +{% block content %} + {{ block.super }}
{% render_table table %}
From cbc3e39bd6a0171b6b21dfb185990b0681bcd471 Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Sun, 23 Aug 2020 10:06:16 +0200 Subject: [PATCH 3/6] Create base template for member and wei --- apps/member/templates/member/add_members.html | 2 +- .../templates/member/{noteowner_detail.html => base.html} | 0 apps/member/templates/member/club_detail.html | 2 +- apps/member/templates/member/club_members.html | 2 +- apps/member/templates/member/profile_detail.html | 2 +- apps/note/templates/note/search_transactions.html | 2 +- apps/wei/templates/wei/base.html | 1 + apps/wei/templates/wei/bus_detail.html | 2 +- apps/wei/templates/wei/bus_form.html | 2 +- apps/wei/templates/wei/busteam_detail.html | 2 +- apps/wei/templates/wei/busteam_form.html | 2 +- apps/wei/templates/wei/survey.html | 2 +- apps/wei/templates/wei/survey_closed.html | 2 +- apps/wei/templates/wei/survey_end.html | 2 +- apps/wei/templates/wei/weiclub_detail.html | 2 +- apps/wei/templates/wei/weiclub_form.html | 2 +- apps/wei/templates/wei/weimembership_form.html | 2 +- apps/wei/templates/wei/weimembership_list.html | 2 +- apps/wei/templates/wei/weiregistration_confirm_delete.html | 2 +- apps/wei/templates/wei/weiregistration_form.html | 2 +- apps/wei/templates/wei/weiregistration_list.html | 2 +- 21 files changed, 20 insertions(+), 19 deletions(-) rename apps/member/templates/member/{noteowner_detail.html => base.html} (100%) create mode 100644 apps/wei/templates/wei/base.html diff --git a/apps/member/templates/member/add_members.html b/apps/member/templates/member/add_members.html index 8f429541..909e72b3 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 100% rename from apps/member/templates/member/noteowner_detail.html rename to apps/member/templates/member/base.html diff --git a/apps/member/templates/member/club_detail.html b/apps/member/templates/member/club_detail.html index bd6e8399..c3afee7b 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_members.html b/apps/member/templates/member/club_members.html index ed2debe4..9faff271 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/profile_detail.html b/apps/member/templates/member/profile_detail.html index 297af21c..51ec3095 100644 --- a/apps/member/templates/member/profile_detail.html +++ b/apps/member/templates/member/profile_detail.html @@ -1,4 +1,4 @@ -{% extends "member/noteowner_detail.html" %} +{% extends "member/base.html" %} {% block profile_info %} {% include "member/profile_info.html" %} diff --git a/apps/note/templates/note/search_transactions.html b/apps/note/templates/note/search_transactions.html index 9239ee87..2364a0b3 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 %} diff --git a/apps/wei/templates/wei/base.html b/apps/wei/templates/wei/base.html new file mode 100644 index 00000000..24778baf --- /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 1b335be8..fc5d14a2 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 4c7b22ce..3a2abfae 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 481e24ea..e262d64f 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 4c7b22ce..3a2abfae 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 36553849..357693fb 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 28c182ef..719168be 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 888290f7..a141a036 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 f359933f..4282964c 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 64edf798..30af2ea7 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 9a1a4d97..ba4401ef 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 d058211f..e0ed72fa 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 51bfc030..68d9c4a3 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 06a14be5..5bec2c0f 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 88c217aa..0fa8ef0f 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 %} From 44b7fe8f52ee8593e1ed7f9b29fdbf0cd99a36c6 Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Sun, 23 Aug 2020 12:07:04 +0200 Subject: [PATCH 4/6] List aliases on profile page --- apps/member/templates/member/base.html | 7 ++- .../templates/member/profile_detail.html | 22 +++---- .../member/templates/member/profile_info.html | 58 ++++++++++--------- 3 files changed, 44 insertions(+), 43 deletions(-) diff --git a/apps/member/templates/member/base.html b/apps/member/templates/member/base.html index a27f61da..9cb4bb6b 100644 --- a/apps/member/templates/member/base.html +++ b/apps/member/templates/member/base.html @@ -1,6 +1,7 @@ {% extends "base.html" %} -{% load static i18n pretty_money %} -{% load render_table from django_tables2 %} +{% comment %} +SPDX-License-Identifier: GPL-3.0-or-later +{% endcomment %} {# Use a fluid-width container #} {% block containertype %}container-fluid{% endblock %} @@ -9,10 +10,12 @@
{% block profile_info %} + {% include "member/profile_info.html" %} {% endblock %}
{% block profile_content %} + {% include "member/profile_tables.html" %} {% endblock %}
diff --git a/apps/member/templates/member/profile_detail.html b/apps/member/templates/member/profile_detail.html index 51ec3095..9df28c9f 100644 --- a/apps/member/templates/member/profile_detail.html +++ b/apps/member/templates/member/profile_detail.html @@ -1,18 +1,10 @@ {% extends "member/base.html" %} -{% block profile_info %} -{% include "member/profile_info.html" %} -{% endblock %} - -{% block profile_content %} -{% include "member/profile_tables.html" %} -{% endblock %} - {% block extrajavascript %} - -{% endblock %} + +{% 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 5d849a0a..4d92fe7e 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 %}
-
-

{% trans "Account #" %} {{ user_object.pk }}

+
+

{% trans "Account #" %}{{ user_object.pk }}

@@ -18,12 +18,12 @@
{{ user_object.username }}
{% if user_object.pk == user.pk %} -
{% trans 'password'|capfirst %}
-
- - {% trans 'Change password' %} - -
+
{% trans 'password'|capfirst %}
+
+ + {% trans 'Change password' %} + +
{% endif %}
{% trans 'section'|capfirst %}
@@ -33,32 +33,38 @@
{{ user_object.email }}
{% trans 'phone number'|capfirst %}
-
{{ user_object.profile.phone_number }}
+
{{ user_object.profile.phone_number }}
{% trans 'address'|capfirst %}
{{ user_object.profile.address }}
{% if "note.view_note"|has_perm:user_object.note %} -
{% trans 'balance'|capfirst %}
-
{{ user_object.note.balance | pretty_money }}
+
{% trans 'balance'|capfirst %}
+
{{ user_object.note.balance | pretty_money }}
-
{% trans 'paid'|capfirst %}
-
{{ user_object.profile.paid|yesno }}
+
{% trans 'paid'|capfirst %}
+
{{ user_object.profile.paid|yesno }}
{% endif %} - -
{% trans 'aliases'|capfirst %}
-
{{ user_object.note.alias_set.all|join:", " }}
- {% if user_object.pk == user_object.pk %} - {% trans 'Manage auth token' %} - {% endif %} +

{% trans 'aliases'|capfirst %}

+ {% for alias in user_object.note.alias_set.all %} + {{ alias }} + {% endfor %} +
- + +{% if user_object.pk == user_object.pk %} +{% trans 'Manage auth token' %} +{% endif %} \ No newline at end of file From c64de202a697d14500ccc42584e7236f300916d6 Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Sun, 23 Aug 2020 14:21:13 +0200 Subject: [PATCH 5/6] Remove title from error pages --- note_kfet/templates/400.html | 1 + note_kfet/templates/403.html | 1 + note_kfet/templates/404.html | 1 + note_kfet/templates/500.html | 1 + 4 files changed, 4 insertions(+) diff --git a/note_kfet/templates/400.html b/note_kfet/templates/400.html index 89d7ba85..8b96e817 100644 --- a/note_kfet/templates/400.html +++ b/note_kfet/templates/400.html @@ -3,6 +3,7 @@ SPDX-License-Identifier: GPL-3.0-or-later {% endcomment %} {% load i18n %} +{% block contenttitle %}{% endblock %} {% block content %}
diff --git a/note_kfet/templates/403.html b/note_kfet/templates/403.html index 5256e32d..10199043 100644 --- a/note_kfet/templates/403.html +++ b/note_kfet/templates/403.html @@ -3,6 +3,7 @@ SPDX-License-Identifier: GPL-3.0-or-later {% endcomment %} {% load i18n %} +{% block contenttitle %}{% endblock %} {% block content %}
diff --git a/note_kfet/templates/404.html b/note_kfet/templates/404.html index 03b81658..435bb7ec 100644 --- a/note_kfet/templates/404.html +++ b/note_kfet/templates/404.html @@ -3,6 +3,7 @@ SPDX-License-Identifier: GPL-3.0-or-later {% endcomment %} {% load i18n %} +{% block contenttitle %}{% endblock %} {% block content %}
diff --git a/note_kfet/templates/500.html b/note_kfet/templates/500.html index fb7d1c69..ba4b5875 100644 --- a/note_kfet/templates/500.html +++ b/note_kfet/templates/500.html @@ -3,6 +3,7 @@ SPDX-License-Identifier: GPL-3.0-or-later {% endcomment %} {% load i18n %} +{% block contenttitle %}{% endblock %} {% block content %}
From e14c8734c2b180d1d8a9f6e81e554fb6f9b8335a Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Sun, 23 Aug 2020 14:21:31 +0200 Subject: [PATCH 6/6] Template formating on member app --- apps/member/templates/member/base.html | 1 + apps/member/templates/member/club_info.html | 97 ++++++++++--------- .../templates/member/club_picture_update.html | 1 - .../member/templates/member/profile_info.html | 13 +-- .../member/profile_picture_update.html | 1 - .../templates/member/profile_update.html | 26 +++-- 6 files changed, 76 insertions(+), 63 deletions(-) diff --git a/apps/member/templates/member/base.html b/apps/member/templates/member/base.html index 9cb4bb6b..b61d869c 100644 --- a/apps/member/templates/member/base.html +++ b/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 %} diff --git a/apps/member/templates/member/club_info.html b/apps/member/templates/member/club_info.html index 8dcf5baa..bc76385b 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 %} -
-
-

Club {{ club.name }}

-
+{% load i18n pretty_money perms %} + +
+

+ Club {{ club.name }} +

@@ -14,43 +15,45 @@
{{ club.name }}
{% if club.parent_club %} -
{% trans 'Club Parent'|capfirst %}
-
{{ club.parent_club.name }}
+
+ {% trans 'Club Parent'|capfirst %} +
+
{{ club.parent_club.name }}
{% endif %} {% if club.require_memberships %} - {% if club.membership_start %} -
{% trans 'membership start'|capfirst %}
-
{{ club.membership_start }}
- {% endif %} + {% if club.membership_start %} +
{% trans 'membership start'|capfirst %}
+
{{ club.membership_start }}
+ {% endif %} - {% if club.membership_end %} -
{% trans 'membership end'|capfirst %}
-
{{ club.membership_end }}
- {% endif %} + {% if club.membership_end %} +
{% trans 'membership end'|capfirst %}
+
{{ club.membership_end }}
+ {% endif %} - {% if club.membership_duration %} -
{% trans 'membership duration'|capfirst %}
-
{{ club.membership_duration }} {% trans "days" %}
- {% endif %} + {% if club.membership_duration %} +
{% trans 'membership duration'|capfirst %}
+
{{ club.membership_duration }} {% trans "days" %}
+ {% endif %} - {% if club.membership_fee_paid == club.membership_fee_unpaid %} -
{% trans 'membership fee'|capfirst %}
-
{{ club.membership_fee_paid|pretty_money }}
- {% else %} -
{% trans 'membership fee (paid students)'|capfirst %}
-
{{ club.membership_fee_paid|pretty_money }}
+ {% if club.membership_fee_paid == club.membership_fee_unpaid %} +
{% trans 'membership fee'|capfirst %}
+
{{ club.membership_fee_paid|pretty_money }}
+ {% else %} +
{% trans 'membership fee (paid students)'|capfirst %}
+
{{ club.membership_fee_paid|pretty_money }}
-
{% trans 'membership fee (unpaid students)'|capfirst %}
-
{{ club.membership_fee_unpaid|pretty_money }}
- {% endif %} +
{% trans 'membership fee (unpaid students)'|capfirst %}
+
{{ club.membership_fee_unpaid|pretty_money }}
+ {% endif %} {% endif %} {% if "note.view_note"|has_perm:club.note %} -
{% trans 'balance'|capfirst %}
-
{{ club.note.balance | pretty_money }}
+
{% trans 'balance'|capfirst %}
+
{{ club.note.balance | pretty_money }}
{% endif %} - +
{% trans 'aliases'|capfirst %}
{{ club.note.alias_set.all|join:", " }}
@@ -59,17 +62,19 @@
{% if not club.weiclub %} - + {% endif %} -
+
\ No newline at end of file diff --git a/apps/member/templates/member/club_picture_update.html b/apps/member/templates/member/club_picture_update.html index 4f72efec..358fdd6e 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_info.html b/apps/member/templates/member/profile_info.html index 4d92fe7e..3fbf5e3d 100644 --- a/apps/member/templates/member/profile_info.html +++ b/apps/member/templates/member/profile_info.html @@ -1,9 +1,9 @@ {% load i18n pretty_money perms %} -
-
-

{% trans "Account #" %}{{ user_object.pk }}

-
+
+

+ {% trans "Account #" %}{{ user_object.pk }} +

{% if user_object.pk == user_object.pk %} -{% trans 'Manage auth token' %} + + {% trans 'Manage auth token' %} + {% 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 4be78dc8..c50a8299 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 a47a147b..19d97189 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 %} -
- {% csrf_token %} - {{ form|crispy }} - {{ profile_form|crispy }} - -
-{% endblock %} +
+

+ {{ title }} +

+
+
+ {% csrf_token %} + {{ form | crispy }} + {{ profile_form | crispy }} + +
+
+
+{% endblock %} \ No newline at end of file