Attachment 127828 Details for Bug 29458 – Bug 29458: Reorder login elements

[patch] Bug 29458: Reorder login elements

Bug-29458-Reorder-login-elements.patch (text/plain), 5.13 KB, created by Fridolin Somers on 2021-11-19 07:57:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Fridolin Somers

Created: 2021-11-19 07:57:43 UTC

Size: 5.13 KB

patch

obsolete

>From 13876fdaf633ac4dae09d92d59afc2515d5e50da 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>
>---
> .../bootstrap/en/includes/masthead.inc        |  9 ++++----
> .../bootstrap/en/modules/opac-auth.tt         | 21 ++++++++++---------
> 2 files changed, 15 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 b87ddd2aec..56a2a0c753 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
>@@ -394,6 +394,10 @@
>                             <fieldset class="brief">
>                                 <label for="muserid">Login:</label><input type="text" id="muserid" name="userid" />
>                                 <label for="mpassword">Password:</label><input type="password" id="mpassword" name="password" />
>+                                <div class="">[%# FIXME Add right class, remove br %]
>+                                    <br>
>+                                    <input type="submit" class="btn btn-primary" value="Log in" />
>+                                </div>
>                                 [% IF OpacLoginInstructions %]
>                                     <div id="nologininstructions-modal" class="nologininstructions">
>                                         [% PROCESS koha_news_block news => OpacLoginInstructions %]
>@@ -412,11 +416,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> 
>             </div> 
>         </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 68b2cdad78..4bbc55e304 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.33.1

Actions: View | Diff | Splinter Review

Attachments on bug 29458: 127539 | 127828 | 129240 | 129606 | 129612 | 129617 | 130016