From 687e7199ded2395a29f3003a10ad2e592037f973 Mon Sep 17 00:00:00 2001
From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Date: Thu, 11 Nov 2021 13:45:25 +0000
Subject: [PATCH] Bug 29458: Reorder login elements

Make masthead.inc modal and opac-auth follow the order of the login
elements on the homepage.

Test plan:
Enable prefs for reset password and self registration.
Fill additional contents for login instructions.
Logout on OPAC.
Click Login from your account on top bar.
Click Login button on the home page (right side, in the middle).
Verify that these two forms correspond with the home page login.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>

Bug 29458: (follow-up) Remove FIXME

With some help of Owen Leonard:
<oleonard> Regarding the <br/>, you can wrap the submit button in <fieldset class="action"></fieldset> instead.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 .../bootstrap/en/includes/masthead.inc        |  8 +++----
 .../bootstrap/en/modules/opac-auth.tt         | 21 ++++++++++---------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
index c2cf93a090d..cf702e45aa1 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
@@ -394,6 +394,9 @@
                             <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" />
+                                <fieldset class="action">
+                                    <input type="submit" class="btn btn-primary" value="Log in" />
+                                </fieldset>
                                 [% IF OpacLoginInstructions %]
                                     <div id="nologininstructions-modal" class="nologininstructions">
                                         [% PROCESS koha_news_block news => OpacLoginInstructions %]
@@ -412,11 +415,6 @@
                             </fieldset>
                         [% END %]
                     </div>
-                    [% UNLESS Koha.Preference('opacShibOnly') %]
-                        <div class="modal-footer">
-                            <input type="submit" class="btn btn-primary" value="Log in" />
-                        </div>
-                    [% END %]
                 </form> <!-- /#auth -->
             </div> <!-- /.modal-content -->
         </div> <!-- /.modal-dialog -->
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 68b2cdad785..4bbc55e3049 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt
@@ -195,11 +195,6 @@
                                     </fieldset>
                                 </fieldset>
 
-                                [% IF Koha.Preference('OpacPasswordChange') && Categories.can_any_reset_password %]
-                                    <div id="forgotpassword">
-                                        <a href="/cgi-bin/koha/opac-password-recovery.pl">Forgot your password?</a>
-                                    </div>
-                                [% END %]
                                 <div id="nologininstructions">
                                     [% IF OpacLoginInstructions %]
                                         [% PROCESS koha_news_block news => OpacLoginInstructions %]
@@ -209,13 +204,19 @@
                                         <h2>Don't have a library card?</h2>
                                         <p>If you don't have a library card, stop by your local library to sign up.</p>
                                     [% END # / IF OpacLoginInstructions %]
-
-                                    [% IF PatronSelfRegistration && PatronSelfRegistrationDefaultCategory %]
-                                        <span id="registrationinstructions">
+                                </div>
+                                [% IF Koha.Preference('OpacPasswordChange') && Categories.can_any_reset_password %]
+                                    <div id="forgotpassword">
+                                        <a href="/cgi-bin/koha/opac-password-recovery.pl">Forgot your password?</a>
+                                    </div>
+                                [% END %]
+                                [% IF PatronSelfRegistration && PatronSelfRegistrationDefaultCategory %]
+                                    <div id="registrationinstructions">
+                                        <span>
                                             <a href="/cgi-bin/koha/opac-memberentry.pl">You may register here.</a>
                                         </span>
-                                    [% END %]
-                                </div>
+                                    </div>
+                                [% END %]
                             </form>
                         [% END # / IF !OPACShibOnly or SCO_login or SCI_login %]
                     [% END # / IF loginprompt %]
-- 
2.25.1