From bf2c0be829c6129fa860b01f60ef3da04d10ecc7 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Mon, 23 Jan 2017 15:57:54 +0000
Subject: [PATCH] Bug 17972 - Reformat acquisitions sidebar menu with
 acquisitions and administration sections

This patch makes changes to acquisitions-menu.inc so that the style
matches that of the Administration and Tools sidebar menus. The links
are now divided up between Acquisitions (/acqui/) and Administration
(/admin/). The link-highlighting JavaScript used elsewhere has been
added.

To test, apply the patch and view the Acquisitions home page.

- Check that the "Acquisitions home" link is highlighted (bold).
- Test the other Acquisitions links to confirm that highlighting works.
- Click any link in the Administration section of the sidebar menu.
- Confirm that everything looks correct and works correctly.

Signed-off-by: Aleisha Amohia <aleishaamohia@hotmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
---
 .../prog/en/includes/acquisitions-menu.inc    | 55 +++++++++++++------
 1 file changed, 38 insertions(+), 17 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc
index 15de63900d..6ebe510ea6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc
@@ -1,17 +1,38 @@
-<ul>
-	<li><a href="/cgi-bin/koha/acqui/lateorders.pl">Late orders</a></li>
-	[% IF ( suggestion ) %]<li><a href="/cgi-bin/koha/suggestion/suggestion.pl">Suggestions</a></li>[% ELSE %][% END %]
-    <li><a href="/cgi-bin/koha/acqui/invoices.pl">Invoices</a></li>
-    [% IF ( CAN_user_acquisition_budget_manage ) %]
-    <li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a></li>
-    <li><a href="/cgi-bin/koha/admin/aqbudgets.pl">Funds</a></li>
-    [% END %]
-    [% IF ( CAN_user_parameters ) %]
-     <li><a href="/cgi-bin/koha/admin/currency.pl">Currencies</a></li>
-    [% END %]
-    [% IF CAN_user_acquisition_edi_manage %]
-     <li><a href="/cgi-bin/koha/acqui/edifactmsgs.pl">EDIFACT messages</a></li>
-     <li><a href="/cgi-bin/koha/admin/edi_accounts.pl">EDI accounts</a></li>
-     <li><a href="/cgi-bin/koha/admin/edi_ean_accounts.pl">Library EANs</a></li>
-    [% END %]
-</ul>
+<script type="text/javascript">//<![CDATA[
+    $(document).ready(function() {
+        var path = location.pathname.substring(1);
+        $('#navmenulist a[href$="/' + path + '"]').css('font-weight','bold');
+    });
+//]]>
+</script>
+<div id="navmenu">
+    <div id="navmenulist">
+        <h5>Acquisitions</h5>
+        <ul>
+            <li><a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions home</a></li>
+            <li><a href="/cgi-bin/koha/acqui/lateorders.pl">Late orders</a></li>
+            [% IF ( suggestion ) %]<li><a href="/cgi-bin/koha/suggestion/suggestion.pl">Suggestions</a></li>[% END %]
+                <li><a href="/cgi-bin/koha/acqui/invoices.pl">Invoices</a></li>
+            [% IF CAN_user_acquisition_edi_manage %]
+                <li><a href="/cgi-bin/koha/acqui/edifactmsgs.pl">EDIFACT messages</a></li>
+            [% END %]
+        </ul>
+        [% IF ( CAN_user_acquisition_budget_manage || CAN_user_parameters || CAN_user_acquisition_edi_manage ) %]
+            <h5>Administration</h5>
+            <ul>
+                <li><a href="/cgi-bin/koha/admin/admin-home.pl">Administration home</a></li>
+                [% IF ( CAN_user_acquisition_budget_manage ) %]
+                    <li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a></li>
+                    <li><a href="/cgi-bin/koha/admin/aqbudgets.pl">Funds</a></li>
+                [% END %]
+                [% IF ( CAN_user_parameters ) %]
+                    <li><a href="/cgi-bin/koha/admin/currency.pl">Currencies</a></li>
+                [% END %]
+                [% IF CAN_user_acquisition_edi_manage %]
+                    <li><a href="/cgi-bin/koha/admin/edi_accounts.pl">EDI accounts</a></li>
+                    <li><a href="/cgi-bin/koha/admin/edi_ean_accounts.pl">Library EANs</a></li>
+                [% END %]
+            </ul>
+        [% END %]
+    </div>
+</div>
-- 
2.39.5