From d15364b49c9506b4d92003dc92e52b039f4a79ed Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Fri, 21 Feb 2025 16:41:57 +0000
Subject: [PATCH] Bug 25947: (follow-up) Tidiness fix

Signed-off-by: Emily Lamancusa <emily.lamancusa@montgomerycountymd.gov>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit 18d9297bda2b300cbd2364c5077be313ded29871)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
---
 .../prog/en/includes/patron_messages.inc      | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc
index 1f754f7294..1f2ff30be7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc
@@ -55,20 +55,18 @@
         [% IF patron.account_locked %]
             <li class="blocker [% patron.login_attempts < 0 ? 'account_admin_locked' : 'account_locked' | html %]">
             [% IF patron.login_attempts < 0 %]
-                    <span class="circ-hlt">Locked: </span><span> Patron's account has been administratively locked</span>
+                <span class="circ-hlt">Locked: </span><span> Patron's account has been administratively locked</span>
             [% ELSE %]
                 <span class="circ-hlt">Locked: </span><span> Patron's account has been locked (due to [% patron.login_attempts | html %] failed login attempts)</span>
-                [% END %]
-                [% IF CAN_user_borrowers_edit_borrowers %]
-                    <span>
-                        <a href="/cgi-bin/koha/members/member-password.pl?member=[% patron.borrowernumber | uri %]">Change password</a>
-                        <span data-bs-toggle="tooltip" title="Resetting password will remove lock on account" data-bs-placement="right" class="fa fa-info-circle"> </span>
-                    </span>
-                [% END %]
-                </li>
             [% END %]
-
-
+            [% IF CAN_user_borrowers_edit_borrowers %]
+                <span>
+                    <a href="/cgi-bin/koha/members/member-password.pl?member=[% patron.borrowernumber | uri %]">Change password</a>
+                    <span data-bs-toggle="tooltip" title="Resetting password will remove lock on account" data-bs-placement="right" class="fa fa-info-circle"> </span>
+                </span>
+            [% END %]
+            </li>
+        [% END %]
 
         [% IF ( patron.gonenoaddress ) %]
             <li class="gonenoaddress blocker">