From 8f41b400b461ac7185dfdd28b4619aad7bc1030a Mon Sep 17 00:00:00 2001
From: David Cook <dcook@prosentient.com.au>
Date: Wed, 29 Jun 2022 08:46:21 +0000
Subject: [PATCH] Bug 31064: Wrap local login with stylable element
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Test plan:
0. Apply patch
1. Go to http://localhost:8081/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=OPACUserCSS
2. Set syspref to the following:
.local-login {
      display: none;
}
3. Go to http://localhost:8080/cgi-bin/koha/opac-main.pl
3b. Note that the local login boxes are hidden
    ("Log in to your account:" remains so that other login options can
    be supplied by OpacUserJS)

4. Click on "Log in to your account" on the top toolbar
4b. Note that the local login boxes are hidden
    ("Log in to your account:" remains so that other login options can
    be supplied by OpacUserJS)

5. Go to http://localhost:8080/cgi-bin/koha/opac-user.pl
5b. Note that the local login boxes are hidden
    ("Log in to your account" remains so that other login options can be
    supplied by OpacUserJS)

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
Signed-off-by: Tomás Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 89c910449d2043050f75694e1a401e213c103e22)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit e9b4dd2bd5d4bd6025d6ccb2f6d3dd32bf671249)
Signed-off-by: Arthur Suzuki <arthur.suzuki@biblibre.com>
---
 .../bootstrap/en/includes/masthead.inc        |  9 +++--
 .../bootstrap/en/modules/opac-auth.tt         | 34 ++++++++++---------
 .../bootstrap/en/modules/opac-main.tt         | 16 +++++----
 3 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
index e493178f0b..c748d76f34 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
@@ -392,8 +392,13 @@
                         [% UNLESS Koha.Preference('opacShibOnly') %]
                             <input type="hidden" name="koha_login_context" value="opac" />
                             <fieldset class="brief">
-                                <label for="muserid">Login:</label><input type="text" id="muserid" name="userid" autocomplete="off" />
-                                <label for="mpassword">Password:</label><input type="password" id="mpassword" name="password" autocomplete="off" />
+                                <div class="local-login">
+                                    <label for="muserid">Login:</label><input type="text" id="muserid" name="userid" autocomplete="off" />
+                                    <label for="mpassword">Password:</label><input type="password" id="mpassword" name="password" autocomplete="off" />
+                                    <fieldset class="action">
+                                        <input type="submit" class="btn btn-primary" value="Log in" />
+                                    </fieldset>
+                                </div>
                                 [% IF OpacLoginInstructions %]
                                     <div id="nologininstructions-modal" class="nologininstructions">
                                         [% PROCESS koha_news_block news => OpacLoginInstructions %]
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 ddf749a16e..cdaec50bc1 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt
@@ -177,23 +177,25 @@
                             [% END %]
                                 <input type="hidden" name="koha_login_context" value="opac" />
 
-                                <fieldset class="brief">
-                                    [% FOREACH INPUT IN INPUTS %]
-                                        [% NEXT IF INPUT.name == 'logout.x' %]
-                                        <input type="hidden" name="[% INPUT.name | html %]" value="[% INPUT.value | html %]" />
-                                    [% END %]
-                                    <div class="form-group">
-                                        <label for="userid">Login:</label>
-                                        <input class="form-control" type="text"  size="25" id="userid"  name="userid" />
-                                    </div>
-                                    <div class="form-group">
-                                        <label for="password">Password:</label>
-                                        <input class="form-control" type="password"  size="25" id="password"  name="password" />
-                                    </div>
-                                    <fieldset class="action">
-                                        <input type="submit" value="Log in" class="btn btn-primary" />
+                                <div class="local-login">
+                                    <fieldset class="brief">
+                                        [% FOREACH INPUT IN INPUTS %]
+                                            [% NEXT IF INPUT.name == 'logout.x' %]
+                                            <input type="hidden" name="[% INPUT.name | html %]" value="[% INPUT.value | html %]" />
+                                        [% END %]
+                                        <div class="form-group">
+                                            <label for="userid">Login:</label>
+                                            <input class="form-control" type="text"  size="25" id="userid"  name="userid" />
+                                        </div>
+                                        <div class="form-group">
+                                            <label for="password">Password:</label>
+                                            <input class="form-control" type="password"  size="25" id="password"  name="password" />
+                                        </div>
+                                        <fieldset class="action">
+                                            <input type="submit" value="Log in" class="btn btn-primary" />
+                                        </fieldset>
                                     </fieldset>
-                                </fieldset>
+                                </div>
 
                                 [% IF Koha.Preference('OpacPasswordChange') && Categories.can_any_reset_password %]
                                     <div id="forgotpassword">
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 2b5abed26e..d6d7cd8be5 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
@@ -189,13 +189,15 @@
                                             <a href="/cgi-bin/koha/svc/auth/googleopenidconnect" class="btn btn-light" id="openid_connect"><i class="fa fa-google" aria-hidden="true"></i> Log in with Google</a>
                                             <p>If you do not have a Google account, but do have a local account, you can still log in: </p>
                                         [% END # /IF GoogleOpenIDConnect %]
-                                        <label for="userid">Login:</label>
-                                        <input class="form-control" type="text" id="userid" name="userid" autocomplete="off" />
-                                        <label for="password">Password:</label>
-                                        <input class="form-control" type="password" id="password" name="password" autocomplete="off" />
-                                        <fieldset class="action">
-                                            <input type="submit" value="Log in" class="btn btn-primary" />
-                                        </fieldset>
+                                        <div class="local-login">
+                                            <label for="userid">Login:</label>
+                                            <input class="form-control" type="text" id="userid" name="userid" autocomplete="off" />
+                                            <label for="password">Password:</label>
+                                            <input class="form-control" type="password" id="password" name="password" autocomplete="off" />
+                                            <fieldset class="action">
+                                                <input type="submit" value="Log in" class="btn btn-primary" />
+                                            </fieldset>
+                                        </div>
                                         [% IF ( OpacLoginInstructions ) %]
                                             <div id="nologininstructions-main" class="nologininstructions">
                                                 [% PROCESS koha_news_block news => OpacLoginInstructions %]
-- 
2.39.5