@@ -, +, @@ --- .../intranet-tmpl/prog/en/modules/auth.tt | 108 ++++----- .../bootstrap/en/includes/masthead.inc | 54 +++-- .../bootstrap/en/modules/opac-auth.tt | 218 +++++++++--------- .../bootstrap/en/modules/opac-main.tt | 2 +- 4 files changed, 195 insertions(+), 187 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt @@ -7,7 +7,7 @@ [% USE Registers %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -
If you have a shibboleth account, please click here to login.
[% END %] - - - - -[% IF ( casAuthentication ) %] -Sorry, the CAS login failed.
-[% END %] + [% IF ( invalidCasLogin ) %] + +Sorry, the CAS login failed.
+ [% END %] -[% IF ( casServerUrl ) %] -If you have a CAS account, please click here to login.
-[% END %] + [% IF ( casServerUrl ) %] +
If you have a CAS account, please click here to login.
+ [% END %] -[% IF ( casServersLoop ) %] -
If you have a CAS account, please choose against which one you would like to authenticate:
-If you have a CAS account, please choose against which one you would like to authenticate:
+[Previous page] --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc +++ a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc @@ -379,33 +379,39 @@ [% ELSE %]
Log in using a Shibboleth account.
-Sorry, your Shibboleth identity does not match a valid library identity.
[% UNLESS ( Koha.Preference('OPACShibOnly') ) %] - [% IF ( casAuthentication ) %] - [% IF ( invalidCasLogin ) %] - -Sorry, the CAS login also failed. If you have a local login you may use that below.
+ [% 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 CAS account, you may use that below.
+If you have a local account, you may use that below.
[% END %] - [% ELSE %] -If you have a local account, you may use that below.
- [% END %] [% END %]Log in using a Shibboleth account.
[% END # /IF invalidShibLogin %] [% UNLESS ( Koha.Preference('OPACShibOnly') ) %] - [% IF ( casAuthentication ) %] -If you do not have a Shibboleth account, but you do have a CAS account, you can use CAS.
- [% ELSE %] -If you do not have a Shibboleth account, but you do have a local login, then you may login below.
- [% END %] + [% IF ( casAuthentication ) %] +If you do not have a Shibboleth account, but you do have a CAS account, you can use CAS.
+ [% ELSE %] +If you do not have a Shibboleth account, but you do have a local login, then you may login below.
+ [% END %] [% END %] [% END # /IF shibbolethAuthentication %] [% UNLESS ( Koha.Preference('OPACShibOnly') ) %] - [% IF ( casAuthentication ) %] - [% IF ( shibbolethAuthentication ) %] - [% IF ( casServerUrl ) %] -- [% END %] + [% IF ( casAuthentication ) %] + [% IF ( shibbolethAuthentication ) %] + [% IF ( casServerUrl ) %] +
+ [% END %] + + [% IF ( casServersLoop ) %] +
Please choose against which one you would like to authenticate:
+Please choose against which one you would like to authenticate:
-Sorry, the CAS login failed.
+ [% END %] - [% IF ( invalidCasLogin ) %] - -Sorry, the CAS login failed.
- [% END %] + [% IF ( casServerUrl ) %] ++ [% END %] - [% IF ( casServerUrl ) %] -
- [% END %] + [% IF ( casServersLoop ) %] +
If you have a CAS account, please choose against which one you would like to authenticate:
+If you have a CAS account, please choose against which one you would like to authenticate:
-Nothing
+ [% ELSE %] +If you do not have a CAS account, but do have a local account, you can still log in:
[% END %] - [% END # /IF shibbolethAuthentication %] - [% IF ( shibbolethAuthentication ) %] -Nothing
- [% ELSE %] -If you do not have a CAS account, but do have a local account, you can still log in:
- [% END %] + [% END # / IF casAuthentication %] - [% END # / IF casAuthentication %] - - [% IF ( Koha.Preference('GoogleOpenIDConnect') == 1 ) %] - [% IF ( invalidGoogleOpenIDConnectLogin ) %] -Sorry, your Google login failed. [% invalidGoogleOpenIDConnectLogin | html %]
-Please note that the Google login will only work if you are using the e-mail address registered with this library.
-If you want to, you can try to log in using a different account - [% END %] - Log in with Google -
If you do not have a Google account, but do have a local account, you can still log in:
- [% END # /IF GoogleOpenIDConnect %] + [% IF ( Koha.Preference('GoogleOpenIDConnect') == 1 ) %] + [% IF ( invalidGoogleOpenIDConnectLogin ) %] +Sorry, your Google login failed. [% invalidGoogleOpenIDConnectLogin | html %]
+Please note that the Google login will only work if you are using the e-mail address registered with this library.
+If you want to, you can try to log in using a different account + [% END %] + Log in with Google +
If you do not have a Google account, but do have a local account, you can still log in:
+ [% END # /IF GoogleOpenIDConnect %] [% END # /UNLESS OPACShibOnly %] [% IF !Koha.Preference('OPACShibOnly') or SCO_login or SCI_login %] - [% IF SCO_login %] -If you don't have a password yet, stop by the circulation desk the next time you're in the library. We'll happily set one up for you.
+If you don't have a library card, stop by your local library to sign up.
+ [% END # / IF Koha.Preference('OpacLoginInstructions') %] + + [% IF PatronSelfRegistration && PatronSelfRegistrationDefaultCategory %] + + You may register here. + + [% END %] +