From 5efb2416c3e16caafaffa8ae08b2bf62ce52d383 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Wed, 20 Dec 2023 16:50:40 +0000
Subject: [PATCH] Bug 35619: Fix validation error alignment in change password
 form

Bug 31829 made a change to the change password form in the staff
interface to accommodate a gap in the CSS following the staff interface
redesign. This gap has been fixed, so we don't need a double class on
the fieldset.

With this change, the "hint" div can also be put back into place.

To test, apply the patch and locate a patron record in the staff
interface.

 - Click the "Change password" button on the patron detail page.
 - Confirm that the form layout looks correct.
 - Enter mismatched passwords in the "New password" and "Confirm new
   password" fields and click "Save"
   - The validation error message should be aligned to the right of the
     input field.

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit 46b0b41e09a6ad29b5fce8b56e08dd3922cf394b)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
(cherry picked from commit 7378b18f78a671bfb1cc1a4cc00775e8fe0501e9)
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
---
 .../intranet-tmpl/prog/en/modules/members/member-password.tt  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt
index d1d68b85c7..83f52fb2ad 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt
@@ -78,7 +78,7 @@
 	[% END %]
 
 
-    <fieldset class="brief rows"><legend><h1>Change username and/or password for [% patron.firstname | html %] [% patron.surname | html %]</h1></legend>
+    <fieldset class="rows"><legend><h1>Change username and/or password for [% patron.firstname | html %] [% patron.surname | html %]</h1></legend>
 	<ol>
     <li><label for="newuserid">New username:</label>
     <input type="hidden" name="member" value="[% patron.borrowernumber | html %]" /><input type="text" id="newuserid" name="newuserid" size="20" value="[% patron.userid | html %]" /></li>
@@ -93,9 +93,9 @@
     <li>
         <label for="newpassword2">Confirm new password:</label>
         <input name="newpassword2"  id="newpassword2" type="password" size="20" autocomplete="new-password" />
+        <div class="hint">Koha cannot display existing passwords. Leave the field blank to leave password unchanged.</div>
     </li>
 	</ol>
-    <div class="hint">Koha cannot display existing passwords. Leave the field blank to leave password unchanged.</div>
 </fieldset>
     <fieldset class="action">
         <input type="hidden" name="csrf_token" value="[% csrf_token | html %]" />
-- 
2.39.5