From e9b4dd2bd5d4bd6025d6ccb2f6d3dd32bf671249 Mon Sep 17 00:00:00 2001 From: David Cook 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 Signed-off-by: Fridolin Somers Signed-off-by: Tomás Cohen Arazi (cherry picked from commit 89c910449d2043050f75694e1a401e213c103e22) Signed-off-by: Lucas Gass --- .../bootstrap/en/includes/masthead.inc | 12 ++++--- .../bootstrap/en/modules/opac-auth.tt | 34 ++++++++++--------- .../bootstrap/en/modules/opac-main.tt | 16 +++++---- 3 files changed, 34 insertions(+), 28 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc index b60c696d56..fbab4ec2c9 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc @@ -385,11 +385,13 @@ [% UNLESS Koha.Preference('opacShibOnly') %]
- - -
- -
+ [% IF OpacLoginInstructions %]
[% 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 0fd0d32bba..62a8ee03ed 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt @@ -190,23 +190,25 @@ [% END %] -
- [% FOREACH INPUT IN INPUTS %] - [% NEXT IF INPUT.name == 'logout.x' %] - - [% END %] -
- - -
-
- - -
-
- +
+
[% IF OpacLoginInstructions %] 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 76fa790f8f..8850ee7927 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 @@ Log in with Google

If you do not have a Google account, but do have a local account, you can still log in:

[% END # /IF GoogleOpenIDConnect %] - - - - -
- -
+ [% IF ( OpacLoginInstructions ) %]
[% PROCESS koha_news_block news => OpacLoginInstructions %] -- 2.39.5