@@ -, +, @@ --- .../intranet-tmpl/prog/en/modules/auth.tt | 120 +++++----- .../bootstrap/en/includes/masthead.inc | 54 +++-- .../bootstrap/en/modules/opac-auth.tt | 218 +++++++++--------- .../bootstrap/en/modules/opac-main.tt | 2 +- 4 files changed, 201 insertions(+), 193 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt @@ -1,4 +1,4 @@ -[% USE raw %] +[% USE raw %] [% USE Asset %] [% USE Koha %] [% USE Branches %] @@ -61,31 +61,32 @@

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

[% END %] - -
- -[% FOREACH INPUT IN INPUTS %] - -[% END %] -

- -

-

- -

- -[% UNLESS IndependentBranches %] -

- - +[% UNLESS Koha.Preference('staffShibOnly') %] + + + + [% FOREACH INPUT IN INPUTS %] + + [% END %] +

+ +

+

+

- [% IF Koha.Preference('UseCirculationDesks') && Desks.all %] + [% UNLESS IndependentBranches %] +

+ + +

+ + [% IF Koha.Preference('UseCirculationDesks') && Desks.all %]

- [% END %] - - [% IF Koha.Preference('UseCashRegisters') && Registers.all().size %] -

- - -

- [% END %] + [% END %] - -[% END %] - - - -

-
-[% IF ( casAuthentication ) %] -

Cas login

- -[% IF ( invalidCasLogin ) %] - -

Sorry, the CAS login failed.

-[% END %] + [% IF Koha.Preference('UseCashRegisters') && Registers.all().size %] +

+ + +

+ [% END %] -[% IF ( casServerUrl ) %] -

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

-[% END %] + [% END %] -[% IF ( casServersLoop ) %] -

If you have a CAS account, please choose against which one you would like to authenticate:

-