Bugzilla – Attachment 104520 Details for
Bug 25405
Make separation of Shibboleth and Local login clearer in modal login on OPAC
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 25405: Seperate Shib and Local log in for OPAC modal
Bug-25405-Seperate-Shib-and-Local-log-in-for-OPAC-.patch (text/plain), 4.23 KB, created by
Lucas Gass (lukeg)
on 2020-05-07 15:14:52 UTC
(
hide
)
Description:
Bug 25405: Seperate Shib and Local log in for OPAC modal
Filename:
MIME Type:
Creator:
Lucas Gass (lukeg)
Created:
2020-05-07 15:14:52 UTC
Size:
4.23 KB
patch
obsolete
>From 4505827398c22c5b47d86b6dcd29d1744a747e16 Mon Sep 17 00:00:00 2001 >From: Lucas Gass <lucas@bywatersolutions.com> >Date: Wed, 6 May 2020 22:31:41 +0000 >Subject: [PATCH] Bug 25405: Seperate Shib and Local log in for OPAC modal > >1. Enable shibboleth in your koha-conf.xml by changng the value of <useshibboleth> to 1. >2. I also need to add the following: > <shibboleth> > <matchpoint>email</matchpoint> > <mapping> > <email is="SHIB_ATTR_email"></email> > </mapping> > </shibboleth> >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. >5. Look at the loginModal again and you should be able to toggle Shibboleth/Local. >6. Make sure it all works. >7. Turn Shibboleth back off and restart all. >8. Make sure everything still works without Shibboleth on. >--- > koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss | 4 +++- > koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc | 14 ++++++++++---- > koha-tmpl/opac-tmpl/bootstrap/js/global.js | 5 +++++ > 3 files changed, 18 insertions(+), 5 deletions(-) > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss >index 8babc17b63..c4f4f9ca18 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss >+++ b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss >@@ -2434,7 +2434,9 @@ button { > .modal-body, > .modal-footer { > font-size: 120%; >- padding: 1em 2em; >+ } >+ .ui-tabs-anchor { >+ font-size: 15px; > } > } > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc >index 88dd9a9255..14952c1d5b 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc >@@ -339,8 +339,13 @@ > </div> > <form action="/cgi-bin/koha/opac-user.pl" method="post" name="auth" id="modalAuth"> > <input type="hidden" name="has-search-query" id="has-search-query" value="" /> >- <div class="modal-body"> >+ <div id="loginTabs" class="modal-body"> > [% IF ( shibbolethAuthentication ) %] >+ <ul> >+ <li><a href="#loginTabs-1">Shibboleth log in</a></li> >+ <li><a href="#loginTabs-2">Local log in</a></li> >+ </ul> >+ <div id="loginTabs-1" class="shibbolethLogin"> > [% IF ( invalidShibLogin ) %] > <!-- This is what is displayed if shibboleth login has failed to match a koha user --> > <div class="alert alert-info"> >@@ -349,9 +354,11 @@ > [% ELSE %] > <h4>Shibboleth login</h4> > <p>If you have a Shibboleth account, please <a href="[% shibbolethLoginUrl | $raw %]">click here to login</a>.</p> >- <h4>Local Login</h4> >+ </div> > [% END %] > [% END %] >+ <div id="loginTabs-2" class="localLogin"> >+ <h4>Local Login</h4> > <input type="hidden" name="koha_login_context" value="opac" /> > <fieldset class="brief"> > <label for="muserid">Login:</label><input type="text" id="muserid" name="userid" /> >@@ -372,9 +379,8 @@ > </div> > [% END %] > </fieldset> >- </div> >- <div class="modal-footer"> > <input type="submit" class="btn btn-primary" value="Log in" /> >+ </div> > </div> > </form> <!-- /#auth --> > </div> <!-- /#modalAuth --> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/js/global.js b/koha-tmpl/opac-tmpl/bootstrap/js/global.js >index 76ce7b5cb0..05933eedab 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/js/global.js >+++ b/koha-tmpl/opac-tmpl/bootstrap/js/global.js >@@ -91,3 +91,8 @@ function confirmModal(message, title, yes_label, no_label, callback) { > $("#bootstrap-confirm-box-modal-cancel").text( no_label || 'Cancel' ); > $("#bootstrap-confirm-box-modal").modal('show'); > } >+ >+/*jQuery UI Tabs for login modal*/ >+$( function() { >+ $( "#loginTabs" ).tabs(); >+} ); >-- >2.11.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 25405
:
104464
|
104465
|
104516
|
104520
|
104522
|
104542
|
114754
|
116346
|
116348
|
116349
|
116350
|
116351