Skip to content
Snippets Groups Projects
Commit f47b69bb authored by Simon Urli's avatar Simon Urli
Browse files

XWIKI-18360: Reset password page layout should be updated after latest changes 

  * Refactor remplates of resetpassword and forgotusername to use same
    style as the login template.

(cherry picked from commit 158da414)
parent 6444fdd4
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 61 additions and 34 deletions
xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/misc.less
+ 11
− 1
View file @ f47b69bb
......@@ -200,7 +200,7 @@
// FIX: login
#loginForm {
.panel {
max-width: 450px;
max-width: @loginFormMaxWidth;
margin: auto;
text-align: left;
}
......@@ -212,6 +212,16 @@
}
}
.resetpasswordpanel, .forgotusernamepanel {
max-width: @loginFormMaxWidth;
margin: auto;
text-align: left;
.resetpasswordlinks, .forgotusernamelinks {
margin-top: 1em;
}
}
// FIX: User profile
.skin-flamingo {
#user-menu-col {
......
xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/variables.less
+ 1
− 0
View file @ f47b69bb
......@@ -3,6 +3,7 @@
// --------------------------------------------------
@figure-caption-font-size: 90%;
@figure-caption-color: @text-muted;
@loginFormMaxWidth: 450px;
//
// Variables of bootstrap overrided by XWiki
......
xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/forgotusername.vm
+ 18
− 13
View file @ f47b69bb
......@@ -25,7 +25,7 @@
#if ("$!panelClass" == "")
#set ($panelClass = "default")
#end
<div class="centered panel panel-$panelClass xwikimessage panel-body">
<div class="centered panel panel-$panelClass xwikimessage forgotusernamepanel">
<div class="panel-heading">
<div class="panel-title">$services.localization.render('xe.admin.forgotUsername.title')</div>
</div>
......@@ -41,15 +41,20 @@
#if($email == '' || !$services.csrf.isTokenValid($request.form_token))
#forgotUsernameBoxStart("default")
$services.localization.render('xe.admin.forgotUsername.instructions')
<form method="post" action="$services.security.authentication.getAuthenticationURL('forgot', $NULL)" id="forgotUsernameForm" class="xformInline">
<div>
<label for="e">$services.localization.render('xe.admin.forgotUsername.email.label')</label>
<input type="text" id="e" name="e"/>
<span class="buttonwrapper">
<input type="submit" value="$services.localization.render('xe.admin.forgotUsername.submit')" class="button"/>
</span>
<input type="hidden" name="form_token" value="$services.csrf.getToken()" />
</div>
<form method="post" action="$services.security.authentication.getAuthenticationURL('forgot', $NULL)" id="forgotUsernameForm" class="xform">
<dl>
<dt>
<label for="e">$services.localization.render('xe.admin.forgotUsername.email.label')</label>
</dt>
<dd class="input-group">
<span class="input-group-addon">$services.icon.renderHTML('envelope')</span>
<input type="text" id="e" name="e" class="form-control" size="60" />
</dd>
<dt>
<input type="submit" value="$services.localization.render('xe.admin.forgotUsername.submit')" class="btn btn-primary col-xs-12"/>
</dt>
</dl>
<input type="hidden" name="form_token" value="$services.csrf.getToken()" />
</form>
#forgotUsernameBoxEnd()
#else
......@@ -106,12 +111,12 @@
#if (!$emailError)
#forgotUsernameBoxStart("success")
$services.localization.render('xe.admin.forgotUsername.emailSent', ["$escapetool.xml($email)"])
<div>
<a href="$xwiki.getURL('XWiki.XWikiLogin', 'login')">$services.localization.render('xe.admin.forgotUsername.login')</a>
<div class="forgotusernamelinks">
<a href="$xwiki.getURL('XWiki.XWikiLogin', 'login', 'loginLink=1')">$services.localization.render('xe.admin.forgotUsername.login')</a>
</div>
#forgotUsernameBoxEnd()
#end
#end
</div>## mainContentArea
</div>## main
#template("endpage.vm")
\ No newline at end of file
#template("endpage.vm")
xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/resetpasswordinline.vm
+ 31
− 20
View file @ f47b69bb
......@@ -36,7 +36,7 @@
#if ("$!panelClass" == "")
#set ($panelClass = "default")
#end
<div class="centered panel panel-$panelClass xwikimessage panel-body">
<div class="centered panel panel-$panelClass xwikimessage resetpasswordpanel">
<div class="panel-heading">
<div class="panel-title">$services.localization.render('xe.admin.passwordReset.title')</div>
</div>
......@@ -61,16 +61,21 @@
#resetPasswordBoxStart("default")
$services.localization.render('xe.admin.passwordReset.instructions')
<form method="post" action="$services.security.authentication.getAuthenticationURL('reset', $NULL)" class="xformInline" id="resetPasswordForm">
<div>
<input type="hidden" name="form_token" value="$!{services.csrf.getToken()}" />
<form method="post" action="$services.security.authentication.getAuthenticationURL('reset', $NULL)" class="xform" id="resetPasswordForm">
<input type="hidden" name="form_token" value="$!{services.csrf.getToken()}" />
<dl>
<dt>
<label for="u">$services.localization.render('xe.admin.passwordReset.username.label')</label>
<input type="text" id="u" name="u"/>
<span class="buttonwrapper">
<input type="submit" value="$services.localization.render('xe.admin.passwordReset.submit')" class="button"/>
</span>
</div>
</form>
</dt>
<dd class="input-group">
<span class="input-group-addon">$services.icon.renderHTML('user')</span>
<input type="text" id="u" name="u" class="form-control" size="60" />
</dd>
<dt>
<input type="submit" value="$services.localization.render('xe.admin.passwordReset.submit')" class="btn btn-primary col-xs-12"/>
</dt>
</dl>
</form>
#elseif ($userName != '' && $validationString == '')
#if (!$services.csrf.isTokenValid($request.form_token))
#resetPasswordBoxStart("danger")
......@@ -87,10 +92,10 @@ $services.localization.render('xe.admin.passwordReset.instructions')
$services.localization.render('xe.admin.passwordReset.emailSentToUsername', ["$escapetool.xml($userName)"])
#end
#end
<div>
<a href="$services.security.authentication.getAuthenticationURL('reset', $NULL)">$services.localization.render('xe.admin.passwordReset.error.retry')</a> |
<a href="$xwiki.getURL('XWiki.ForgotUsername')">$services.localization.render('xe.admin.passwordReset.error.recoverUsername')</a> |
<a href="$xwiki.getURL('XWiki.XWikiLogin', 'login')">$services.localization.render('xe.admin.passwordReset.login')</a>
<div class="resetpasswordlinks">
<a href="$services.security.authentication.getAuthenticationURL('reset', $NULL)">$services.localization.render('xe.admin.passwordReset.error.retry')</a> |
<a href="$services.security.authentication.getAuthenticationURL('forgot', $NULL)">$services.localization.render('xe.admin.passwordReset.error.recoverUsername')</a> |
<a href="$xwiki.getURL('XWiki.XWikiLogin', 'login')">$services.localization.render('xe.admin.passwordReset.login')</a>
</div>
#else
##
......@@ -113,7 +118,7 @@ $services.localization.render('xe.admin.passwordReset.instructions')
#set ($passwordFields = [])
#definePasswordFields($passwordFields, 'p', 'p2', $passwordOptions)
<form action="$services.security.authentication.getAuthenticationURL('reset', $NULL)" method="post" id="resetPasswordStep2Form" class="xform third">
<form action="$services.security.authentication.getAuthenticationURL('reset', $NULL)" method="post" id="resetPasswordStep2Form" class="xform">
<div class="hidden">
<input type="hidden" name="form_token" value="$!{services.csrf.getToken()}" />
<input type="hidden" name="u" value="$!escapetool.xml($userName)"/>
......@@ -121,9 +126,11 @@ $services.localization.render('xe.admin.passwordReset.instructions')
</div>
## A null $request is passed as parameter, since we won't display inserted passwords after a request with error.
#generateHtml($passwordFields, $NULL)
<div class="buttons">
<span class="buttonwrapper"><input type="submit" value="$services.localization.render('xe.admin.passwordReset.step2.submit')" class="button"/></span>
</div>
<dl class="resetpasswordlinks">
<dt>
<input type="submit" value="$services.localization.render('xe.admin.passwordReset.step2.submit')" class="btn btn-primary col-xs-12"/>
</dt>
</dl>
</form>
#end
#set ($password = "$!request.p")
......@@ -154,11 +161,15 @@ $services.localization.render('xe.admin.passwordReset.instructions')
#if ("$!exception" != '')
#resetPasswordBoxStart("danger")
#displayResetPasswordException()
<a href="$services.security.authentication.getAuthenticationURL('reset', $NULL)">$services.localization.render('xe.admin.passwordReset.step2.backToStep1')</a>
<div class="resetpasswordlinks">
<a href="$services.security.authentication.getAuthenticationURL('reset', $NULL)">$services.localization.render('xe.admin.passwordReset.step2.backToStep1')</a>
</div>
#else
#resetPasswordBoxStart("success")
$services.localization.render('xe.admin.passwordReset.step2.success')
<a href="$xwiki.getURL('XWiki.XWikiLogin', 'login')">$services.localization.render('xe.admin.passwordReset.step2.login')</a>
<div class="resetpasswordlinks">
<a href="$xwiki.getURL('XWiki.XWikiLogin', 'login')">$services.localization.render('xe.admin.passwordReset.step2.login')</a>
</div>
#end
#end
#end
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment