From 5e56a0c75696ed78dae2c1737c6a5da99b34a77b Mon Sep 17 00:00:00 2001
From: Simon Urli <simon.urli@xwiki.com>
Date: Fri, 19 Nov 2021 16:02:50 +0100
Subject: [PATCH] XWIKI-18360: Reset password page layout should be updated
after latest changes
* Fix wrong usage of dt html element
---
.../src/main/resources/templates/forgotusername.vm | 6 +++---
.../resources/templates/resetpasswordinline.vm | 14 ++++++--------
2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/forgotusername.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/forgotusername.vm
index 055d073ff5e..16508666e9c 100644
--- a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/forgotusername.vm
+++ b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/forgotusername.vm
@@ -50,10 +50,10 @@
<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>
+ <div class="forgotusernamelinks">
+ <input type="submit" value="$services.localization.render('xe.admin.forgotUsername.submit')" class="btn btn-primary col-xs-12"/>
+ </div>
<input type="hidden" name="form_token" value="$services.csrf.getToken()" />
</form>
#forgotUsernameBoxEnd()
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/resetpasswordinline.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/resetpasswordinline.vm
index 1be8c0aba9c..adaa63f92c1 100644
--- a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/resetpasswordinline.vm
+++ b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/resetpasswordinline.vm
@@ -71,10 +71,10 @@ $services.localization.render('xe.admin.passwordReset.instructions')
<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>
+ <div class="resetpasswordlinks">
+ <input type="submit" value="$services.localization.render('xe.admin.passwordReset.submit')" class="btn btn-primary col-xs-12"/>
+ </div>
</form>
#elseif ($userName != '' && $validationString == '')
#if (!$services.csrf.isTokenValid($request.form_token))
@@ -126,11 +126,9 @@ $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)
- <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>
+ <div class="resetpasswordlinks">
+ <input type="submit" value="$services.localization.render('xe.admin.passwordReset.step2.submit')" class="btn btn-primary col-xs-12"/>
+ </div>
</form>
#end
#set ($password = "$!request.p")
--
GitLab