From 5b83da69f2dae8b91ec7bced1d5335d2a1a1486f Mon Sep 17 00:00:00 2001 From: Hassane Diaby Date: Mon, 27 May 2024 18:38:18 +0200 Subject: [PATCH] bug #12880 : Correcting text on button for password form --- .../src/main/resources/overriden_messages.properties | 1 + .../src/main/resources/overriden_messages_en.properties | 1 + .../src/main/resources/overriden_messages_fr.properties | 1 + cas/cas-server/src/main/resources/static/js/cas.js | 7 ++++++- cas/cas-server/src/main/resources/templates/layout.html | 3 +++ .../src/main/resources/templates/passwordForm.html | 2 +- 6 files changed, 13 insertions(+), 2 deletions(-) diff --git a/cas/cas-server/src/main/resources/overriden_messages.properties b/cas/cas-server/src/main/resources/overriden_messages.properties index c0714eacd0a..fd98e97092e 100644 --- a/cas/cas-server/src/main/resources/overriden_messages.properties +++ b/cas/cas-server/src/main/resources/overriden_messages.properties @@ -16,6 +16,7 @@ cas.authn.pm.reset.text1=Bonjour.

Voici le lien qui vous pe cas.authn.pm.reset.text2=Bonjour.

Voici le lien qui vous permettra de vous créer un nouveau mot de passe sur {4} : cliquez ici.
Celui-ci est valable pour les prochaines {2} heure(s).

Bonne journée. cas.welcome.button.back=RETOUR cas.welcome.button.next=SUIVANT +cas.welcome.button.validate=VALIDER cas.welcome.header.msg=Bienvenue screen.accountbadconfiguration.heading=Votre compte a un problème de configuration. screen.accountbadconfiguration.message=Contactez votre administrateur {0}. diff --git a/cas/cas-server/src/main/resources/overriden_messages_en.properties b/cas/cas-server/src/main/resources/overriden_messages_en.properties index c866729aa37..d639c0b12eb 100644 --- a/cas/cas-server/src/main/resources/overriden_messages_en.properties +++ b/cas/cas-server/src/main/resources/overriden_messages_en.properties @@ -16,6 +16,7 @@ cas.authn.pm.reset.text1=Hello.

Here is the link that wil cas.authn.pm.reset.text2=Hello.

Here is the link that will allow you to create a new password on {4}: click here.
This one is valid for the next {2} hour(s).

Have a good day. cas.welcome.button.back=BACK cas.welcome.button.next=NEXT +cas.welcome.button.validate=VALIDATE cas.welcome.header.msg=Welcome screen.accountbadconfiguration.heading=Your account is not properly configured. screen.accountbadconfiguration.message=Contact your {0} administrator. diff --git a/cas/cas-server/src/main/resources/overriden_messages_fr.properties b/cas/cas-server/src/main/resources/overriden_messages_fr.properties index c0714eacd0a..fd98e97092e 100644 --- a/cas/cas-server/src/main/resources/overriden_messages_fr.properties +++ b/cas/cas-server/src/main/resources/overriden_messages_fr.properties @@ -16,6 +16,7 @@ cas.authn.pm.reset.text1=Bonjour.

Voici le lien qui vous pe cas.authn.pm.reset.text2=Bonjour.

Voici le lien qui vous permettra de vous créer un nouveau mot de passe sur {4} : cliquez ici.
Celui-ci est valable pour les prochaines {2} heure(s).

Bonne journée. cas.welcome.button.back=RETOUR cas.welcome.button.next=SUIVANT +cas.welcome.button.validate=VALIDER cas.welcome.header.msg=Bienvenue screen.accountbadconfiguration.heading=Votre compte a un problème de configuration. screen.accountbadconfiguration.message=Contactez votre administrateur {0}. diff --git a/cas/cas-server/src/main/resources/static/js/cas.js b/cas/cas-server/src/main/resources/static/js/cas.js index 9c6489eb278..59a3140655b 100644 --- a/cas/cas-server/src/main/resources/static/js/cas.js +++ b/cas/cas-server/src/main/resources/static/js/cas.js @@ -100,13 +100,18 @@ function resourceLoadedSuccessfully() { }); } - function displayMainFormSubmitButton() { $(document).ready(function () { $("#main-form-submit").css("display", "flex"); }); } +function displayMainFormValidateButton() { + $(document).ready(function () { + $("#main-form-validate").css("display", "flex"); + }); +} + function disableMainFormSubmitButton() { $("#main-form-submit").attr("disabled", "true"); } diff --git a/cas/cas-server/src/main/resources/templates/layout.html b/cas/cas-server/src/main/resources/templates/layout.html index e52da6306ad..3404180f999 100644 --- a/cas/cas-server/src/main/resources/templates/layout.html +++ b/cas/cas-server/src/main/resources/templates/layout.html @@ -70,6 +70,9 @@ + diff --git a/cas/cas-server/src/main/resources/templates/passwordForm.html b/cas/cas-server/src/main/resources/templates/passwordForm.html index 644adde5dce..cb32afbf963 100644 --- a/cas/cas-server/src/main/resources/templates/passwordForm.html +++ b/cas/cas-server/src/main/resources/templates/passwordForm.html @@ -55,7 +55,7 @@