Skip to content

XWIKI-20630: Improve usability of the "Change Password" page #4188

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.

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -677,7 +677,7 @@ platform.core.profile.passwd.reenterPassword=Reenter password
platform.core.profile.passwd.submit=Save
platform.core.profile.passwd.cancel=Cancel and return to profile
platform.core.profile.passwd.passwordMissmatch=The two passwords do not match.
platform.core.profile.passwd.invalidOriginalPassword=Current password is invalid.
platform.core.profile.passwd.invalidOriginalPassword=The field "Current password" was incorrect.
platform.core.profile.passwd.passwordTooShort=Your new password should be at least 6 characters long.
platform.core.profile.passwd.passwordCannotBeEmpty=The password cannot be empty.
platform.core.profile.passwd.notAllowed=You are not allowed to perform this action.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@
#else
#set ($passwordLength = $passwordOptions.passwordLength)
#end
$services.localization.render('platform.core.profile.passwd.instructionsPasswordLength', $passwordLength)
## We won't ask for the original password if the user is admin and not updating his own profile.
## In all other cases, we ask for it.
#if (!$hasAdmin || $isCurrentUsersProfile)
Expand Down Expand Up @@ -102,12 +101,13 @@
## This key fits better.
#set ($fields[$index].label = $services.localization.render('xe.admin.passwordReset.step2.newPasswordVerification.label'))
<form class="xform third" action="" method="post" autocomplete="off">
## Async validation feedback
#if ($request.xwikipassword && !$isValidPassword)
#error($stringtool.join($errorMessage, "<br/>"))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
#error($stringtool.join($errorMessage, "<br/>"))
#error($stringtool.join($errorMessage, '<br/>'))

It would avoid an interpretation that is not needed.

#end
## CSRF prevention
<div class="hidden"><input type="hidden" name="form_token" value="$!{services.csrf.getToken()}" /></div>
#generateHtml($fields, $NULL)
#if ($request.xwikipassword && !$isValidPassword)
<span class='box errormessage'>$stringtool.join($errorMessage, "<br/>")</span>
#end
<div class="padded buttons">
<span class="buttonwrapper"><input type="submit" value="$services.localization.render('platform.core.profile.passwd.submit')" class="button"/></span>
<span class="buttonwrapper"><a href="$doc.getURL("view")" class="secondary button">$services.localization.render('platform.core.profile.passwd.cancel')</a></span>
Expand Down