From 0db79efe10786949be6fbb1edf8a7f793084fc32 Mon Sep 17 00:00:00 2001
From: Lucas Gass <lucas@bywatersolutions.com>
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') %]
-                <a href="/cgi-bin/koha/circ/set-library.pl">Set library and desk</a>
+                <li><a href="/cgi-bin/koha/circ/set-library.pl">Set library and desk</a></li>
                 [% ELSE %]
-                <a href="/cgi-bin/koha/circ/set-library.pl">Set library</a>
+                <li><a href="/cgi-bin/koha/circ/set-library.pl">Set library</a></li>
                 [% END %]
             </li>
             [% 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 @@
     <input type="password" name="password" id="password" class="input" value="" size="20" tabindex="2" autocomplete="off" />
     </p>
 
-    [% UNLESS IndependentBranches %]
-        <p>
-            <label for="branch">Library:</label>
-            <select name="branch" id="branch" class="input" tabindex="3">
-                <option value="">My library</option>
-                [% FOREACH l IN Branches.all( unfiltered => 1 ) %]
-                    <option value="[% l.branchcode | html %]">[% l.branchname | html %]</option>
-                 [% END %]
-            </select>
-        </p>
-
-        [% IF Koha.Preference('UseCirculationDesks') && Desks.all %]
-        <p>
-            <label for="desk">Desk:</label>
-            <select name="desk_id" id="desk_id" class="input" tabindex="3">
-                <option id="nodesk" value="">---</option>
-                    [% FOREACH d IN Desks.all %]
-                    <option class="[% d.branchcode | html %]" value="[% d.desk_id | html %]" disabled >[% d.desk_name | html %]</option>
-                    [% END %]
-            </select>
-        </p>
-        [% END %]
+    <p>
+        <label for="branch">Library:</label>
+        <select name="branch" id="branch" class="input" tabindex="3">
+            <option value="">My library</option>
+            [% FOREACH l IN Branches.all( unfiltered => 1 ) %]
+                <option value="[% l.branchcode | html %]">[% l.branchname | html %]</option>
+             [% END %]
+        </select>
+    </p>
 
-        [% IF Koha.Preference('UseCashRegisters') && Registers.all().size %]
-        <p>
-            <label for="register_id">Cash register:</label>
-            <select name="register_id" id="register_id" class="input" tabindex="4">
-                <option id="noregister" value="" selected="selected">Library default</option>
-                [% PROCESS options_for_registers registers => Registers.all() %]
-            </select>
-        </p>
-        [% END %]
+    [% IF Koha.Preference('UseCirculationDesks') && Desks.all %]
+    <p>
+        <label for="desk">Desk:</label>
+        <select name="desk_id" id="desk_id" class="input" tabindex="3">
+            <option id="nodesk" value="">---</option>
+                [% FOREACH d IN Desks.all %]
+                <option class="[% d.branchcode | html %]" value="[% d.desk_id | html %]" disabled >[% d.desk_name | html %]</option>
+                [% END %]
+        </select>
+    </p>
+    [% END %]
 
+    [% IF Koha.Preference('UseCashRegisters') && Registers.all().size %]
+    <p>
+        <label for="register_id">Cash register:</label>
+        <select name="register_id" id="register_id" class="input" tabindex="4">
+            <option id="noregister" value="" selected="selected">Library default</option>
+            [% PROCESS options_for_registers registers => Registers.all() %]
+        </select>
+    </p>
     [% END %]
 
     <!-- <p><label><input name="rememberme" type="checkbox" id="rememberme" value="forever" tabindex="3" />Remember me</label></p> -->
-- 
2.30.2