@@ -, +, @@ 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(-) --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt +++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt @@ -62,7 +62,19 @@ [% IF ( invalidShibLogin ) %]
-

Sorry, your Shibboleth identity does not match a valid library identity. If you have a local login, you may use that below.

+

+ Sorry, your Shibboleth identity does not match a valid library identity. + [% IF ( casAuthentication ) %] + [% IF ( invalidCasLogin ) %] + +

Sorry, the CAS login also failed, if you have a local login you may use that below.

+ [% ELSE %] + If you have a CAS account, you may use that below. + [% END %] + [% ELSE %] + If you have a local account, you may use that below. + [% END %] +

[% ELSE %]

Shibboleth Login

@@ -70,12 +82,31 @@

If you have a Shibboleth account, please click here to login.

[% END %] -

Local Login

-

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

+ [% IF ( casAuthentication ) %] +

CAS login

+

If you do not have a Shibboleth account, but you do have a CAS account, + [% ELSE %] +

Local login

+

If you do not have a Shibboleth account, but you do have a local login, then you may login below:

+ [% END %] [% END %] [% IF ( casAuthentication ) %] + [% IF ( shibbolethAuthentication ) %] + [% IF ( casServerUrl ) %] + please click here to login.

+ [% END %] + + [% IF ( casServersLoop ) %] + please choose against which one you would like to authenticate:

+ + [% END %] + [% ELSE %]

CAS login

[% IF ( invalidCasLogin ) %] @@ -89,16 +120,21 @@ [% END %] [% IF ( casServersLoop ) %] - Please choose against which one you would like to authenticate:

+ please choose against which one you would like to authenticate:

[% END %] + [% END %] + [% IF ( shibbolethAuthentication ) %] +

Nothing

+ [% ELSE %]

Local login

-

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

+

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

+ [% END %] [% END # / IF casAuthentication %] --