From 49c3c2765c0ac0b8cd023c8a3bd201c23fb3f1ed 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 external_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. 10. Check HTML elements #external_login, #external_login_button, #external_login_name, and #external_login_icon. There were added to allow for further customization with css/js --- koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss | 36 +++++++++++ .../opac-tmpl/bootstrap/en/includes/masthead.inc | 75 +++++++++++----------- 2 files changed, 75 insertions(+), 36 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss index 8f411ae789..4225c35788 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss +++ b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss @@ -1810,6 +1810,41 @@ nav { } #loginModal { + #local_login, #external_login { + border: 1px solid #dbdbdb; + padding: 7px; + } + + #external_login { + box-shadow: 0 0 0 1px #dbdbdb; + padding: 7px; + } + + #external_login_button { + border: 1px solid #dbdbdb; + padding: 2px 10px 2px 10px; + color: #000; + border-radius: 4px; + } + + #external_login { + box-shadow: 0 0 0 1px #dbdbdb; + padding: 1em; + } + + #external_login a:hover { + text-decoration: none; + } + + #external_login_button:hover { + text-decoration: none; + background-color: #f0f0f0; + } + + #external_login_name { + padding-left: 1em; + } + input { box-sizing: border-box; display: block; @@ -1822,6 +1857,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 9436d99e49..da92627952 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc @@ -367,46 +367,49 @@
-
- -
-- 2.11.0