diff --git a/apps/member/templates/member/user_list.html b/apps/member/templates/member/user_list.html index d605c492..5156c8b0 100644 --- a/apps/member/templates/member/user_list.html +++ b/apps/member/templates/member/user_list.html @@ -1,36 +1,42 @@ {% extends "base.html" %} +{% comment %} +SPDX-License-Identifier: GPL-3.0-or-later +{% endcomment %} {% load render_table from django_tables2 %} -{% load crispy_forms_tags %} -{% load i18n %} -{% load perms %} +{% load i18n crispy_forms_tags perms %} +{% block contenttitle %}{% endblock %} {% block content %} - +{% if "member.change_profile_registration_valid"|has_perm:user %} + + {% trans "Registrations" %} + +{% endif %} -
- -
- {% if table.data %} +
+

+ {{ title }} +

+
+ +
+
+
+ {% if table.data %} {% render_table table %} - {% else %} + {% else %}
{% trans "There is no user with this pattern." %}
- {% endif %} + {% endif %} +
- -
- - {% if "member.change_profile_registration_valid"|has_perm:user %} - - {% trans "Registrations" %} - - {% endif %} +
{% endblock %} {% block extrajavascript %} -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/note_kfet/templates/registration/logged_out.html b/note_kfet/templates/registration/logged_out.html index 3b044b7d..80dfc93e 100644 --- a/note_kfet/templates/registration/logged_out.html +++ b/note_kfet/templates/registration/logged_out.html @@ -3,8 +3,16 @@ SPDX-License-Identifier: GPL-3.0-or-later {% endcomment %} {% load i18n %} +{% block contenttitle %}{% endblock %} {% block content %} -

{% trans "Thanks for spending some quality time with the Web site today." %}

-

{% trans 'Log in again' %}

+
+

+ {{ title }} +

+
+

{% trans "Thanks for spending some quality time with the Web site today." %}

+

{% trans 'Log in again' %}

+
+
{% endblock %} diff --git a/note_kfet/templates/registration/password_change_done.html b/note_kfet/templates/registration/password_change_done.html index 150a00e9..6e949134 100644 --- a/note_kfet/templates/registration/password_change_done.html +++ b/note_kfet/templates/registration/password_change_done.html @@ -3,7 +3,15 @@ SPDX-License-Identifier: GPL-3.0-or-later {% endcomment %} {% load i18n %} +{% block contenttitle %}{% endblock %} {% block content %} -

{% trans 'Your password was changed.' %}

+
+

+ {{ title }} +

+
+

{% trans 'Your password was changed.' %}

+
+
{% endblock %} diff --git a/note_kfet/templates/registration/password_change_form.html b/note_kfet/templates/registration/password_change_form.html index 01133e4c..f594cbe1 100644 --- a/note_kfet/templates/registration/password_change_form.html +++ b/note_kfet/templates/registration/password_change_form.html @@ -3,11 +3,19 @@ SPDX-License-Identifier: GPL-3.0-or-later {% endcomment %} {% load i18n crispy_forms_tags %} +{% block contenttitle %}{% endblock %} {% block content %} -
{% csrf_token %} -

{% trans "Please enter your old password, for security's sake, and then enter your new password twice so we can verify you typed it in correctly." %}

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

+ {{ title }} +

+
+
{% csrf_token %} +

{% trans "Please enter your old password, for security's sake, and then enter your new password twice so we can verify you typed it in correctly." %}

+ {{ form | crispy }} + +
+
+
+{% endblock %} diff --git a/note_kfet/templates/registration/password_reset_complete.html b/note_kfet/templates/registration/password_reset_complete.html index bb91a3c5..46e823f7 100644 --- a/note_kfet/templates/registration/password_reset_complete.html +++ b/note_kfet/templates/registration/password_reset_complete.html @@ -3,10 +3,18 @@ SPDX-License-Identifier: GPL-3.0-or-later {% endcomment %} {% load i18n %} +{% block contenttitle %}{% endblock %} {% block content %} -

{% trans "Your password has been set. You may go ahead and log in now." %}

-

- {% trans 'Log in' %} -

+
+

+ {{ title }} +

+
+

{% trans "Your password has been set. You may go ahead and log in now." %}

+

+ {% trans 'Log in' %} +

+
+
{% endblock %} diff --git a/note_kfet/templates/registration/password_reset_confirm.html b/note_kfet/templates/registration/password_reset_confirm.html index 5db0e810..c55d56b5 100644 --- a/note_kfet/templates/registration/password_reset_confirm.html +++ b/note_kfet/templates/registration/password_reset_confirm.html @@ -3,15 +3,25 @@ SPDX-License-Identifier: GPL-3.0-or-later {% endcomment %} {% load i18n crispy_forms_tags %} +{% block contenttitle %}{% endblock %} {% block content %} - {% if validlink %} +
+

+ {{ title }} +

+
+ {% if validlink %}

{% trans "Please enter your new password twice so we can verify you typed it in correctly." %}

{% csrf_token %} {{ form | crispy }}
- {% else %} -

{% trans "The password reset link was invalid, possibly because it has already been used. Please request a new password reset." %}

- {% endif %} -{% endblock %} + {% else %} +

+ {% trans "The password reset link was invalid, possibly because it has already been used. Please request a new password reset." %} +

+ {% endif %} +
+
+{% endblock %} \ No newline at end of file diff --git a/note_kfet/templates/registration/password_reset_done.html b/note_kfet/templates/registration/password_reset_done.html index a215ab93..56271ae0 100644 --- a/note_kfet/templates/registration/password_reset_done.html +++ b/note_kfet/templates/registration/password_reset_done.html @@ -3,8 +3,16 @@ SPDX-License-Identifier: GPL-3.0-or-later {% endcomment %} {% load i18n %} +{% block contenttitle %}{% endblock %} {% block content %} -

{% trans "We've emailed you instructions for setting your password, if an account exists with the email you entered. You should receive them shortly." %}

-

{% trans "If you don't receive an email, please make sure you've entered the address you registered with, and check your spam folder." %}

+
+

+ {{ title }} +

+
+

{% trans "We've emailed you instructions for setting your password, if an account exists with the email you entered. You should receive them shortly." %}

+

{% trans "If you don't receive an email, please make sure you've entered the address you registered with, and check your spam folder." %}

+
+
{% endblock %} diff --git a/note_kfet/templates/registration/password_reset_form.html b/note_kfet/templates/registration/password_reset_form.html index e184ae2c..3f2d2f0f 100644 --- a/note_kfet/templates/registration/password_reset_form.html +++ b/note_kfet/templates/registration/password_reset_form.html @@ -8,7 +8,7 @@ SPDX-License-Identifier: GPL-3.0-or-later {% block content %}

- {% trans "Password reset" %} + {{ title }}

{% trans "Forgotten your password? Enter your email address below, and we'll email instructions for setting a new one." %}