From ccb36e956bc5ff761adf1f04756f62ad5b1458be Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Wed, 3 Feb 2021 15:48:29 +0000 Subject: [PATCH] Bug 18506: (QA follow-up) Indentation and more conditionals add Indentation fixes for readability Cleaned up a few places where the ability to login otherwise was leakign through Signed-off-by: Nick Clemens --- koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt | 120 ++++++------ .../opac-tmpl/bootstrap/en/includes/masthead.inc | 54 ++--- .../opac-tmpl/bootstrap/en/modules/opac-auth.tt | 218 ++++++++++----------- .../opac-tmpl/bootstrap/en/modules/opac-main.tt | 2 +- 4 files changed, 201 insertions(+), 193 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt index 8d4cf0c240..b4a5448413 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt @@ -61,78 +61,80 @@

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 %]

- - + + [% FOREACH l IN Branches.all( unfiltered => 1 ) %] + + [% END %]

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

- - -

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

+ + +

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

+ + +

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

-
-[% IF ( casAuthentication ) %] -

Cas login

+

+ + [% IF ( casAuthentication ) %] +

Cas login

-[% IF ( invalidCasLogin ) %] - -

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:

-