Bugzilla – Attachment 30031 Details for
Bug 8446
Shibboleth authentication
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
BUG8446, Follow up: Add template rules for Shibboleth and CAS
BUG8446-Follow-up-Add-template-rules-for-Shibbolet.patch (text/plain), 5.53 KB, created by
Martin Renvoize
on 2014-07-24 14:33:37 UTC
(
hide
)
Description:
BUG8446, Follow up: Add template rules for Shibboleth and CAS
Filename:
MIME Type:
Creator:
Martin Renvoize
Created:
2014-07-24 14:33:37 UTC
Size:
5.53 KB
patch
obsolete
>From 88dbac45adae20371fd3dcbdad0cefef87e2b165 Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Thu, 24 Jul 2014 14:29:23 +0000 >Subject: [PATCH] BUG8446, Follow up: Add template rules for Shibboleth and > CAS > >- Add template ruels so that CAS and Shibboleth can coexist. >--- > .../opac-tmpl/bootstrap/en/modules/opac-auth.tt | 46 +++++++++++++++++--- > 1 file changed, 41 insertions(+), 5 deletions(-) > >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 6d133e6..c03e41f 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt >@@ -62,7 +62,19 @@ > [% IF ( invalidShibLogin ) %] > <!-- This is what is displayed if shibboleth login has failed to match a koha user --> > <div class="alert alert-info"> >- <p>Sorry, your Shibboleth identity does not match a valid library identity. If you have a local login, you may use that below.</p> >+ <p> >+ Sorry, your Shibboleth identity does not match a valid library identity. >+ [% IF ( casAuthentication ) %] >+ [% IF ( invalidCasLogin ) %] >+ <!-- This is what is displayed if cas login has failed --> >+ <p>Sorry, the CAS login also failed, if you have a local login you may use that below.</p> >+ [% ELSE %] >+ If you have a <acronym title="Central Authentication Service">CAS</acronym> account, you may use that below. >+ [% END %] >+ [% ELSE %] >+ If you have a local account, you may use that below. >+ [% END %] >+ </p> > </div> > [% ELSE %] > <h4>Shibboleth Login</h4> >@@ -70,12 +82,31 @@ > <p>If you have a Shibboleth account, > please <a href="[% shibbolethLoginUrl %]">click here to login</a>.</p> > [% END %] >- <h4>Local Login</h4> >- <p>If you do not have a Shibboleth account, but a local account, you can still log in: </p> >+ [% IF ( casAuthentication ) %] >+ <h4>CAS login</h4> >+ <p>If you do not have a Shibboleth account, but you do have a <acronym title="Central Authentication Service">CAS</acronym> account, >+ [% ELSE %] >+ <h4>Local login</h4> >+ <p>If you do not have a Shibboleth account, but you do have a local login, then you may login below:</p> >+ [% END %] > > [% END %] > > [% IF ( casAuthentication ) %] >+ [% IF ( shibbolethAuthentication ) %] >+ [% IF ( casServerUrl ) %] >+ please <a href="[% casServerUrl %]">click here to login</a>.<p> >+ [% END %] >+ >+ [% IF ( casServersLoop ) %] >+ please choose against which one you would like to authenticate: </p> >+ <ul> >+ [% FOREACH casServer IN casServersLoop %] >+ <li><a href="[% casServer.value %]">[% casServer.name %]</a></li> >+ [% END %] >+ </ul> >+ [% END %] >+ [% ELSE %] > <h4>CAS login</h4> > > [% IF ( invalidCasLogin ) %] >@@ -89,16 +120,21 @@ > [% END %] > > [% IF ( casServersLoop ) %] >- Please choose against which one you would like to authenticate: </p> >+ please choose against which one you would like to authenticate: </p> > <ul> > [% FOREACH casServer IN casServersLoop %] > <li><a href="[% casServer.value %]">[% casServer.name %]</a></li> > [% END %] > </ul> > [% END %] >+ [% END %] > >+ [% IF ( shibbolethAuthentication ) %] >+ <p>Nothing</p> >+ [% ELSE %] > <h4>Local login</h4> >- <p>If you do not have a CAS account, but a local account, you can still log in: </p> >+ <p>If you do not have a CAS account, but do have a local account, you can still log in: </p> >+ [% END %] > > [% END # / IF casAuthentication %] > >-- >1.7.10.4
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 8446
:
10841
|
22098
|
22107
|
22860
|
23224
|
23225
|
23226
|
25765
|
25766
|
26176
|
26177
|
26178
|
26187
|
26749
|
26750
|
26751
|
26752
|
26760
|
26761
|
26762
|
28892
|
28893
|
28894
|
28895
|
28896
|
28897
|
28898
|
28899
|
28900
|
28901
|
28902
|
28903
|
30017
|
30018
|
30019
|
30020
|
30021
|
30022
|
30023
|
30030
|
30031
|
30033
|
30283
|
30284
|
30285
|
30286
|
30335
|
30353
|
30354
|
30355
|
30356
|
30384
|
30594
|
30604
|
30605
|
30616
|
30617
|
30618
|
30619
|
30620
|
30621
|
30684
|
31407
|
31408
|
31836
|
31905
|
31906
|
31907
|
32125
|
32158
|
32162
|
32163
|
32164
|
32165
|
32166
|
32167
|
32168
|
32169
|
32170
|
32365
|
32366
|
32367
|
32368
|
32369
|
32370
|
32371
|
32372
|
32373
|
32374
|
32426
|
32427