From 257ee57c80eb4a3dfe8bcdbb9687032199058eee Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Thu, 7 Jul 2022 12:39:01 +0100
Subject: [PATCH] Bug 31116: Add circulation sidebar to article requests

This patch adds the circulation sidebar menu to the article requests
page to make it consistent with other circulation module pages.

Test plan
1) Prior to applying the patch confirm that there is no sidebar on the
   article requests management page, regardless of the CircSidebar
   perference.
2) Apply the patch
3) Confirm there is still no sidebar when CircSidebar is disabled
4) Confirm there is now a sidebar present when CircSidebar is enabled
5) Confirm the current page is highlighted correctly in the sidebar when
   on the article requests page.

Signed-off-by: David Nind <david@davidnind.com>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 .../intranet-tmpl/prog/en/includes/circ-nav.inc |  7 +++++++
 .../prog/en/modules/circ/article-requests.tt    | 17 ++++++++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

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 99b882c76a..01631fecce 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc
@@ -32,6 +32,13 @@
             [% END %]
         </ul>
 
+        [% IF Koha.Preference('ArticleRequests') %]
+        <h5>Patron request</h5>
+        <ul>
+            <li><a href="/cgi-bin/koha/circ/article-requests.pl">Article requests</a></li>
+        </ul>
+        [% END %]
+
         <h5>Circulation reports</h5>
         <ul>
             <li><a href="/cgi-bin/koha/circ/view_holdsqueue.pl">Holds queue</a></li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt
index d453a7de33..c120615041 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt
@@ -1,8 +1,10 @@
 [% USE KohaDates %]
+[% USE Koha %]
 [% USE ItemTypes %]
 [% USE Branches %]
 [% USE AuthorisedValues %]
 [% USE Asset %]
+[% USE Koha %]
 [% USE raw %]
 [% SET footerjs = 1 %]
 [% INCLUDE 'doc-head-open.inc' %]
@@ -148,7 +150,12 @@
 
     <div class="main container-fluid starthidden">
         <div class="row">
-            <div class="col-md-10 col-md-offset-1 col-lg-10 col-lg-offset-1">
+
+            [% IF Koha.Preference('CircSidebar') %]
+            <div class="col-sm-10 col-sm-push-2">
+            [% ELSE %]
+            <div class="col-md-12 col-lg-10 col-lg-offset-1">
+            [% END %]
 
                 <h1>Article requests</h1>
                 [% PROCESS urls_modal %]
@@ -511,6 +518,14 @@
                     <br/>
                 </div>
             </div>
+
+            [% IF Koha.Preference('CircSidebar') %]
+            <div class="col-sm-2 col-sm-pull-10">
+                <aside>
+                    [% INCLUDE 'circ-nav.inc' %]
+                </aside>
+            </div>
+            [% END %]
         </div>
     </div>
     [% PROCESS cancel_modal %]
-- 
2.20.1