From 1dc575e1af87e5c179054683ead56c2930132898 Mon Sep 17 00:00:00 2001
From: Garry Collum <gcollum@gmail.com>
Date: Wed, 27 Jan 2010 19:36:40 -0500
Subject: [PATCH] Bug 3856: Tools Menu in Alpha Order - resubmission.

This patch gathers the links on the tools menu and places them in categories similar to the Administration menu - Patrons and circulation, Catalog, Additional Tools. It also adds these categories to the tools sidebar menu.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
---
 .../prog/en/includes/tools-menu.inc           |  80 ++++++-----
 .../prog/en/modules/tools/tools-home.tmpl     | 135 +++++++++---------
 2 files changed, 116 insertions(+), 99 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
index 087e1cdc8c..3a9376b3ae 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
@@ -9,64 +9,78 @@
 	});
 //]]>
 </script>
-<div id="navmenu"><ul id="navmenulist">
+<div id="navmenu">
+<div id="navmenulist">
+<ul>
 	<li><a href="/cgi-bin/koha/tools/tools-home.pl">Tools Home</a></li>
-    <!-- TMPL_IF NAME="CAN_user_tools_edit_news" -->
-	<li><a href="/cgi-bin/koha/tools/koha-news.pl">News</a></li>
-    <!-- /TMPL_IF -->
-    <!-- TMPL_IF NAME="CAN_user_tools_label_creator" -->
-	<li><a href="/cgi-bin/koha/labels/label-home.pl">Label creator</a></li>
-	<li><a href="/cgi-bin/koha/labels/spinelabel-home.pl">Quick spine label creator</a></li>
+</ul>
+<h5>Patrons and circulation</h5>
+<ul>
+    <!-- TMPL_IF NAME="CAN_user_tools_moderate_comments" -->
+	<li><a href="/cgi-bin/koha/reviews/reviewswaiting.pl">Comments</a></li>
     <!-- /TMPL_IF -->
-    <!-- TMPL_IF NAME="CAN_user_tools_edit_calendar" -->
-	<li><a href="/cgi-bin/koha/tools/holidays.pl">Calendar</a></li>
+    <!-- TMPL_IF NAME="CAN_user_tools_import_patrons" -->
+	<li><a href="/cgi-bin/koha/tools/import_borrowers.pl">Import patrons</a></li>
     <!-- /TMPL_IF -->
     <!-- TMPL_IF NAME="CAN_user_tools_edit_notices" -->
 	<li><a href="/cgi-bin/koha/tools/letter.pl">Notices</a></li>
     <!-- /TMPL_IF -->
     <!-- TMPL_IF NAME="CAN_user_tools_edit_notice_status_triggers" -->
-	<li><a href="/cgi-bin/koha/tools/overduerules.pl">Notice/status triggers</a></li>
+	<li><a href="/cgi-bin/koha/tools/overduerules.pl">Overdue notice/status triggers</a></li>
     <!-- /TMPL_IF -->
-    <!-- TMPL_IF NAME="CAN_user_tools_moderate_comments" -->
-	<li><a href="/cgi-bin/koha/reviews/reviewswaiting.pl">Moderate OPAC comments</a></li>
-    <!-- /TMPL_IF -->
-    <!-- TMPL_IF NAME="CAN_user_tools_moderate_tags" -->
-    <li><a href="/cgi-bin/koha/tags/review.pl">Moderate patron tags</a></li>
+    <!-- TMPL_IF NAME="CAN_user_tools_label_creator" -->
+    <li><a href="/cgi-bin/koha/patroncards/home.pl">Patron card creator</a></li>
     <!-- /TMPL_IF -->
-    <!-- TMPL_IF NAME="CAN_user_tools_manage_csv_profiles" -->
-	<li><a href="/cgi-bin/koha/tools/csv-profiles.pl">CSV Profiles</a></li>
+    <!-- TMPL_IF NAME="CAN_user_tools_delete_anonymize_patrons" -->
+    <li><a href="/cgi-bin/koha/tools/cleanborrowers.pl">Patrons (anonymize, bulk-delete)</a></li>
     <!-- /TMPL_IF -->
-    <!-- TMPL_IF NAME="CAN_user_tools_view_system_logs" -->
-	<li><a href="/cgi-bin/koha/tools/viewlog.pl">Log viewer</a></li>
+    <!-- TMPL_IF NAME="CAN_user_tools_moderate_tags" -->
+    <li><a href="/cgi-bin/koha/tags/review.pl">Tag moderation</a></li>
     <!-- /TMPL_IF -->
-    <!-- TMPL_IF NAME="CAN_user_tools_inventory" -->
-	<li><a href="/cgi-bin/koha/tools/inventory.pl">Inventory/stocktaking</a></li>
+    <!-- TMPL_IF NAME="CAN_user_tools_batch_upload_patron_images" -->
+	<li><a href="/cgi-bin/koha/tools/picture-upload.pl">Upload patron images</a></li>
     <!-- /TMPL_IF -->
+</ul>
+<h5>Catalog</h5>
+<ul>
     <!-- TMPL_IF NAME="CAN_user_tools_batchdel" -->
 	<li><a href="/cgi-bin/koha/tools/batchMod.pl?del=1">Batch deletion of items</a></li>
     <!--/TMPL_IF-->
     <!-- TMPL_IF NAME="CAN_user_tools_batchmod" -->
 	<li><a href="/cgi-bin/koha/tools/batchMod.pl">Batch modification of items</a></li>
     <!--/TMPL_IF-->
+    <!-- TMPL_IF NAME="CAN_user_tools_export_catalog" -->
+	<li><a href="/cgi-bin/koha/tools/export.pl">Export bibs/holdings</a></li>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="CAN_user_tools_inventory" -->
+	<li><a href="/cgi-bin/koha/tools/inventory.pl">Inventory/stocktaking</a></li>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="CAN_user_tools_label_creator" -->
+	<li><a href="/cgi-bin/koha/labels/label-home.pl">Label creator</a></li>
+	<li><a href="/cgi-bin/koha/labels/spinelabel-home.pl">Quick spine label creator</a></li>
+    <!-- /TMPL_IF -->
     <!-- TMPL_IF NAME="CAN_user_tools_stage_marc_import" -->
-	<li><a href="/cgi-bin/koha/tools/stage-marc-import.pl">MARC Import (staging)</a></li>
+	<li><a href="/cgi-bin/koha/tools/stage-marc-import.pl">Stage MARC for import</a></li>
     <!-- /TMPL_IF -->
     <!-- TMPL_IF NAME="CAN_user_tools_manage_staged_marc" -->
-	<li><a href="/cgi-bin/koha/tools/manage-marc-import.pl">MARC Import (managing batches)</a></li>
+	<li><a href="/cgi-bin/koha/tools/manage-marc-import.pl">Staged MARC management</a></li>
     <!-- /TMPL_IF -->
-    <!-- TMPL_IF NAME="CAN_user_tools_export_catalog" -->
-	<li><a href="/cgi-bin/koha/tools/export.pl">Export bibs/holdings</a></li>
+</ul>
+<h5>Additional Tools</h5>
+<ul>
+    <!-- TMPL_IF NAME="CAN_user_tools_edit_calendar" -->
+	<li><a href="/cgi-bin/koha/tools/holidays.pl">Calendar</a></li>
     <!-- /TMPL_IF -->
-    <!-- TMPL_IF NAME="CAN_user_tools_import_patrons" -->
-	<li><a href="/cgi-bin/koha/tools/import_borrowers.pl">Import patrons</a></li>
+    <!-- TMPL_IF NAME="CAN_user_tools_manage_csv_profiles" -->
+	<li><a href="/cgi-bin/koha/tools/csv-profiles.pl">CSV profiles</a></li>
     <!-- /TMPL_IF -->
-    <!-- TMPL_IF NAME="CAN_user_tools_delete_anonymize_patrons" -->
-	<li><a href="/cgi-bin/koha/tools/cleanborrowers.pl">Patrons (anonymize, bulk-delete)</a></li>
+    <!-- TMPL_IF NAME="CAN_user_tools_view_system_logs" -->
+	<li><a href="/cgi-bin/koha/tools/viewlog.pl">Log viewer</a></li>
     <!-- /TMPL_IF -->
-    <!-- TMPL_IF NAME="CAN_user_tools_batch_upload_patron_images" -->
-	<li><a href="/cgi-bin/koha/tools/picture-upload.pl">Upload Patron Images</a></li>
+    <!-- TMPL_IF NAME="CAN_user_tools_edit_news" -->
+	<li><a href="/cgi-bin/koha/tools/koha-news.pl">News</a></li>
     <!-- /TMPL_IF -->
     <!-- TMPL_IF NAME="CAN_user_tools_schedule_tasks" -->
-	<li><a href="/cgi-bin/koha/tools/scheduler.pl">Task Scheduler</a></li>
+	<li><a href="/cgi-bin/koha/tools/scheduler.pl">Task scheduler</a></li>
     <!-- /TMPL_IF -->
-</ul></div>
+</ul></div></div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl
index 5a99f86e5f..4490c7853c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl
@@ -13,37 +13,36 @@
 	<div class="yui-gb">
 
 <div class="yui-u first">
+<h3>Patrons and circulation</h3>
 <dl>
-    <!-- TMPL_IF NAME="CAN_user_tools_edit_news" -->
-    <dt><a href="/cgi-bin/koha/tools/koha-news.pl">News</a></dt>
-    <dd>Write news for the OPAC and staff interfaces</dd>
+    <!-- TMPL_IF NAME="CAN_user_tools_moderate_comments" -->
+    <dt><a href="/cgi-bin/koha/reviews/reviewswaiting.pl">Comments</a></dt>
+	<dd>Moderate patron comments</dd>
     <!-- /TMPL_IF -->
-
-    <!-- TMPL_IF NAME="CAN_user_tools_label_creator" -->
-    <dt><a href="/cgi-bin/koha/labels/label-home.pl">Label creator</a></dt>
-    <dd>Create printable labels and barcodes from catalog data</dd>
+    
+    <!-- TMPL_IF NAME="CAN_user_tools_import_patrons" -->
+    <dt><a href="/cgi-bin/koha/tools/import_borrowers.pl">Import patrons</a></dt>
+    <dd>Import patron data</dd>
     <!-- /TMPL_IF -->
 
-    <!-- TMPL_IF NAME="CAN_user_tools_label_creator" -->
-    <dt><a href="/cgi-bin/koha/labels/spinelabel-home.pl">Quick spine label creator</a></dt>
-    <dd>Enter a barcode to generate a printable spine label</dd>
-    <div class="hint"><dd>For use with dedicated label printers</dd></div>
+    <!-- TMPL_IF NAME="CAN_user_tools_edit_notices" -->
+    <dt><a href="/cgi-bin/koha/tools/letter.pl">Notices</a></dt>
+    <dd>Define notices (print and email notification messages for overdues, etc.)</dd>
     <!-- /TMPL_IF -->
 
+    <!-- TMPL_IF NAME="CAN_user_tools_edit_notice_status_triggers" -->
+    <dt><a href="/cgi-bin/koha/tools/overduerules.pl">Overdue notice/status triggers</a></dt>
+    <dd>Set notice/status triggers for overdue items</dd>
+    <!-- /TMPL_IF -->
+    
     <!-- TMPL_IF NAME="CAN_user_tools_label_creator" -->
-    <dt><a href="/cgi-bin/koha/patroncards/home.pl">Patron Card Creator</a></dt>
+    <dt><a href="/cgi-bin/koha/patroncards/home.pl">Patron card creator</a></dt>
     <dd>Create printable patron cards</dd>
     <!-- /TMPL_IF -->
 
-
-    <!-- TMPL_IF NAME="CAN_user_tools_edit_calendar" -->
-    <dt><a href="/cgi-bin/koha/tools/holidays.pl">Calendar</a></dt>
-    <dd>Define days when the library is closed</dd>
-    <!-- /TMPL_IF -->
-
-    <!-- TMPL_IF NAME="CAN_user_tools_moderate_comments" -->
-    <dt><a href="/cgi-bin/koha/reviews/reviewswaiting.pl">Comments</a></dt>
-	<dd>Moderate patron comments</dd>
+    <!-- TMPL_IF NAME="CAN_user_tools_delete_anonymize_patrons" -->
+    <dt><a href="/cgi-bin/koha/tools/cleanborrowers.pl">Patrons (anonymize, bulk-delete)</a></dt>
+    <dd>Delete old borrowers and anonymize circulation history (deletes borrower reading history)</dd>
     <!-- /TMPL_IF -->
 
     <!-- TMPL_IF NAME="CAN_user_tools_moderate_tags" -->
@@ -51,28 +50,26 @@
 	<dd>Moderate patron tags</dd>
     <!-- /TMPL_IF -->
 
-    <!-- TMPL_IF NAME="CAN_user_tools_manage_csv_profiles" -->
-    <dt><a href="/cgi-bin/koha/tools/csv-profiles.pl">CSV Profiles</a></dt>
-	<dd>Manage CSV export profiles</dd>
+    <!-- TMPL_IF NAME="CAN_user_tools_batch_upload_patron_images" -->
+    <dt><a href="/cgi-bin/koha/tools/picture-upload.pl">Upload patron images</a></dt>
+	<dd>Upload patron images in batch or one at a time</dd>
     <!-- /TMPL_IF -->
 
-    <!-- TMPL_IF NAME="CAN_user_tools_rotating_collections" -->
-    <dt><a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Rotating Collections</a></dt>
-	<dd>Manage Rotating Collections</dd>
-    <!-- /TMPL_IF -->
+
 
 	</dl>
 </div>
 <div class="yui-u">
-	<dl>
-    <!-- TMPL_IF NAME="CAN_user_tools_edit_notices" -->
-    <dt><a href="/cgi-bin/koha/tools/letter.pl">Notices</a></dt>
-    <dd>Define notices (print and email notification messages for overdues, etc.)</dd>
+<h3>Additional Tools</h3>
+<dl>
+    <!-- TMPL_IF NAME="CAN_user_tools_edit_calendar" -->
+    <dt><a href="/cgi-bin/koha/tools/holidays.pl">Calendar</a></dt>
+    <dd>Define days when the library is closed</dd>
     <!-- /TMPL_IF -->
 
-    <!-- TMPL_IF NAME="CAN_user_tools_edit_notice_status_triggers" -->
-    <dt><a href="/cgi-bin/koha/tools/overduerules.pl">Overdue notice/status triggers</a></dt>
-    <dd>Set notice/status triggers for overdue items</dd>
+    <!-- TMPL_IF NAME="CAN_user_tools_manage_csv_profiles" -->
+    <dt><a href="/cgi-bin/koha/tools/csv-profiles.pl">CSV profiles</a></dt>
+	<dd>Manage CSV export profiles</dd>
     <!-- /TMPL_IF -->
 
     <!-- TMPL_IF NAME="CAN_user_tools_view_system_logs" -->
@@ -80,58 +77,64 @@
     <dd>Browse the system logs</dd>
     <!-- /TMPL_IF -->
 
-    <!-- TMPL_IF NAME="CAN_user_tools_inventory" -->
-    <dt><a href="/cgi-bin/koha/tools/inventory.pl">Inventory/stocktaking</a></dt>
-    <dd>Perform inventory (stocktaking) of your catalog</dd>
-    <!-- /TMPL_IF -->
-
-    <!-- TMPL_IF NAME="CAN_user_tools_batchmod" -->
-    <dt><a href="/cgi-bin/koha/tools/batchMod.pl">Modify a queryset of items</a></dt>
-    <dd>Perform batch modification of items</dd>
+    <!-- TMPL_IF NAME="CAN_user_tools_edit_news" -->
+    <dt><a href="/cgi-bin/koha/tools/koha-news.pl">News</a></dt>
+    <dd>Write news for the OPAC and staff interfaces</dd>
     <!-- /TMPL_IF -->
 
-    <!-- TMPL_IF NAME="CAN_user_tools_batchdel" -->
-    <dt><a href="/cgi-bin/koha/tools/batchMod.pl?del=1">Delete a queryset of items</a></dt>
-    <dd>Perform batch deletion of items</dd>
+    <!-- TMPL_IF NAME="CAN_user_tools_schedule_tasks" -->
+    <dt><a href="/cgi-bin/koha/tools/scheduler.pl">Task scheduler</a></dt>
+    <dd>Schedule tasks to run</dd>
     <!-- /TMPL_IF -->
 
-	</dl>
+</dl>
 </div>
 <div class="yui-u">
+<h3>Catalog</h3>
 <dl>
-    <!-- TMPL_IF NAME="CAN_user_tools_stage_marc_import" -->
-    <dt><a href="/cgi-bin/koha/tools/stage-marc-import.pl">Stage MARC Records For Import</a></dt>
-    <dd>Stage MARC records into the reservoir.</dd>
+    <!-- TMPL_IF NAME="CAN_user_tools_batchdel" -->
+    <dt><a href="/cgi-bin/koha/tools/batchMod.pl?del=1">Batch item deletion</a></dt>
+    <dd>Perform batch deletion of items</dd>
     <!-- /TMPL_IF -->
 
-    <!-- TMPL_IF NAME="CAN_user_tools_manage_staged_marc" -->
-    <dt><a href="/cgi-bin/koha/tools/manage-marc-import.pl">Manage Staged MARC Records</a></dt>
-    <dd>Managed staged MARC records, including completing and reversing imports</dd>
+    <!-- TMPL_IF NAME="CAN_user_tools_batchmod" -->
+    <dt><a href="/cgi-bin/koha/tools/batchMod.pl">Batch item modification</a></dt>
+    <dd>Perform batch modification of items</dd>
     <!-- /TMPL_IF -->
-
+    
     <!-- TMPL_IF NAME="CAN_user_tools_export_catalog" -->
     <dt><a href="/cgi-bin/koha/tools/export.pl">Export bibliographic and holdings</a></dt>
     <dd>Export bibliographic and holdings data</dd>
     <!-- /TMPL_IF -->
 
-    <!-- TMPL_IF NAME="CAN_user_tools_import_patrons" -->
-    <dt><a href="/cgi-bin/koha/tools/import_borrowers.pl">Import patrons</a></dt>
-    <dd>Import patron data</dd>
+    <!-- TMPL_IF NAME="CAN_user_tools_inventory" -->
+    <dt><a href="/cgi-bin/koha/tools/inventory.pl">Inventory/stocktaking</a></dt>
+    <dd>Perform inventory (stocktaking) of your catalog</dd>
     <!-- /TMPL_IF -->
 
-    <!-- TMPL_IF NAME="CAN_user_tools_delete_anonymize_patrons" -->
-    <dt><a href="/cgi-bin/koha/tools/cleanborrowers.pl">Patrons (anonymize, bulk-delete)</a></dt>
-    <dd>Delete old borrowers and anonymize circulation history (deletes borrower reading history)</dd>
+    <!-- TMPL_IF NAME="CAN_user_tools_label_creator" -->
+    <dt><a href="/cgi-bin/koha/labels/label-home.pl">Label creator</a></dt>
+    <dd>Create printable labels and barcodes from catalog data</dd>
+    <!-- /TMPL_IF -->
+    
+    <!-- TMPL_IF NAME="CAN_user_tools_label_creator" -->
+    <dt><a href="/cgi-bin/koha/labels/spinelabel-home.pl">Quick spine label creator</a></dt>
+    <dd>Enter a barcode to generate a printable spine label. For use with dedicated label printers</dd>
     <!-- /TMPL_IF -->
 
-    <!-- TMPL_IF NAME="CAN_user_tools_batch_upload_patron_images" -->
-    <dt><a href="/cgi-bin/koha/tools/picture-upload.pl">Upload patron images</a></dt>
-	<dd>Upload patron images in batch or one at a time</dd>
+    <!-- TMPL_IF NAME="CAN_user_tools_rotating_collections" -->
+    <dt><a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Rotating collections</a></dt>
+	<dd>Manage Rotating Collections</dd>
     <!-- /TMPL_IF -->
 
-    <!-- TMPL_IF NAME="CAN_user_tools_schedule_tasks" -->
-    <dt><a href="/cgi-bin/koha/tools/scheduler.pl">Task Scheduler</a></dt>
-    <dd>Schedule tasks to run</dd>
+    <!-- TMPL_IF NAME="CAN_user_tools_stage_marc_import" -->
+    <dt><a href="/cgi-bin/koha/tools/stage-marc-import.pl">Stage MARC records for import</a></dt>
+    <dd>Stage MARC records into the reservoir.</dd>
+    <!-- /TMPL_IF -->
+
+    <!-- TMPL_IF NAME="CAN_user_tools_manage_staged_marc" -->
+    <dt><a href="/cgi-bin/koha/tools/manage-marc-import.pl">Staged MARC record management</a></dt>
+    <dd>Managed staged MARC records, including completing and reversing imports</dd>
     <!-- /TMPL_IF -->
 
 </dl>
-- 
2.39.5