From 326b05edfc7804c8547ca1b12e6e9cd09b8ad686 Mon Sep 17 00:00:00 2001
From: David Cook <dcook@prosentient.com.au>
Date: Wed, 13 Nov 2024 01:34:56 +0000
Subject: [PATCH] Bug 34778: (follow-up) convert label from 'span' to 'label'
 element

Also uses the "for" attribute to uniquely point to the correct
checkbox.
---
 koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss             | 6 ++++++
 koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc      | 2 +-
 .../bootstrap/en/includes/show-password-toggle.inc          | 4 ++--
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt       | 2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt       | 2 +-
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss
index da69a58055..7bb83a5a5e 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss
+++ b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss
@@ -2980,4 +2980,10 @@ $star-selected: #EDB867;
     display: inline;
 }
 
+fieldset.brief label.show-password-toggle-label {
+    display: inline;
+    font-weight: normal;
+    padding: 0;
+}
+
 @import "responsive";
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
index dc0d33e10d..fb84cbbc0a 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
@@ -440,7 +440,7 @@
                                 <div class="local-login">
                                     [% PROCESS login_label for="muserid" %]<input type="text" id="muserid" name="login_userid" autocomplete="off" />
                                     <label for="mpassword">Password:</label><input type="password" id="mpassword" name="login_password" autocomplete="off" />
-                                    [% INCLUDE 'show-password-toggle.inc' %]
+                                    [% INCLUDE 'show-password-toggle.inc' checkbox_id_suffix='modal' %]
                                     <fieldset class="action">
                                         <input type="hidden" name="op" value="cud-login" />
                                         <input type="submit" class="btn btn-primary" value="Log in" />
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/show-password-toggle.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/show-password-toggle.inc
index 17a854b074..b7b804a591 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/show-password-toggle.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/show-password-toggle.inc
@@ -1,4 +1,4 @@
 <div class="show-password-toggle">
-    <input type="checkbox" class="show-password-toggle-checkbox">
-    <span class="show-password-toggle-label"> Show password</span>
+    <input type="checkbox" class="show-password-toggle-checkbox" id="show-password-toggle-checkbox-[% checkbox_id_suffix | html %]">
+    <label class="show-password-toggle-label" for="show-password-toggle-checkbox-[% checkbox_id_suffix | html %]"> Show password</label>
 </div>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt
index 55e4ec3dd0..f3ed6992e8 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt
@@ -249,7 +249,7 @@
                                             <label for="password">Password:</label>
                                             <input class="form-control" type="password"  size="25" id="password"  name="login_password" autocomplete="off" />
                                         </div>
-                                        [% INCLUDE 'show-password-toggle.inc' %]
+                                        [% INCLUDE 'show-password-toggle.inc' checkbox_id_suffix='auth' %]
                                         <fieldset class="action">
                                             <input type="submit" value="Log in" class="btn btn-primary" />
                                         </fieldset>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
index 312d2fead1..c86c5a8da1 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
@@ -204,7 +204,7 @@
                                             <input class="form-control" type="text" id="userid" name="login_userid" autocomplete="off" />
                                             <label for="password">Password:</label>
                                             <input class="form-control" type="password" id="password" name="login_password" autocomplete="off" />
-                                            [% INCLUDE 'show-password-toggle.inc' %]
+                                            [% INCLUDE 'show-password-toggle.inc' checkbox_id_suffix='main' %]
                                             <fieldset class="action">
                                                 <input type="hidden" name="op" value="cud-login" />
                                                 <input type="submit" value="Log in" class="btn btn-primary" />
-- 
2.39.5