From 0db79efe10786949be6fbb1edf8a7f793084fc32 Mon Sep 17 00:00:00 2001 From: Lucas Gass Date: Mon, 29 Aug 2022 16:01:52 +0000 Subject: [PATCH] Bug 30624: (follow-up) Remove IndependentBraches check on auth.tt --- .../prog/en/includes/circ-nav.inc | 4 +- .../intranet-tmpl/prog/en/modules/auth.tt | 59 +++++++++---------- 2 files changed, 30 insertions(+), 33 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc index 71876ed988..1db949b3be 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc @@ -13,9 +13,9 @@ [% END %] [% IF ( CAN_user_parameters_select_loggedin_library ) %] [% IF Koha.Preference('UseCirculationDesks') %] - Set library and desk +
  • Set library and desk
  • [% ELSE %] - Set library +
  • Set library
  • [% END %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt index e2db5e0f30..3ecd6da3d2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt @@ -85,39 +85,36 @@

    - [% UNLESS IndependentBranches %] -

    - - -

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

    - - -

    - [% END %] +

    + + +

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

    - - -

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

    + + +

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

    + + +

    [% END %] -- 2.30.2