From bac4467e7e176e537a2e2394b58ca899e611a87c Mon Sep 17 00:00:00 2001 From: Yoan Le Clanche Date: Thu, 1 Sep 2022 11:13:32 +0200 Subject: [PATCH] Fix issue with password reset template loading : https://trackers.pilotsystems.net/prebarreau/0488 --- teleforma/templates/registration/logged_out.html | 10 ---------- .../password_change_done.html | 0 .../password_change_form.html | 0 .../password_reset_complete.html | 0 .../password_reset_confirm.html | 0 .../password_reset_done.html | 0 .../password_reset_email.html | 0 .../password_reset_form.html | 0 teleforma/urls.py | 14 +++++++------- 9 files changed, 7 insertions(+), 17 deletions(-) delete mode 100644 teleforma/templates/registration/logged_out.html rename teleforma/templates/{registration => teleforma_registration}/password_change_done.html (100%) rename teleforma/templates/{registration => teleforma_registration}/password_change_form.html (100%) rename teleforma/templates/{registration => teleforma_registration}/password_reset_complete.html (100%) rename teleforma/templates/{registration => teleforma_registration}/password_reset_confirm.html (100%) rename teleforma/templates/{registration => teleforma_registration}/password_reset_done.html (100%) rename teleforma/templates/{registration => teleforma_registration}/password_reset_email.html (100%) rename teleforma/templates/{registration => teleforma_registration}/password_reset_form.html (100%) diff --git a/teleforma/templates/registration/logged_out.html b/teleforma/templates/registration/logged_out.html deleted file mode 100644 index 943c28b0..00000000 --- a/teleforma/templates/registration/logged_out.html +++ /dev/null @@ -1,10 +0,0 @@ -{% extends "teleforma/base.html" %} -{% load i18n %} - -{% block content %} - -

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

- -

{% trans 'Log in again' %}

- -{% endblock %} diff --git a/teleforma/templates/registration/password_change_done.html b/teleforma/templates/teleforma_registration/password_change_done.html similarity index 100% rename from teleforma/templates/registration/password_change_done.html rename to teleforma/templates/teleforma_registration/password_change_done.html diff --git a/teleforma/templates/registration/password_change_form.html b/teleforma/templates/teleforma_registration/password_change_form.html similarity index 100% rename from teleforma/templates/registration/password_change_form.html rename to teleforma/templates/teleforma_registration/password_change_form.html diff --git a/teleforma/templates/registration/password_reset_complete.html b/teleforma/templates/teleforma_registration/password_reset_complete.html similarity index 100% rename from teleforma/templates/registration/password_reset_complete.html rename to teleforma/templates/teleforma_registration/password_reset_complete.html diff --git a/teleforma/templates/registration/password_reset_confirm.html b/teleforma/templates/teleforma_registration/password_reset_confirm.html similarity index 100% rename from teleforma/templates/registration/password_reset_confirm.html rename to teleforma/templates/teleforma_registration/password_reset_confirm.html diff --git a/teleforma/templates/registration/password_reset_done.html b/teleforma/templates/teleforma_registration/password_reset_done.html similarity index 100% rename from teleforma/templates/registration/password_reset_done.html rename to teleforma/templates/teleforma_registration/password_reset_done.html diff --git a/teleforma/templates/registration/password_reset_email.html b/teleforma/templates/teleforma_registration/password_reset_email.html similarity index 100% rename from teleforma/templates/registration/password_reset_email.html rename to teleforma/templates/teleforma_registration/password_reset_email.html diff --git a/teleforma/templates/registration/password_reset_form.html b/teleforma/templates/teleforma_registration/password_reset_form.html similarity index 100% rename from teleforma/templates/registration/password_reset_form.html rename to teleforma/templates/teleforma_registration/password_reset_form.html diff --git a/teleforma/urls.py b/teleforma/urls.py index b0de2608..15541154 100644 --- a/teleforma/urls.py +++ b/teleforma/urls.py @@ -75,18 +75,18 @@ urlpatterns = [ # Registration # Registration - url(r'^accounts/password_change/$', PasswordChangeView.as_view(template_name='registration/password_change_form.html'), + url(r'^accounts/password_change/$', PasswordChangeView.as_view(template_name='teleforma_registration/password_change_form.html'), name="teleforma-password-change"), url(r'^accounts/password_change_done/$', PasswordChangeDoneView.as_view( - template_name='registration/password_change_done.html'), name="password_change_done"), + template_name='teleforma_registration/password_change_done.html'), name="password_change_done"), - url(r'^accounts/password_reset/$', PasswordResetView.as_view(template_name='registration/password_reset_form.html', - email_template_name='registration/password_reset_email.html'), name="teleforma-password-reset"), + url(r'^accounts/password_reset/$', PasswordResetView.as_view(template_name='teleforma_registration/password_reset_form.html', + email_template_name='teleforma_registration/password_reset_email.html'), name="teleforma-password-reset"), url(r'^accounts/password_reset_done/$', PasswordResetDoneView.as_view( - template_name='registration/password_reset_done.html'), name="password_reset_done"), + template_name='teleforma_registration/password_reset_done.html'), name="password_reset_done"), path('accounts/password_reset_confirm///', PasswordResetConfirmView.as_view( - template_name='registration/password_reset_confirm.html'), name="teleforma-password-reset-confirm"), - url(r'^accounts/password_reset_complete/$', PasswordResetCompleteView.as_view(template_name='registration/password_reset_complete.html'), + template_name='teleforma_registration/password_reset_confirm.html'), name="teleforma-password-reset-confirm"), + url(r'^accounts/password_reset_complete/$', PasswordResetCompleteView.as_view(template_name='teleforma_registration/password_reset_complete.html'), name="password_reset_complete"), # url(r'^captcha/', include('captcha.urls')), -- 2.39.5