Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CP V7.1 - bug #12880 : Correcting text on button for password form #2025

Merged
merged 1 commit into from
Sep 16, 2024
Merged

CP V7.1 - bug #12880 : Correcting text on button for password form #2025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cas/cas-server/src/main/resources/overriden_messages.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ cas.authn.pm.reset.text1=<html><body>Bonjour.<br/><br/>Voici le lien qui vous pe
cas.authn.pm.reset.text2=<html><body>Bonjour.<br/><br/>Voici le lien qui vous permettra de vous créer un nouveau mot de passe sur {4} : <a href="{3}">cliquez ici</a>.<br/>Celui-ci est valable pour les prochaines {2} heure(s).<br/><br/>Bonne journée.</body></html>
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}.
Expand Down
1 change: 1 addition & 0 deletions cas/cas-server/src/main/resources/overriden_messages_en.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ cas.authn.pm.reset.text1=<html><body>Hello.<br /><br />Here is the link that wil
cas.authn.pm.reset.text2=<html><body>Hello.<br /><br />Here is the link that will allow you to create a new password on {4}: <a href="{3}">click here</a>.<br />This one is valid for the next {2} hour(s).<br /><br />Have a good day.</body></html>
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.
Expand Down
1 change: 1 addition & 0 deletions cas/cas-server/src/main/resources/overriden_messages_fr.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ cas.authn.pm.reset.text1=<html><body>Bonjour.<br/><br/>Voici le lien qui vous pe
cas.authn.pm.reset.text2=<html><body>Bonjour.<br/><br/>Voici le lien qui vous permettra de vous créer un nouveau mot de passe sur {4} : <a href="{3}">cliquez ici</a>.<br/>Celui-ci est valable pour les prochaines {2} heure(s).<br/><br/>Bonne journée.</body></html>
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}.
Expand Down
7 changes: 6 additions & 1 deletion cas/cas-server/src/main/resources/static/js/cas.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
Expand Down
3 changes: 3 additions & 0 deletions cas/cas-server/src/main/resources/templates/layout.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@
<button id="main-form-submit" style="display: none" class="Button" type="submit" form="main-form">
<span th:text="#{cas.welcome.button.next}">SUIVANT</span>
</button>
<button id="main-form-validate" style="display: none" class="Button" type="submit" form="main-form">
<span th:text="#{cas.welcome.button.validate}">VALIDER</span>
</button>
</div>

</div>
Expand Down
2 changes: 1 addition & 1 deletion cas/cas-server/src/main/resources/templates/passwordForm.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
</form>
<script>
resourceLoadedSuccessfully();
displayMainFormSubmitButton();
displayMainFormValidateButton();
</script>
</div>

Expand Down