From dcc1dfeee0ee300d43ec3861d48e808050979901 Mon Sep 17 00:00:00 2001
From: Pedro Amorim <pedro.amorim@ptfs-europe.com>
Date: Thu, 22 Feb 2024 12:10:31 +0000
Subject: [PATCH] Bug 36150: Update circulation-home.tt layout

Test plan:
Compare both pages:
<staff_url>/cgi-bin/koha/cataloguing/cataloging-home.pl
<staff_url>/cgi-bin/koha/circ/circulation-home.pl

Apply patch
Compare both pages again

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit b7f9a86677323d72adabeacc3f123fc8ee4c7d7e)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
---
 .../prog/en/modules/circ/circulation-home.tt  | 292 +++++++++---------
 1 file changed, 148 insertions(+), 144 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt
index 414d6224c7..e636ddb0db 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt
@@ -23,161 +23,165 @@
 [% END #/ WRAPPER sub-header.inc %]
 
     <div class="main container-fluid">
-
-        <h1>Circulation</h1>
+        <div class="row">
+            <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
                 [% INCLUDE 'messages.inc' %]
 
-        <div class="row">
+                <h1>Circulation</h1>
 
-            <div class="col-sm-5 col-md-4">
-                <h3>Circulation</h3>
-
-                <ul class="buttons-list">
-                    <li>
-                        <a class="circ-button" href="/cgi-bin/koha/circ/circulation.pl"><i class="fa fa-upload"></i> Check out</a>
-                    </li>
-                    <li>
-                        <a class="circ-button" href="/cgi-bin/koha/circ/returns.pl"><i class="fa fa-download"></i> Check in</a>
-                    </li>
-                    <li>
-                        <a class="circ-button" href="/cgi-bin/koha/circ/renew.pl"><i class="fa fa-retweet"></i> Renew</a>
-                    </li>
-                    [% IF ( CAN_user_superlibrarian || CAN_user_loggedinlibrary ) %]
-                        <li>
-                            [% IF Koha.Preference('UseCirculationDesks') %]
-                            <a class="circ-button" href="/cgi-bin/koha/circ/set-library.pl"><i class="fa fa-home"></i> Set library and desk</a>
-                            [% ELSE %]
-                            <a class="circ-button" href="/cgi-bin/koha/circ/set-library.pl"><i class="fa fa-home"></i> Set library</a>
+                <div class="row">
+
+                    <div class="col-sm-5 col-md-4">
+                        <h3>Circulation</h3>
+
+                        <ul class="buttons-list">
+                            <li>
+                                <a class="circ-button" href="/cgi-bin/koha/circ/circulation.pl"><i class="fa fa-upload"></i> Check out</a>
+                            </li>
+                            <li>
+                                <a class="circ-button" href="/cgi-bin/koha/circ/returns.pl"><i class="fa fa-download"></i> Check in</a>
+                            </li>
+                            <li>
+                                <a class="circ-button" href="/cgi-bin/koha/circ/renew.pl"><i class="fa fa-retweet"></i> Renew</a>
+                            </li>
+                            [% IF ( CAN_user_superlibrarian || CAN_user_loggedinlibrary ) %]
+                                <li>
+                                    [% IF Koha.Preference('UseCirculationDesks') %]
+                                    <a class="circ-button" href="/cgi-bin/koha/circ/set-library.pl"><i class="fa fa-home"></i> Set library and desk</a>
+                                    [% ELSE %]
+                                    <a class="circ-button" href="/cgi-bin/koha/circ/set-library.pl"><i class="fa fa-home"></i> Set library</a>
+                                    [% END %]
+                                </li>
+                            [% ELSIF Koha.Preference('UseCirculationDesks') %]
+                                <li>
+                                    <a class="circ-button" href="/cgi-bin/koha/circ/set-library.pl"><i class="fa fa-home"></i> Set desk</a>
+                                </li>
                             [% END %]
-                        </li>
-                    [% ELSIF Koha.Preference('UseCirculationDesks') %]
-                        <li>
-                            <a class="circ-button" href="/cgi-bin/koha/circ/set-library.pl"><i class="fa fa-home"></i> Set desk</a>
-                        </li>
-                    [% END %]
-                    [% IF ( fast_cataloging ) %]
-                        [% IF ( CAN_user_editcatalogue_fast_cataloging ) %]
+                            [% IF ( fast_cataloging ) %]
+                                [% IF ( CAN_user_editcatalogue_fast_cataloging ) %]
+                                    <li>
+                                        <a class="circ-button" href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=FA"><i class="fa fa-plus"></i> Fast cataloging</a>
+                                    </li>
+                                [% END %]
+                            [% END %]
+                            [% IF ( Koha.Preference('AllowCheckoutNotes') && CAN_user_circulate_manage_checkout_notes ) %]
+                                <li>
+                                    <a class="circ-button" href="/cgi-bin/koha/circ/checkout-notes.pl"><i class="fa fa-sticky-note"></i> Checkout notes</a>
+                                </li>
+                            [% END %]
+                            [% IF Koha.Preference('OnSiteCheckouts') %]
+                                <li>
+                                    <a class="circ-button" href="/cgi-bin/koha/circ/on-site_checkouts.pl"><i class="fa-solid fa-location-dot"></i> Pending on-site checkouts</a>
+                                </li>
+                            [% END %]
+                        </ul>
+                    </div>
+
+                    <div class="col-sm-5 col-md-4">
+                        <h3>Holds</h3>
+
+                        <ul class="buttons-list">
                             <li>
-                                <a class="circ-button" href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=FA"><i class="fa fa-plus"></i> Fast cataloging</a>
+                                <a class="circ-button" href="/cgi-bin/koha/circ/view_holdsqueue.pl"><i class="fa fa-tasks"></i> Holds queue</a>
                             </li>
+                            <li>
+                                <a class="circ-button" href="/cgi-bin/koha/circ/pendingreserves.pl"><i class="fa-solid fa-hand-back-fist"></i> Holds to pull</a>
+                            </li>
+                            <li>
+                                <a class="circ-button" href="/cgi-bin/koha/circ/waitingreserves.pl"><i class="fa-solid fa-calendar-days"></i> Holds awaiting pickup</a>
+                            </li>
+                            [% IF ( Koha.Preference('CurbsidePickup') && CAN_user_circulate_manage_curbside_pickups ) %]
+                            <li>
+                                <a class="circ-button" href="/cgi-bin/koha/circ/curbside_pickups.pl"><i class="fa-solid fa-rotate"></i> Curbside pickups</a>
+                            </li>
+                            [% END %]
+                            <li>
+                                <a class="circ-button" href="/cgi-bin/koha/circ/reserveratios.pl"><i class="fa-solid fa-chart-line"></i> Hold ratios</a>
+                            </li>
+                        </ul>
+
+                        [% IF Koha.Preference('UseRecalls') and CAN_user_recalls %]
+                            <h3>Recalls</h3>
+
+                            <ul class="buttons-list">
+                                <li><a class="circ-button" href="/cgi-bin/koha/recalls/recalls_queue.pl" title="All active recalls"><i class="fa fa-tasks"></i> Recalls queue</a></li>
+                                <li><a class="circ-button" href="/cgi-bin/koha/recalls/recalls_to_pull.pl" title="Recalls that could be filled but have not been set waiting"><i class="fa-solid fa-hand-back-fist"></i> Recalls to pull</a></li>
+                                <li><a class="circ-button" href="/cgi-bin/koha/recalls/recalls_overdue.pl" title="Recalled items that are overdue to be returned"><i class="fa-solid fa-clock"></i> Overdue recalls</a></li>
+                                <li><a class="circ-button" href="/cgi-bin/koha/recalls/recalls_waiting.pl" title="Recalled items awaiting pickup"><i class="fa-solid fa-calendar-days"></i> Recalls awaiting pickup</a></li>
+                                <li><a class="circ-button" href="/cgi-bin/koha/recalls/recalls_old_queue.pl" title="Inactive recalls"><i class="fa fa-tasks"></i> Old recalls</a></li>
+                            </ul>
                         [% END %]
-                    [% END %]
-                    [% IF ( Koha.Preference('AllowCheckoutNotes') && CAN_user_circulate_manage_checkout_notes ) %]
-                        <li>
-                            <a class="circ-button" href="/cgi-bin/koha/circ/checkout-notes.pl"><i class="fa fa-sticky-note"></i> Checkout notes</a>
-                        </li>
-                    [% END %]
-                    [% IF Koha.Preference('OnSiteCheckouts') %]
-                        <li>
-                            <a class="circ-button" href="/cgi-bin/koha/circ/on-site_checkouts.pl"><i class="fa-solid fa-location-dot"></i> Pending on-site checkouts</a>
-                        </li>
-                    [% END %]
-                </ul>
-            </div>
+                    </div>
 
-            <div class="col-sm-5 col-md-4">
-                <h3>Holds</h3>
-
-                <ul class="buttons-list">
-                    <li>
-                        <a class="circ-button" href="/cgi-bin/koha/circ/view_holdsqueue.pl"><i class="fa fa-tasks"></i> Holds queue</a>
-                    </li>
-                    <li>
-                        <a class="circ-button" href="/cgi-bin/koha/circ/pendingreserves.pl"><i class="fa-solid fa-hand-back-fist"></i> Holds to pull</a>
-                    </li>
-                    <li>
-                        <a class="circ-button" href="/cgi-bin/koha/circ/waitingreserves.pl"><i class="fa-solid fa-calendar-days"></i> Holds awaiting pickup</a>
-                    </li>
-                    [% IF ( Koha.Preference('CurbsidePickup') && CAN_user_circulate_manage_curbside_pickups ) %]
-                    <li>
-                        <a class="circ-button" href="/cgi-bin/koha/circ/curbside_pickups.pl"><i class="fa-solid fa-rotate"></i> Curbside pickups</a>
-                    </li>
-                    [% END %]
-                    <li>
-                        <a class="circ-button" href="/cgi-bin/koha/circ/reserveratios.pl"><i class="fa-solid fa-chart-line"></i> Hold ratios</a>
-                    </li>
-                </ul>
-
-                [% IF Koha.Preference('UseRecalls') and CAN_user_recalls %]
-                    <h3>Recalls</h3>
-
-                    <ul class="buttons-list">
-                        <li><a class="circ-button" href="/cgi-bin/koha/recalls/recalls_queue.pl" title="All active recalls"><i class="fa fa-tasks"></i> Recalls queue</a></li>
-                        <li><a class="circ-button" href="/cgi-bin/koha/recalls/recalls_to_pull.pl" title="Recalls that could be filled but have not been set waiting"><i class="fa-solid fa-hand-back-fist"></i> Recalls to pull</a></li>
-                        <li><a class="circ-button" href="/cgi-bin/koha/recalls/recalls_overdue.pl" title="Recalled items that are overdue to be returned"><i class="fa-solid fa-clock"></i> Overdue recalls</a></li>
-                        <li><a class="circ-button" href="/cgi-bin/koha/recalls/recalls_waiting.pl" title="Recalled items awaiting pickup"><i class="fa-solid fa-calendar-days"></i> Recalls awaiting pickup</a></li>
-                        <li><a class="circ-button" href="/cgi-bin/koha/recalls/recalls_old_queue.pl" title="Inactive recalls"><i class="fa fa-tasks"></i> Old recalls</a></li>
-                    </ul>
-                [% END %]
-            </div>
+                    <!-- Add the extra clearfix for only the required viewport -->
+                    <div class="clearfix visible-sm-block"></div>
+
+                    <div class="col-sm-5 col-md-4">
+                        [% IF Koha.Preference('ArticleRequests') %]
+                            <h3>Patron request</h3>
+                            <ul class="buttons-list">
+                                <li>
+                                    <a class="circ-button" href="/cgi-bin/koha/circ/article-requests.pl" title="Article requests"><i class="fa-solid fa-newspaper"></i> Article requests</a>
+                                </li>
+                            </ul>
+                        [% END %]
 
-            <!-- Add the extra clearfix for only the required viewport -->
-            <div class="clearfix visible-sm-block"></div>
-
-            <div class="col-sm-5 col-md-4">
-                [% IF Koha.Preference('ArticleRequests') %]
-                    <h3>Patron request</h3>
-                    <ul class="buttons-list">
-                        <li>
-                            <a class="circ-button" href="/cgi-bin/koha/circ/article-requests.pl" title="Article requests"><i class="fa-solid fa-newspaper"></i> Article requests</a>
-                        </li>
-                    </ul>
-                [% END %]
-
-                <h3>Transfers</h3>
-
-                <ul class="buttons-list">
-                    [% IF !Koha.Preference('IndependentBranchesTransfers') || CAN_user_superlibrarian %]
-                        <li>
-                            <a class="circ-button" href="/cgi-bin/koha/circ/branchtransfers.pl"><i class="fa-solid fa-right-left"></i> Transfer</a>
-                        </li>
-                    [% END %]
-                    [% IF Koha.Preference('StockRotation') %]
-                        <li>
-                            <a class="circ-button" href="/cgi-bin/koha/circ/transfers_to_send.pl"><i class="fa-solid fa-right-from-bracket"></i> Transfers to send</a>
-                        </li>
-                    [% END %]
-                    <li>
-                        <a class="circ-button" href="/cgi-bin/koha/circ/transferstoreceive.pl"><i class="fa-solid fa-right-to-bracket"></i> Transfers to receive</a>
-                    </li>
-                </ul>
-
-                [% IF ( CAN_user_circulate_overdues_report ) %]
-                <h3>Overdues</h3>
-
-                <ul class="buttons-list">
-                        <li>
-                            <a class="circ-button"
-                                href="/cgi-bin/koha/circ/overdue.pl"
-                                title="Warning: This report is very resource intensive on systems with large numbers of overdue items."
-                            ><i class="fa-solid fa-clock"></i> Overdues</a>
-                        </li>
-                    <li>
-                        <a class="circ-button"
-                            href="/cgi-bin/koha/circ/branchoverdues.pl"
-                            title="Limited to your library.  See report help for other details."
-                        ><i class="fa-solid fa-clock"></i> Overdues with fines</a>
-                    </li>
-                </ul>
-                [% END %]
-            </div>
-        </div>
-        <div class="row" id="intranet-circulation-home-html">
-            <div class="col-md-12">
-                [% Koha.Preference('IntranetCirculationHomeHTML') | $raw  %]
-            </div>
-        </div>
-        <div class="row" id="offline-circulation">
-            <div class="col-md-12">
-                <h4>Offline circulation</h4>
-                    <div class="col-sm-5 col-md-3">
-                       <p><a href="/cgi-bin/koha/offline_circ/process_koc.pl">Upload offline circulation file (.koc)</a></p>
-                       <p><a href="/cgi-bin/koha/offline_circ/list.pl">Pending offline circulation actions</a></p>
+                        <h3>Transfers</h3>
+
+                        <ul class="buttons-list">
+                            [% IF !Koha.Preference('IndependentBranchesTransfers') || CAN_user_superlibrarian %]
+                                <li>
+                                    <a class="circ-button" href="/cgi-bin/koha/circ/branchtransfers.pl"><i class="fa-solid fa-right-left"></i> Transfer</a>
+                                </li>
+                            [% END %]
+                            [% IF Koha.Preference('StockRotation') %]
+                                <li>
+                                    <a class="circ-button" href="/cgi-bin/koha/circ/transfers_to_send.pl"><i class="fa-solid fa-right-from-bracket"></i> Transfers to send</a>
+                                </li>
+                            [% END %]
+                            <li>
+                                <a class="circ-button" href="/cgi-bin/koha/circ/transferstoreceive.pl"><i class="fa-solid fa-right-to-bracket"></i> Transfers to receive</a>
+                            </li>
+                        </ul>
+
+                        [% IF ( CAN_user_circulate_overdues_report ) %]
+                        <h3>Overdues</h3>
+
+                        <ul class="buttons-list">
+                                <li>
+                                    <a class="circ-button"
+                                        href="/cgi-bin/koha/circ/overdue.pl"
+                                        title="Warning: This report is very resource intensive on systems with large numbers of overdue items."
+                                    ><i class="fa-solid fa-clock"></i> Overdues</a>
+                                </li>
+                            <li>
+                                <a class="circ-button"
+                                    href="/cgi-bin/koha/circ/branchoverdues.pl"
+                                    title="Limited to your library.  See report help for other details."
+                                ><i class="fa-solid fa-clock"></i> Overdues with fines</a>
+                            </li>
+                        </ul>
+                        [% END %]
+                    </div>
+                </div>
+                <div class="row" id="intranet-circulation-home-html">
+                    <div class="col-md-12">
+                        [% Koha.Preference('IntranetCirculationHomeHTML') | $raw  %]
                     </div>
-                    <div class="col-sm-5 col-md-3">
-                    <p><a href="https://github.com/bywatersolutions/koha-offline-circulation/releases"><i class="fa-solid fa-window-maximize"></i> Get desktop application</a></p>
-                    <p><a href="https://addons.mozilla.org/[% lang | uri %]/firefox/addon/koct/"><i class="fa-brands fa-firefox"></i> Get Firefox add-on</a></p>
+                </div>
+                <div class="row" id="offline-circulation">
+                    <div class="col-md-12">
+                        <h4>Offline circulation</h4>
+                            <div class="col-sm-5 col-md-3">
+                                <p><a href="/cgi-bin/koha/offline_circ/process_koc.pl">Upload offline circulation file (.koc)</a></p>
+                                <p><a href="/cgi-bin/koha/offline_circ/list.pl">Pending offline circulation actions</a></p>
+                            </div>
+                            <div class="col-sm-5 col-md-3">
+                                <p><a href="https://github.com/bywatersolutions/koha-offline-circulation/releases"><i class="fa-solid fa-window-maximize"></i> Get desktop application</a></p>
+                                <p><a href="https://addons.mozilla.org/[% lang | uri %]/firefox/addon/koct/"><i class="fa-brands fa-firefox"></i> Get Firefox add-on</a></p>
+                            </div>
                     </div>
+                </div>
             </div>
         </div>
 
-- 
2.39.5