From abbfa4aabba12c6b467d050f9ae9e513d4f2e7d1 Mon Sep 17 00:00:00 2001 From: Florian Date: Mon, 10 Jan 2022 15:53:48 +0100 Subject: [PATCH 01/30] Add `symfonycasts/reset-password-bundle@1.11` template --- config/packages/tabler.yaml | 1 - docs/reset_password_pages.md | 33 +++++++++++++++++ src/DependencyInjection/Configuration.php | 4 --- templates/security.html.twig | 2 +- templates/security/password-reset.html.twig | 30 ---------------- .../reset_password/check_email.html.twig | 15 ++++++++ .../security/reset_password/request.html.twig | 36 +++++++++++++++++++ .../security/reset_password/reset.html.twig | 21 +++++++++++ .../DependencyInjection/ConfigurationTest.php | 1 - 9 files changed, 106 insertions(+), 37 deletions(-) create mode 100644 docs/reset_password_pages.md delete mode 100644 templates/security/password-reset.html.twig create mode 100644 templates/security/reset_password/check_email.html.twig create mode 100644 templates/security/reset_password/request.html.twig create mode 100644 templates/security/reset_password/reset.html.twig diff --git a/config/packages/tabler.yaml b/config/packages/tabler.yaml index 691a6d99..df99f6cf 100644 --- a/config/packages/tabler.yaml +++ b/config/packages/tabler.yaml @@ -32,7 +32,6 @@ tabler: tabler_registration: registration tabler_registration_register: registration_register tabler_password_reset: resetting_request - tabler_password_reset_sent: resetting_send_email icons: # used for the action_collapsebutton components diff --git a/docs/reset_password_pages.md b/docs/reset_password_pages.md new file mode 100644 index 00000000..0adbda0a --- /dev/null +++ b/docs/reset_password_pages.md @@ -0,0 +1,33 @@ +# Using the layouts + +3 pre-implemented layout are available for the `reset-password` form. + +It is inspired by `symfonycasts/reset-password-bundle@1.11`. +See here: https://github.com/SymfonyCasts/reset-password-bundle + +File name and variable/from name follows what `reset-password-bundle` as generated by default. +You can of course, override everything if needed. + +In order to use the layouts, you should extend the one you want from `security/reset_password/`: +- check_email.html.twig +- request.html.twig +- reset.html.twig + +Here's an example for the request form with email. +```twig +{% extends '@Tabler/security/reset_password/request.html.twig' %} + +{% block logo_login %} + + + +{% endblock %} +``` + +## Layout blocks + +TODO explain blocks + +## Next steps + +Please go back to the [Tabler bundle documentation](README.md) to find out more about using the theme. diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php index 42fe32c5..0f44dcd0 100644 --- a/src/DependencyInjection/Configuration.php +++ b/src/DependencyInjection/Configuration.php @@ -79,10 +79,6 @@ private function getRouteAliasesConfig(): NodeDefinition ->defaultNull() ->info('name of the forgot-password form route') ->end() - ->scalarNode('tabler_password_reset_sent') - ->defaultNull() - ->info('name of the sent forgot-password email form route') - ->end() ->end() ->end(); diff --git a/templates/security.html.twig b/templates/security.html.twig index 36d2b32a..645204dc 100644 --- a/templates/security.html.twig +++ b/templates/security.html.twig @@ -16,7 +16,7 @@
-

{% block logo_login %}Tabler{% endblock %}

+ {% block logo_login %}

Tabler

{% endblock %}
diff --git a/templates/security/password-reset.html.twig b/templates/security/password-reset.html.twig deleted file mode 100644 index bcf55c41..00000000 --- a/templates/security/password-reset.html.twig +++ /dev/null @@ -1,30 +0,0 @@ -{% extends '@Tabler/security.html.twig' %} - -{% block login_social_auth %}{% endblock %} - -{% block login_box_msg %} - {{ 'Reset your password'|trans({}, 'TablerBundle') }} -{% endblock %} - -{% block login_form %} -
-
- - -
-
- -
-
-{% endblock %} - -{% block login_actions %} -
- - {{ 'Back to login'|trans({}, 'TablerBundle') }} - -
-{% endblock %} diff --git a/templates/security/reset_password/check_email.html.twig b/templates/security/reset_password/check_email.html.twig new file mode 100644 index 00000000..09fd5365 --- /dev/null +++ b/templates/security/reset_password/check_email.html.twig @@ -0,0 +1,15 @@ +{% extends '@Tabler/security.html.twig' %} + +{% block login_social_auth %}{% endblock %} + +{% block login_box_msg %} + {{ 'Password Reset Email Sent'|trans({}, 'TablerBundle') }} +{% endblock %} + +{% block login_form %} +

+ If an account matching your email exists, then an email was just sent that contains a link that you can use to reset your password. + This link will expire in {{ resetToken.expirationMessageKey|trans(resetToken.expirationMessageData, 'ResetPasswordBundle') }}. +

+

If you don't receive an email please check your spam folder or try again.

+{% endblock %} diff --git a/templates/security/reset_password/request.html.twig b/templates/security/reset_password/request.html.twig new file mode 100644 index 00000000..a9aec45c --- /dev/null +++ b/templates/security/reset_password/request.html.twig @@ -0,0 +1,36 @@ +{% extends '@Tabler/security.html.twig' %} + +{% block login_social_auth %}{% endblock %} + +{% block login_box_msg %} + {{ 'Forgot password'|trans({}, 'TablerBundle') }} +{% endblock %} + +{% block login_form %} + {% for flashError in app.flashes('reset_password_error') %} + + {% endfor %} + +

{{ 'Enter your email address and your password will be reset and emailed to you.'|trans({}, 'TablerBundle') }}

+ + {{ form_start(requestForm) }} + + {{ form_row(requestForm.email) }} + +
+ +
+ + {{ form_end(requestForm) }} +{% endblock %} + +{% block login_actions %} +
+ + {{ 'Back to login'|trans({}, 'TablerBundle') }} + +
+{% endblock %} diff --git a/templates/security/reset_password/reset.html.twig b/templates/security/reset_password/reset.html.twig new file mode 100644 index 00000000..1da8b946 --- /dev/null +++ b/templates/security/reset_password/reset.html.twig @@ -0,0 +1,21 @@ +{% extends '@Tabler/security.html.twig' %} + +{% block login_social_auth %}{% endblock %} + +{% block login_box_msg %} + {{ 'Reset your password'|trans({}, 'TablerBundle') }} +{% endblock %} + + +{% block login_form %} + {{ form_start(resetForm) }} + {{ form_row(resetForm.plainPassword) }} + +
+ +
+ + {{ form_end(resetForm) }} +{% endblock %} diff --git a/tests/DependencyInjection/ConfigurationTest.php b/tests/DependencyInjection/ConfigurationTest.php index e48518cd..84cce035 100644 --- a/tests/DependencyInjection/ConfigurationTest.php +++ b/tests/DependencyInjection/ConfigurationTest.php @@ -69,7 +69,6 @@ protected function getDefaultConfig() 'tabler_registration' => null, 'tabler_registration_register' => null, 'tabler_password_reset' => null, - 'tabler_password_reset_sent' => null, ], 'icons' => [], ] From eb0c25771bc29dc3a86b5f3e6433708b445177be Mon Sep 17 00:00:00 2001 From: CavasinF Date: Tue, 11 Jan 2022 08:55:14 +0100 Subject: [PATCH 02/30] Update templates/security.html.twig Co-authored-by: Kevin Papst --- templates/security.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/security.html.twig b/templates/security.html.twig index 645204dc..a54778fc 100644 --- a/templates/security.html.twig +++ b/templates/security.html.twig @@ -16,7 +16,7 @@
- {% block logo_login %}

Tabler

{% endblock %} + {% block logo_login %}

{% block title_login %}Tabler{% endblock %}

{% endblock %}
From b4eee0e0e97674091021c31e22911524b7f556f0 Mon Sep 17 00:00:00 2001 From: Florian Date: Tue, 11 Jan 2022 09:25:40 +0100 Subject: [PATCH 03/30] Re-use existing translations --- templates/security/reset_password/request.html.twig | 4 ++-- templates/security/reset_password/reset.html.twig | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/security/reset_password/request.html.twig b/templates/security/reset_password/request.html.twig index a9aec45c..d5191d18 100644 --- a/templates/security/reset_password/request.html.twig +++ b/templates/security/reset_password/request.html.twig @@ -3,7 +3,7 @@ {% block login_social_auth %}{% endblock %} {% block login_box_msg %} - {{ 'Forgot password'|trans({}, 'TablerBundle') }} + {{ 'I forgot my password'|trans({}, 'TablerBundle') }} {% endblock %} {% block login_form %} @@ -20,7 +20,7 @@
diff --git a/templates/security/reset_password/reset.html.twig b/templates/security/reset_password/reset.html.twig index 1da8b946..23669f5a 100644 --- a/templates/security/reset_password/reset.html.twig +++ b/templates/security/reset_password/reset.html.twig @@ -13,7 +13,7 @@
From 76b2781dbdbdd32ebb1476431417fe6fe093f9e9 Mon Sep 17 00:00:00 2001 From: Florian Date: Tue, 11 Jan 2022 09:26:05 +0100 Subject: [PATCH 04/30] Update link to redo password reset --- templates/security/reset_password/check_email.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/security/reset_password/check_email.html.twig b/templates/security/reset_password/check_email.html.twig index 09fd5365..b4788d23 100644 --- a/templates/security/reset_password/check_email.html.twig +++ b/templates/security/reset_password/check_email.html.twig @@ -11,5 +11,5 @@ If an account matching your email exists, then an email was just sent that contains a link that you can use to reset your password. This link will expire in {{ resetToken.expirationMessageKey|trans(resetToken.expirationMessageData, 'ResetPasswordBundle') }}.

-

If you don't receive an email please check your spam folder or try again.

+

If you don't receive an email please check your spam folder or try again.

{% endblock %} From 48432487fbf9a056c18b726a4104f808afc60920 Mon Sep 17 00:00:00 2001 From: Florian Date: Tue, 11 Jan 2022 10:42:01 +0100 Subject: [PATCH 05/30] Add default titles --- templates/security/reset_password/check_email.html.twig | 4 ++++ templates/security/reset_password/request.html.twig | 4 ++++ templates/security/reset_password/reset.html.twig | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/templates/security/reset_password/check_email.html.twig b/templates/security/reset_password/check_email.html.twig index b4788d23..fbb2edfc 100644 --- a/templates/security/reset_password/check_email.html.twig +++ b/templates/security/reset_password/check_email.html.twig @@ -2,6 +2,10 @@ {% block login_social_auth %}{% endblock %} +{% block title %} + {{ 'Password Reset Email Sent'|trans({}, 'TablerBundle') }} +{% endblock %} + {% block login_box_msg %} {{ 'Password Reset Email Sent'|trans({}, 'TablerBundle') }} {% endblock %} diff --git a/templates/security/reset_password/request.html.twig b/templates/security/reset_password/request.html.twig index d5191d18..ea8ceec0 100644 --- a/templates/security/reset_password/request.html.twig +++ b/templates/security/reset_password/request.html.twig @@ -2,6 +2,10 @@ {% block login_social_auth %}{% endblock %} +{% block title %} + {{ 'I forgot my password'|trans({}, 'TablerBundle') }} +{% endblock %} + {% block login_box_msg %} {{ 'I forgot my password'|trans({}, 'TablerBundle') }} {% endblock %} diff --git a/templates/security/reset_password/reset.html.twig b/templates/security/reset_password/reset.html.twig index 23669f5a..9e122350 100644 --- a/templates/security/reset_password/reset.html.twig +++ b/templates/security/reset_password/reset.html.twig @@ -2,6 +2,10 @@ {% block login_social_auth %}{% endblock %} +{% block title %} + {{ 'Reset your password'|trans({}, 'TablerBundle') }} +{% endblock %} + {% block login_box_msg %} {{ 'Reset your password'|trans({}, 'TablerBundle') }} {% endblock %} From 5c142960374c3ecefcff38dfa37def69b4788c6d Mon Sep 17 00:00:00 2001 From: Florian Date: Tue, 11 Jan 2022 10:45:52 +0100 Subject: [PATCH 06/30] Add block help request --- templates/security/reset_password/request.html.twig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/templates/security/reset_password/request.html.twig b/templates/security/reset_password/request.html.twig index ea8ceec0..69d3bd76 100644 --- a/templates/security/reset_password/request.html.twig +++ b/templates/security/reset_password/request.html.twig @@ -15,7 +15,9 @@ {% endfor %} -

{{ 'Enter your email address and your password will be reset and emailed to you.'|trans({}, 'TablerBundle') }}

+ {% block request_help %} +

{{ 'Enter your email address and your password will be reset and emailed to you.'|trans({}, 'TablerBundle') }}

+ {% endblock %} {{ form_start(requestForm) }} From 0807bdb4abde0a258da55fb1f39b0f850ab6bfff Mon Sep 17 00:00:00 2001 From: Florian Date: Tue, 11 Jan 2022 10:46:18 +0100 Subject: [PATCH 07/30] Fix indents --- .../security/reset_password/request.html.twig | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/templates/security/reset_password/request.html.twig b/templates/security/reset_password/request.html.twig index 69d3bd76..3c7eec13 100644 --- a/templates/security/reset_password/request.html.twig +++ b/templates/security/reset_password/request.html.twig @@ -11,26 +11,26 @@ {% endblock %} {% block login_form %} - {% for flashError in app.flashes('reset_password_error') %} - - {% endfor %} + {% for flashError in app.flashes('reset_password_error') %} + + {% endfor %} - {% block request_help %} -

{{ 'Enter your email address and your password will be reset and emailed to you.'|trans({}, 'TablerBundle') }}

- {% endblock %} + {% block request_help %} +

{{ 'Enter your email address and your password will be reset and emailed to you.'|trans({}, 'TablerBundle') }}

+ {% endblock %} - {{ form_start(requestForm) }} + {{ form_start(requestForm) }} - {{ form_row(requestForm.email) }} + {{ form_row(requestForm.email) }} -
- -
+
+ +
- {{ form_end(requestForm) }} + {{ form_end(requestForm) }} {% endblock %} {% block login_actions %} From c3f016eb0a23da61ae155fc7e4ce245c82d0c558 Mon Sep 17 00:00:00 2001 From: Florian Date: Tue, 11 Jan 2022 14:01:51 +0100 Subject: [PATCH 08/30] Add base template for `reset_password` templates --- docs/reset_password_pages.md | 14 ++++++++++---- templates/security/reset_password/base.html.twig | 9 +++++++++ .../security/reset_password/check_email.html.twig | 4 +--- .../security/reset_password/request.html.twig | 8 +------- templates/security/reset_password/reset.html.twig | 5 +---- 5 files changed, 22 insertions(+), 18 deletions(-) create mode 100644 templates/security/reset_password/base.html.twig diff --git a/docs/reset_password_pages.md b/docs/reset_password_pages.md index 0adbda0a..7a1bb2cb 100644 --- a/docs/reset_password_pages.md +++ b/docs/reset_password_pages.md @@ -1,14 +1,15 @@ # Using the layouts -3 pre-implemented layout are available for the `reset-password` form. +3 pre-implemented layouts are available for the `reset-password` form. -It is inspired by `symfonycasts/reset-password-bundle@1.11`. +There are inspired by `symfonycasts/reset-password-bundle@1.11`. See here: https://github.com/SymfonyCasts/reset-password-bundle -File name and variable/from name follows what `reset-password-bundle` as generated by default. +Filenames and variables/forms name follows what `reset-password-bundle` as generated by default. You can of course, override everything if needed. -In order to use the layouts, you should extend the one you want from `security/reset_password/`: +In order to use the layouts, +you should extend the one you want from `security/reset_password/`: - check_email.html.twig - request.html.twig - reset.html.twig @@ -24,6 +25,11 @@ Here's an example for the request form with email. {% endblock %} ``` +You shouldn't directly extend `@Tabler\security\reset_password\base.html.twig`, +it's only there to emptying the `login_social_auth` block, and add the flash errors. + +If you want to make you own template with that base, you can. + ## Layout blocks TODO explain blocks diff --git a/templates/security/reset_password/base.html.twig b/templates/security/reset_password/base.html.twig new file mode 100644 index 00000000..54250f43 --- /dev/null +++ b/templates/security/reset_password/base.html.twig @@ -0,0 +1,9 @@ +{% extends '@Tabler/security.html.twig' %} + +{% block login_social_auth %}{% endblock %} + +{% block login_box_error %} + {% for flashError in app.flashes('reset_password_error') %} +
{{ flashError }}
+ {% endfor %} +{% endblock %} diff --git a/templates/security/reset_password/check_email.html.twig b/templates/security/reset_password/check_email.html.twig index fbb2edfc..889adf09 100644 --- a/templates/security/reset_password/check_email.html.twig +++ b/templates/security/reset_password/check_email.html.twig @@ -1,6 +1,4 @@ -{% extends '@Tabler/security.html.twig' %} - -{% block login_social_auth %}{% endblock %} +{% extends '@Tabler/security/reset_password/base.html.twig' %} {% block title %} {{ 'Password Reset Email Sent'|trans({}, 'TablerBundle') }} diff --git a/templates/security/reset_password/request.html.twig b/templates/security/reset_password/request.html.twig index 3c7eec13..da930113 100644 --- a/templates/security/reset_password/request.html.twig +++ b/templates/security/reset_password/request.html.twig @@ -1,6 +1,4 @@ -{% extends '@Tabler/security.html.twig' %} - -{% block login_social_auth %}{% endblock %} +{% extends '@Tabler/security/reset_password/base.html.twig' %} {% block title %} {{ 'I forgot my password'|trans({}, 'TablerBundle') }} @@ -11,10 +9,6 @@ {% endblock %} {% block login_form %} - {% for flashError in app.flashes('reset_password_error') %} - - {% endfor %} - {% block request_help %}

{{ 'Enter your email address and your password will be reset and emailed to you.'|trans({}, 'TablerBundle') }}

{% endblock %} diff --git a/templates/security/reset_password/reset.html.twig b/templates/security/reset_password/reset.html.twig index 9e122350..2bc9ebd1 100644 --- a/templates/security/reset_password/reset.html.twig +++ b/templates/security/reset_password/reset.html.twig @@ -1,6 +1,4 @@ -{% extends '@Tabler/security.html.twig' %} - -{% block login_social_auth %}{% endblock %} +{% extends '@Tabler/security/reset_password/base.html.twig' %} {% block title %} {{ 'Reset your password'|trans({}, 'TablerBundle') }} @@ -10,7 +8,6 @@ {{ 'Reset your password'|trans({}, 'TablerBundle') }} {% endblock %} - {% block login_form %} {{ form_start(resetForm) }} {{ form_row(resetForm.plainPassword) }} From fb0834eb79a738742cb05f6c56788a7cb3a8e6c3 Mon Sep 17 00:00:00 2001 From: Florian Date: Tue, 11 Jan 2022 14:07:48 +0100 Subject: [PATCH 09/30] Update DOC --- docs/reset_password_pages.md | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/docs/reset_password_pages.md b/docs/reset_password_pages.md index 7a1bb2cb..8f6f0337 100644 --- a/docs/reset_password_pages.md +++ b/docs/reset_password_pages.md @@ -1,4 +1,4 @@ -# Using the layouts +## How it was made 3 pre-implemented layouts are available for the `reset-password` form. @@ -6,15 +6,17 @@ There are inspired by `symfonycasts/reset-password-bundle@1.11`. See here: https://github.com/SymfonyCasts/reset-password-bundle Filenames and variables/forms name follows what `reset-password-bundle` as generated by default. -You can of course, override everything if needed. +You can of course override everything if needed. + +## Using the layout In order to use the layouts, -you should extend the one you want from `security/reset_password/`: +you should extend the one you want from `@Tabler/security/reset_password/`: - check_email.html.twig - request.html.twig - reset.html.twig -Here's an example for the request form with email. +Here's an example for the reset request form with the email input. ```twig {% extends '@Tabler/security/reset_password/request.html.twig' %} @@ -25,10 +27,12 @@ Here's an example for the request form with email. {% endblock %} ``` +### Extra + You shouldn't directly extend `@Tabler\security\reset_password\base.html.twig`, it's only there to emptying the `login_social_auth` block, and add the flash errors. -If you want to make you own template with that base, you can. +If you want to make your own template with that base, you can. ## Layout blocks From 328c8d16a1b0e147766e3efea0e997f8a8859abb Mon Sep 17 00:00:00 2001 From: Florian Date: Mon, 31 Jan 2022 09:18:08 +0100 Subject: [PATCH 10/30] Add french translations --- .../reset_password/check_email.html.twig | 6 +++--- .../security/reset_password/request.html.twig | 2 +- translations/TablerBundle.fr.xliff | 20 +++++++++++++++++++ 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/templates/security/reset_password/check_email.html.twig b/templates/security/reset_password/check_email.html.twig index 889adf09..3c404803 100644 --- a/templates/security/reset_password/check_email.html.twig +++ b/templates/security/reset_password/check_email.html.twig @@ -9,9 +9,9 @@ {% endblock %} {% block login_form %} + {% set token = resetToken.expirationMessageKey|trans(resetToken.expirationMessageData, 'ResetPasswordBundle') %}

- If an account matching your email exists, then an email was just sent that contains a link that you can use to reset your password. - This link will expire in {{ resetToken.expirationMessageKey|trans(resetToken.expirationMessageData, 'ResetPasswordBundle') }}. + {{ 'If an account matching your email exists, then an email was just sent that contains a link that you can use to reset your password. This link will expire in %token%.' | trans({'%token%' : token}, 'TablerBundle') }}

-

If you don't receive an email please check your spam folder or try again.

+

{{ "If you don't receive an email please check your spam folder or"|trans({}, 'TablerBundle') }} {{ 'Try again'|trans({}, 'TablerBundle') }}.

{% endblock %} diff --git a/templates/security/reset_password/request.html.twig b/templates/security/reset_password/request.html.twig index da930113..e8746d8d 100644 --- a/templates/security/reset_password/request.html.twig +++ b/templates/security/reset_password/request.html.twig @@ -10,7 +10,7 @@ {% block login_form %} {% block request_help %} -

{{ 'Enter your email address and your password will be reset and emailed to you.'|trans({}, 'TablerBundle') }}

+

{{ 'Enter your email address and your password will be reset and emailed to you'|trans({}, 'TablerBundle') }}

{% endblock %} {{ form_start(requestForm) }} diff --git a/translations/TablerBundle.fr.xliff b/translations/TablerBundle.fr.xliff index 728c773a..2acdd33e 100644 --- a/translations/TablerBundle.fr.xliff +++ b/translations/TablerBundle.fr.xliff @@ -106,6 +106,26 @@ Take me home Retourner au début + + Password Reset Email Sent + Email pour reset envoyé + + + Enter your email address and your password will be reset and emailed to you + Saisissez votre adresse email et votre mot de passe sera réinitialisé par mail + + + If an account matching your email exists, then an email was just sent that contains a link that you can use to reset your password.This link will expire in %token%. + Si un compte correspond à l'adresse renseignée, un email vient d'être envoyé contenant un lien afin de réinitialiser votre mot de passe. Ce lien expire dans %token%. + + + If you don't receive an email please check your spam folder or + Si vous n'avez pas reçu d'email, merci de vérifier vos spams ou + + + Try again + Essayer à nouveau + From 2b61facb13db35e96ef3d37ed7f59698f6f85627 Mon Sep 17 00:00:00 2001 From: Florian Date: Tue, 1 Feb 2022 09:59:40 +0100 Subject: [PATCH 11/30] BugFix translation FR --- translations/TablerBundle.fr.xliff | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/translations/TablerBundle.fr.xliff b/translations/TablerBundle.fr.xliff index 2acdd33e..cdb8d128 100644 --- a/translations/TablerBundle.fr.xliff +++ b/translations/TablerBundle.fr.xliff @@ -108,14 +108,14 @@ Password Reset Email Sent - Email pour reset envoyé + Email réinitialisation de mot de passe envoyé Enter your email address and your password will be reset and emailed to you Saisissez votre adresse email et votre mot de passe sera réinitialisé par mail - If an account matching your email exists, then an email was just sent that contains a link that you can use to reset your password.This link will expire in %token%. + If an account matching your email exists, then an email was just sent that contains a link that you can use to reset your password. This link will expire in %token%. Si un compte correspond à l'adresse renseignée, un email vient d'être envoyé contenant un lien afin de réinitialiser votre mot de passe. Ce lien expire dans %token%. From 01489775a41101c02df28c52420795d82e01c11e Mon Sep 17 00:00:00 2001 From: CavasinF Date: Tue, 17 May 2022 16:57:47 +0200 Subject: [PATCH 12/30] Add more detailed french translations --- translations/TablerBundle.fr.xliff | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/translations/TablerBundle.fr.xliff b/translations/TablerBundle.fr.xliff index cdb8d128..622996b3 100644 --- a/translations/TablerBundle.fr.xliff +++ b/translations/TablerBundle.fr.xliff @@ -108,11 +108,11 @@ Password Reset Email Sent - Email réinitialisation de mot de passe envoyé + E-mail de réinitialisation du mot de passe a été envoyé Enter your email address and your password will be reset and emailed to you - Saisissez votre adresse email et votre mot de passe sera réinitialisé par mail + Saisissez votre adresse e-mail et la procédure de réinitialisation de votre mot de passe vous sera envoyée par mail If an account matching your email exists, then an email was just sent that contains a link that you can use to reset your password. This link will expire in %token%. From d72b4226e82a5743fbaf3363b6d6cfbea1076e20 Mon Sep 17 00:00:00 2001 From: Cavasin F Date: Mon, 19 Dec 2022 14:22:56 +0100 Subject: [PATCH 13/30] Ranme `base` into `_layout` + use submit button macro --- .../{base.html.twig => _layout.html.twig} | 0 .../security/reset_password/check_email.html.twig | 2 +- templates/security/reset_password/request.html.twig | 12 +++++++----- templates/security/reset_password/reset.html.twig | 12 ++++++++---- 4 files changed, 16 insertions(+), 10 deletions(-) rename templates/security/reset_password/{base.html.twig => _layout.html.twig} (100%) diff --git a/templates/security/reset_password/base.html.twig b/templates/security/reset_password/_layout.html.twig similarity index 100% rename from templates/security/reset_password/base.html.twig rename to templates/security/reset_password/_layout.html.twig diff --git a/templates/security/reset_password/check_email.html.twig b/templates/security/reset_password/check_email.html.twig index 3c404803..1c223f8c 100644 --- a/templates/security/reset_password/check_email.html.twig +++ b/templates/security/reset_password/check_email.html.twig @@ -1,4 +1,4 @@ -{% extends '@Tabler/security/reset_password/base.html.twig' %} +{% extends '@Tabler/security/reset_password/_layout.html.twig' %} {% block title %} {{ 'Password Reset Email Sent'|trans({}, 'TablerBundle') }} diff --git a/templates/security/reset_password/request.html.twig b/templates/security/reset_password/request.html.twig index e8746d8d..490bffbc 100644 --- a/templates/security/reset_password/request.html.twig +++ b/templates/security/reset_password/request.html.twig @@ -1,4 +1,5 @@ -{% extends '@Tabler/security/reset_password/base.html.twig' %} +{% extends '@Tabler/security/reset_password/_layout.html.twig' %} +{% from '@Tabler/components/buttons.html.twig' import submit_button %} {% block title %} {{ 'I forgot my password'|trans({}, 'TablerBundle') }} @@ -18,10 +19,11 @@ {{ form_row(requestForm.email) }}
- + {{ submit_button('mail', { + title : 'Reset your password'|trans({}, 'TablerBundle'), + class : 'w-100', + combined : true, + }, 'primary') }}
{{ form_end(requestForm) }} diff --git a/templates/security/reset_password/reset.html.twig b/templates/security/reset_password/reset.html.twig index 2bc9ebd1..5b1d4e06 100644 --- a/templates/security/reset_password/reset.html.twig +++ b/templates/security/reset_password/reset.html.twig @@ -1,4 +1,5 @@ -{% extends '@Tabler/security/reset_password/base.html.twig' %} +{% extends '@Tabler/security/reset_password/_layout.html.twig' %} +{% from '@Tabler/components/buttons.html.twig' import submit_button %} {% block title %} {{ 'Reset your password'|trans({}, 'TablerBundle') }} @@ -10,12 +11,15 @@ {% block login_form %} {{ form_start(resetForm) }} + {{ form_row(resetForm.plainPassword) }}
- + {{ submit_button(false, { + title : 'Reset your password'|trans({}, 'TablerBundle'), + class : 'w-100', + combined : true, + }, 'primary') }}
{{ form_end(resetForm) }} From bf1f2367a81bccbd92a16a1557235b6317efe64c Mon Sep 17 00:00:00 2001 From: Cavasin F Date: Fri, 23 Dec 2022 14:41:15 +0100 Subject: [PATCH 14/30] Remove unused password-reset html --- templates/security/password-reset.html.twig | 28 --------------------- 1 file changed, 28 deletions(-) delete mode 100644 templates/security/password-reset.html.twig diff --git a/templates/security/password-reset.html.twig b/templates/security/password-reset.html.twig deleted file mode 100644 index 80ea8905..00000000 --- a/templates/security/password-reset.html.twig +++ /dev/null @@ -1,28 +0,0 @@ -{% extends '@Tabler/security.html.twig' %} - -{% block login_social_auth %}{% endblock %} - -{% block login_box_msg %} - {{ 'Reset your password'|trans({}, 'TablerBundle') }} -{% endblock %} - -{% block login_form %} -
-
- - -
-
- {% from '@Tabler/components/buttons.html.twig' import submit_button %} - {{ submit_button('mail', {class: 'w-100', title: 'Reset your password', translation_domain: 'TablerBundle'}, 'primary') }} -
-
-{% endblock %} - -{% block login_actions %} -
- - {{ 'Back to login'|trans({}, 'TablerBundle') }} - -
-{% endblock %} From 9b34bae69c2c31c9def64deae2a9a4171b3ca197 Mon Sep 17 00:00:00 2001 From: Cavasin F Date: Fri, 23 Dec 2022 15:02:03 +0100 Subject: [PATCH 15/30] Rervert BC break from login logo --- templates/security.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/security.html.twig b/templates/security.html.twig index d7e67709..cca77cd2 100644 --- a/templates/security.html.twig +++ b/templates/security.html.twig @@ -18,7 +18,7 @@
- {% block logo_login %}

{% block title_login %}Tabler{% endblock %}

{% endblock %} + {% block logo_container %}

{% block logo_login %}Tabler{% endblock %}

{% endblock %}
From 4f4dfcac2f55bb82bd17b44a91f850b1efa85ed5 Mon Sep 17 00:00:00 2001 From: Cavasin F Date: Fri, 23 Dec 2022 15:02:19 +0100 Subject: [PATCH 16/30] Add default english translation --- translations/TablerBundle.en.xlf | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/translations/TablerBundle.en.xlf b/translations/TablerBundle.en.xlf index de2c1b51..5a5a9d93 100644 --- a/translations/TablerBundle.en.xlf +++ b/translations/TablerBundle.en.xlf @@ -110,6 +110,26 @@ Take me home Take me home + + Password Reset Email Sent + Password Reset Email Sent + + + Enter your email address and your password will be reset and emailed to you + Enter your email address and your password will be reset and emailed to you + + + If an account matching your email exists, then an email was just sent that contains a link that you can use to reset your password. This link will expire in %token%. + If an account matching your email exists, then an email was just sent that contains a link that you can use to reset your password. This link will expire in %token%. + + + If you don't receive an email please check your spam folder or + If you don't receive an email please check your spam folder or + + + Try again + Try again + http_error.title Error From cf49f7858122c151afe3722357e5b885df078313 Mon Sep 17 00:00:00 2001 From: Cavasin F Date: Fri, 23 Dec 2022 15:29:03 +0100 Subject: [PATCH 17/30] Revert "Remove unused password-reset html" This reverts commit bf1f2367a81bccbd92a16a1557235b6317efe64c. --- templates/security/password-reset.html.twig | 28 +++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 templates/security/password-reset.html.twig diff --git a/templates/security/password-reset.html.twig b/templates/security/password-reset.html.twig new file mode 100644 index 00000000..80ea8905 --- /dev/null +++ b/templates/security/password-reset.html.twig @@ -0,0 +1,28 @@ +{% extends '@Tabler/security.html.twig' %} + +{% block login_social_auth %}{% endblock %} + +{% block login_box_msg %} + {{ 'Reset your password'|trans({}, 'TablerBundle') }} +{% endblock %} + +{% block login_form %} +
+
+ + +
+
+ {% from '@Tabler/components/buttons.html.twig' import submit_button %} + {{ submit_button('mail', {class: 'w-100', title: 'Reset your password', translation_domain: 'TablerBundle'}, 'primary') }} +
+
+{% endblock %} + +{% block login_actions %} +
+ + {{ 'Back to login'|trans({}, 'TablerBundle') }} + +
+{% endblock %} From 37539d76208e8ac0fdbd078f21fdb5631ed3b533 Mon Sep 17 00:00:00 2001 From: Cavasin F Date: Fri, 23 Dec 2022 15:32:08 +0100 Subject: [PATCH 18/30] Deprecate the `password-reset` template --- templates/security/password-reset.html.twig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/security/password-reset.html.twig b/templates/security/password-reset.html.twig index 80ea8905..8630ae64 100644 --- a/templates/security/password-reset.html.twig +++ b/templates/security/password-reset.html.twig @@ -1,3 +1,5 @@ +{% deprecated 'This template is deprecated, use your own logic that extends from `@Tabler/security.html.twig` instead OR take a look at /docs/reset_password_pages.md' %} + {% extends '@Tabler/security.html.twig' %} {% block login_social_auth %}{% endblock %} From 78d7a9d99f1a096bad82ca9662914e968eff6f59 Mon Sep 17 00:00:00 2001 From: Cavasin F Date: Thu, 5 Jan 2023 14:40:26 +0100 Subject: [PATCH 19/30] Revert delete config option --- config/packages/tabler.yaml | 1 + tests/DependencyInjection/ConfigurationTest.php | 1 + 2 files changed, 2 insertions(+) diff --git a/config/packages/tabler.yaml b/config/packages/tabler.yaml index 3650cebe..2933b1f8 100644 --- a/config/packages/tabler.yaml +++ b/config/packages/tabler.yaml @@ -38,6 +38,7 @@ tabler: tabler_registration: registration tabler_registration_register: registration_register tabler_password_reset: resetting_request + tabler_password_reset_sent: resetting_send_email icons: # used for the action_collapsebutton components diff --git a/tests/DependencyInjection/ConfigurationTest.php b/tests/DependencyInjection/ConfigurationTest.php index 22a5f2f5..784ba8c4 100644 --- a/tests/DependencyInjection/ConfigurationTest.php +++ b/tests/DependencyInjection/ConfigurationTest.php @@ -72,6 +72,7 @@ protected function getDefaultConfig() 'tabler_registration' => null, 'tabler_registration_register' => null, 'tabler_password_reset' => null, + 'tabler_password_reset_sent' => null, ], 'icons' => [], ] From 33a95c68545eb6cfdcdb687a52eaabd7eccab2f2 Mon Sep 17 00:00:00 2001 From: Cavasin F Date: Thu, 5 Jan 2023 14:41:23 +0100 Subject: [PATCH 20/30] Revert delete config option --- src/DependencyInjection/Configuration.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php index 11fca454..43f04698 100644 --- a/src/DependencyInjection/Configuration.php +++ b/src/DependencyInjection/Configuration.php @@ -79,6 +79,10 @@ private function getRouteAliasesConfig(): NodeDefinition ->defaultNull() ->info('name of the forgot-password form route') ->end() + ->scalarNode('tabler_password_reset_sent') + ->defaultNull() + ->info('name of the sent forgot-password email form route') + ->end() ->end() ->end(); From f85204b8fecb657d8de9adcf4de0411fc69a2e91 Mon Sep 17 00:00:00 2001 From: Cavasin F Date: Fri, 6 Jan 2023 08:52:29 +0100 Subject: [PATCH 21/30] Add link to doc --- docs/index.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/index.md b/docs/index.md index 8e0b414d..b863fe7f 100644 --- a/docs/index.md +++ b/docs/index.md @@ -9,6 +9,7 @@ If you cannot find the needed information in this list of topics, please create * [Override theme](override_theme.md) * [Access bundle configuration](twig-context.md) * [Customizing forms](form_theme.md) +* [Reset password templates](reset_password_pages.md) Components (Twig macros): From aafd6fdbb3bd2fc12b687de8ab210b5edea599fd Mon Sep 17 00:00:00 2001 From: Cavasin F Date: Fri, 6 Jan 2023 08:52:54 +0100 Subject: [PATCH 22/30] Suggest reset-password-bundle --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 84696b3f..8456268a 100644 --- a/composer.json +++ b/composer.json @@ -34,7 +34,8 @@ "knplabs/knp-menu-bundle": "^3.0" }, "suggest" : { - "knplabs/knp-menu-bundle" : "Allows easy menu integration" + "knplabs/knp-menu-bundle" : "Allows easy menu integration", + "symfonycasts/reset-password-bundle" : "Includes all Symfony logic to reset user password" }, "autoload": { "psr-4": { From 703d23d3d0ca7057655ff2e7364e9bd041ece3dd Mon Sep 17 00:00:00 2001 From: Cavasin F Date: Fri, 6 Jan 2023 08:53:13 +0100 Subject: [PATCH 23/30] Add german translations --- translations/TablerBundle.de.xlf | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/translations/TablerBundle.de.xlf b/translations/TablerBundle.de.xlf index 5ccef1a5..82720291 100644 --- a/translations/TablerBundle.de.xlf +++ b/translations/TablerBundle.de.xlf @@ -146,6 +146,26 @@ Next Weiter + + Password Reset Email Sent + E-Mail für die Zurücksetzung des Passwort wurde gesendet + + + Enter your email address and your password will be reset and emailed to you + Geben Sie Ihre E-Mail Adresse an und Sie bekommen eine Nachricht um Ihr Passwort zurückzusetzen + + + If an account matching your email exists, then an email was just sent that contains a link that you can use to reset your password. This link will expire in %token%. + Wenn ein Zugang mit Ihrer E-Mail existiert, wurde soeben eine E-Mail dorthin versendet, welche eine Link beinhaltet, mit dem Sie Ihr Passwort zurücksetzen können. Dieser Link wird ablaufen in %token%. + + + If you don't receive an email please check your spam folder or + Wenn Sie keine E-Mail erhalten, überprüfen Sie bitte Ihren Spam Ordner oder/target> + + + Try again + Versuchen Sie es erneut + From 2ae492a402fbbd05e2abde1feb5bdff3b881d5d4 Mon Sep 17 00:00:00 2001 From: Cavasin F Date: Fri, 6 Jan 2023 08:59:42 +0100 Subject: [PATCH 24/30] `check_email.html.twig` should be `check-email.html.twig` --- docs/reset_password_pages.md | 2 +- .../{check_email.html.twig => check-email.html.twig} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename templates/security/reset_password/{check_email.html.twig => check-email.html.twig} (100%) diff --git a/docs/reset_password_pages.md b/docs/reset_password_pages.md index 8f6f0337..858a0d45 100644 --- a/docs/reset_password_pages.md +++ b/docs/reset_password_pages.md @@ -12,7 +12,7 @@ You can of course override everything if needed. In order to use the layouts, you should extend the one you want from `@Tabler/security/reset_password/`: -- check_email.html.twig +- check-email.html.twig - request.html.twig - reset.html.twig diff --git a/templates/security/reset_password/check_email.html.twig b/templates/security/reset_password/check-email.html.twig similarity index 100% rename from templates/security/reset_password/check_email.html.twig rename to templates/security/reset_password/check-email.html.twig From 5681f15a7c5c548c171e911b7acb54852dc10e51 Mon Sep 17 00:00:00 2001 From: Cavasin F Date: Fri, 6 Jan 2023 10:01:04 +0100 Subject: [PATCH 25/30] Update DOC --- docs/reset_password_pages.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/reset_password_pages.md b/docs/reset_password_pages.md index 858a0d45..3405bc73 100644 --- a/docs/reset_password_pages.md +++ b/docs/reset_password_pages.md @@ -29,7 +29,7 @@ Here's an example for the reset request form with the email input. ### Extra -You shouldn't directly extend `@Tabler\security\reset_password\base.html.twig`, +You shouldn't directly extend `@Tabler\security\reset_password\_layout.html.twig`, it's only there to emptying the `login_social_auth` block, and add the flash errors. If you want to make your own template with that base, you can. From fbacc9f0cea90fe6758195324ac6fef3d5812319 Mon Sep 17 00:00:00 2001 From: Cavasin F Date: Fri, 6 Jan 2023 14:02:09 +0100 Subject: [PATCH 26/30] Change translation template EN --- templates/security/reset_password/request.html.twig | 2 +- translations/TablerBundle.de.xlf | 4 ++-- translations/TablerBundle.en.xlf | 6 +++--- translations/TablerBundle.fr.xlf | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/templates/security/reset_password/request.html.twig b/templates/security/reset_password/request.html.twig index 490bffbc..ce188d8e 100644 --- a/templates/security/reset_password/request.html.twig +++ b/templates/security/reset_password/request.html.twig @@ -11,7 +11,7 @@ {% block login_form %} {% block request_help %} -

{{ 'Enter your email address and your password will be reset and emailed to you'|trans({}, 'TablerBundle') }}

+

{{ 'Enter your email address and you will be emailed a link that allows to reset your password'|trans({}, 'TablerBundle') }}

{% endblock %} {{ form_start(requestForm) }} diff --git a/translations/TablerBundle.de.xlf b/translations/TablerBundle.de.xlf index 82720291..928bc392 100644 --- a/translations/TablerBundle.de.xlf +++ b/translations/TablerBundle.de.xlf @@ -150,8 +150,8 @@ Password Reset Email Sent E-Mail für die Zurücksetzung des Passwort wurde gesendet - - Enter your email address and your password will be reset and emailed to you + + Enter your email address and you will be emailed a link that allows to reset your password Geben Sie Ihre E-Mail Adresse an und Sie bekommen eine Nachricht um Ihr Passwort zurückzusetzen diff --git a/translations/TablerBundle.en.xlf b/translations/TablerBundle.en.xlf index 5a5a9d93..9a35fbaa 100644 --- a/translations/TablerBundle.en.xlf +++ b/translations/TablerBundle.en.xlf @@ -114,9 +114,9 @@ Password Reset Email Sent Password Reset Email Sent - - Enter your email address and your password will be reset and emailed to you - Enter your email address and your password will be reset and emailed to you + + Enter your email address and you will be emailed a link that allows to reset your password + Enter your email address and you will be emailed a link that allows to reset your password If an account matching your email exists, then an email was just sent that contains a link that you can use to reset your password. This link will expire in %token%. diff --git a/translations/TablerBundle.fr.xlf b/translations/TablerBundle.fr.xlf index b578879a..c98002d5 100644 --- a/translations/TablerBundle.fr.xlf +++ b/translations/TablerBundle.fr.xlf @@ -106,8 +106,8 @@ Password Reset Email Sent E-mail de réinitialisation du mot de passe a été envoyé - - Enter your email address and your password will be reset and emailed to you + + Enter your email address and you will be emailed a link that allows to reset your password Saisissez votre adresse e-mail et la procédure de réinitialisation de votre mot de passe vous sera envoyée par mail From 950b9debd9212b5c75292841a2b365aec9ff58c0 Mon Sep 17 00:00:00 2001 From: Cavasin F Date: Fri, 6 Jan 2023 14:02:20 +0100 Subject: [PATCH 27/30] use alert component --- templates/security/reset_password/_layout.html.twig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/templates/security/reset_password/_layout.html.twig b/templates/security/reset_password/_layout.html.twig index 54250f43..f3064df3 100644 --- a/templates/security/reset_password/_layout.html.twig +++ b/templates/security/reset_password/_layout.html.twig @@ -3,7 +3,8 @@ {% block login_social_auth %}{% endblock %} {% block login_box_error %} + {% from '@Tabler/components/alert.html.twig' import alert %} {% for flashError in app.flashes('reset_password_error') %} -
{{ flashError }}
+ {{ alert({important: true, description : flashError}) }} {% endfor %} {% endblock %} From 4db12a8851d455f6a0917f8384de5eb9e46f2ae2 Mon Sep 17 00:00:00 2001 From: Cavasin F Date: Mon, 16 Jan 2023 09:20:40 +0100 Subject: [PATCH 28/30] Rename `token` to `expirationMessage` --- templates/security/reset_password/check-email.html.twig | 4 ++-- translations/TablerBundle.de.xlf | 6 +++--- translations/TablerBundle.en.xlf | 6 +++--- translations/TablerBundle.fr.xlf | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/templates/security/reset_password/check-email.html.twig b/templates/security/reset_password/check-email.html.twig index 1c223f8c..47904a6f 100644 --- a/templates/security/reset_password/check-email.html.twig +++ b/templates/security/reset_password/check-email.html.twig @@ -9,9 +9,9 @@ {% endblock %} {% block login_form %} - {% set token = resetToken.expirationMessageKey|trans(resetToken.expirationMessageData, 'ResetPasswordBundle') %} + {% set expirationMessage = resetToken.expirationMessageKey|trans(resetToken.expirationMessageData, 'ResetPasswordBundle') %}

- {{ 'If an account matching your email exists, then an email was just sent that contains a link that you can use to reset your password. This link will expire in %token%.' | trans({'%token%' : token}, 'TablerBundle') }} + {{ 'If an account matching your email exists, then an email was just sent that contains a link that you can use to reset your password. This link will expire in %expirationMessage%.' | trans({'%expirationMessage%' : expirationMessage}, 'TablerBundle') }}

{{ "If you don't receive an email please check your spam folder or"|trans({}, 'TablerBundle') }} {{ 'Try again'|trans({}, 'TablerBundle') }}.

{% endblock %} diff --git a/translations/TablerBundle.de.xlf b/translations/TablerBundle.de.xlf index 928bc392..058226be 100644 --- a/translations/TablerBundle.de.xlf +++ b/translations/TablerBundle.de.xlf @@ -154,9 +154,9 @@ Enter your email address and you will be emailed a link that allows to reset your password Geben Sie Ihre E-Mail Adresse an und Sie bekommen eine Nachricht um Ihr Passwort zurückzusetzen - - If an account matching your email exists, then an email was just sent that contains a link that you can use to reset your password. This link will expire in %token%. - Wenn ein Zugang mit Ihrer E-Mail existiert, wurde soeben eine E-Mail dorthin versendet, welche eine Link beinhaltet, mit dem Sie Ihr Passwort zurücksetzen können. Dieser Link wird ablaufen in %token%. + + If an account matching your email exists, then an email was just sent that contains a link that you can use to reset your password. This link will expire in %expirationMessage%. + Wenn ein Zugang mit Ihrer E-Mail existiert, wurde soeben eine E-Mail dorthin versendet, welche eine Link beinhaltet, mit dem Sie Ihr Passwort zurücksetzen können. Dieser Link wird ablaufen in %expirationMessage%. If you don't receive an email please check your spam folder or diff --git a/translations/TablerBundle.en.xlf b/translations/TablerBundle.en.xlf index 9a35fbaa..58ec394a 100644 --- a/translations/TablerBundle.en.xlf +++ b/translations/TablerBundle.en.xlf @@ -118,9 +118,9 @@ Enter your email address and you will be emailed a link that allows to reset your password Enter your email address and you will be emailed a link that allows to reset your password - - If an account matching your email exists, then an email was just sent that contains a link that you can use to reset your password. This link will expire in %token%. - If an account matching your email exists, then an email was just sent that contains a link that you can use to reset your password. This link will expire in %token%. + + If an account matching your email exists, then an email was just sent that contains a link that you can use to reset your password. This link will expire in %expirationMessage%. + If an account matching your email exists, then an email was just sent that contains a link that you can use to reset your password. This link will expire in %expirationMessage%. If you don't receive an email please check your spam folder or diff --git a/translations/TablerBundle.fr.xlf b/translations/TablerBundle.fr.xlf index c98002d5..b325a483 100644 --- a/translations/TablerBundle.fr.xlf +++ b/translations/TablerBundle.fr.xlf @@ -110,9 +110,9 @@ Enter your email address and you will be emailed a link that allows to reset your password Saisissez votre adresse e-mail et la procédure de réinitialisation de votre mot de passe vous sera envoyée par mail - - If an account matching your email exists, then an email was just sent that contains a link that you can use to reset your password. This link will expire in %token%. - Si un compte correspond à l'adresse renseignée, un email vient d'être envoyé contenant un lien afin de réinitialiser votre mot de passe. Ce lien expire dans %token%. + + If an account matching your email exists, then an email was just sent that contains a link that you can use to reset your password. This link will expire in %expirationMessage%. + Si un compte correspond à l'adresse renseignée, un email vient d'être envoyé contenant un lien afin de réinitialiser votre mot de passe. Ce lien expire dans %expirationMessage%. If you don't receive an email please check your spam folder or From 51d6f3be28962c7e28e63c9627fa4cd0970af891 Mon Sep 17 00:00:00 2001 From: Kevin Papst Date: Sat, 6 Dec 2025 15:57:24 +0100 Subject: [PATCH 29/30] Apply suggestion from @kevinpapst removed deprecation, template is still used --- templates/security/password-reset.html.twig | 1 - 1 file changed, 1 deletion(-) diff --git a/templates/security/password-reset.html.twig b/templates/security/password-reset.html.twig index ff333dce..e49a4dc8 100644 --- a/templates/security/password-reset.html.twig +++ b/templates/security/password-reset.html.twig @@ -1,4 +1,3 @@ -{% deprecated 'This template is deprecated, use your own logic that extends from `@Tabler/security.html.twig` instead OR take a look at /docs/reset_password_pages.md' %} {% extends '@Tabler/security.html.twig' %} From 0faf2c87add19d17b7a7b5e5216f54191ee7c39c Mon Sep 17 00:00:00 2001 From: Kevin Papst Date: Sat, 6 Dec 2025 15:57:54 +0100 Subject: [PATCH 30/30] Apply suggestion from @kevinpapst --- templates/security/password-reset.html.twig | 1 - 1 file changed, 1 deletion(-) diff --git a/templates/security/password-reset.html.twig b/templates/security/password-reset.html.twig index e49a4dc8..2b120198 100644 --- a/templates/security/password-reset.html.twig +++ b/templates/security/password-reset.html.twig @@ -1,4 +1,3 @@ - {% extends '@Tabler/security.html.twig' %} {% block login_social_auth %}{% endblock %}