From a13929d2652d8152106a049ce1e4d60277e03af8 Mon Sep 17 00:00:00 2001 From: Lucas Gass Date: Wed, 30 Dec 2020 21:39:22 +0000 Subject: [PATCH] Bug 25405: clearly define local login and shib login sections This patch attempts to clearly seperate local login from shibboleth login in the OPAC loginModal. It includes seperate id's for local and shibboleth to make it easier to customize this login To test: 1. Enable shibboleth in your koha-conf.xml by changng the value of to 1. 2. I also add the following to my koha-conf: email 3. Look at the loginModal in the OPAC by clicking 'Log in to your account' in the top right corner. 4. Apply patch, restart all, and regenerate CSS. (https://wiki.koha-community.org/wiki/Working_with_SCSS_in_the_OPAC_and_staff_client) 5. Look at the loginModal again the shibboleth section should be underneath the local login stuff. 6. Inscept the loginModal and make sure there is a
for both local_login and shibboleth_login 7. Make sure it all works. 8. Turn Shibboleth back off and restart all. 9. Make sure everything still works and looks good without Shibboleth off. --- koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss | 5 ++ .../opac-tmpl/bootstrap/en/includes/masthead.inc | 65 +++++++++++----------- 2 files changed, 38 insertions(+), 32 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss index b946cc193b..6bd2e319af 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss +++ b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss @@ -1827,6 +1827,10 @@ nav { } #loginModal { + #local_login, #shibboleth_login { + border: 1px solid #dbdbdb; + padding: 7px; + } input { box-sizing: border-box; display: block; @@ -1839,6 +1843,7 @@ nav { font-size: 100%; padding: .5em; transition: background-color .5s ease; + margin-top: 1em; &:hover { background: #77b50f none; diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc index e3895a1e76..82d3581624 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc @@ -367,46 +367,47 @@
-
- -
-- 2.11.0