Attachment 142401 Details for Bug 12446 – Bug 31417: Update and reference cat-menu.inc

[patch] Bug 31417: Update and reference cat-menu.inc

Bug-31417-Update-and-reference-cat-menuinc.patch (text/plain), 31.86 KB, created by geraud.frappier on 2022-10-21 14:56:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: geraud.frappier

Created: 2022-10-21 14:56:40 UTC

Size: 31.86 KB

patch

obsolete

>From 2635d9ac0e6b016c95a9a75e471a24192bb229d7 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Fri, 19 Aug 2022 12:18:46 +0100
>Subject: [PATCH] Bug 31417: Update and reference cat-menu.inc
>
>This patch reinstates the cat-menu.inc include and references it from
>the various 'tools' that are closely tied to cataloging.
>
>We use the new cataloging home page submission as a reference for which
>options should appear in the menu.
>
>Signed-off-by: David Nind <david@davidnind.com>
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
>
>https://bugs.koha-community.org/show_bug.cgi?id=12446
>---
> .../prog/en/includes/cat-menu.inc             | 131 +++++++++++++++++-
> .../prog/en/includes/tools-menu.inc           |  60 +-------
> .../prog/en/modules/labels/barcode-print.tt   |   3 +-
> .../en/modules/labels/label-edit-batch.tt     |   6 +-
> .../en/modules/labels/label-edit-layout.tt    |   4 +-
> .../en/modules/labels/label-edit-profile.tt   |   4 +-
> .../en/modules/labels/label-edit-range.tt     |   4 +-
> .../en/modules/labels/label-edit-template.tt  |   4 +-
> .../prog/en/modules/labels/label-home.tt      |   6 +-
> .../prog/en/modules/labels/label-manage.tt    |   4 +-
> .../prog/en/modules/labels/spinelabel-home.tt |   3 +-
> .../automatic_item_modification_by_age.tt     |   3 +-
> .../prog/en/modules/tools/batchMod.tt         |   6 +-
> .../en/modules/tools/batch_delete_records.tt  |   3 +-
> .../tools/batch_record_modification.tt        |   3 +-
> .../prog/en/modules/tools/export.tt           |   3 +-
> .../prog/en/modules/tools/inventory.tt        |   3 +-
> .../en/modules/tools/manage-marc-import.tt    |   3 +-
> .../tools/marc_modification_templates.tt      |   3 +-
> .../en/modules/tools/stage-marc-import.tt     |   3 +-
> .../prog/en/modules/tools/stockrotation.tt    |   3 +-
> .../prog/en/modules/tools/upload-images.tt    |   3 +-
> 22 files changed, 162 insertions(+), 103 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-menu.inc
>index 817552ecd8..2bd37f8fc9 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-menu.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-menu.inc
>@@ -1,3 +1,128 @@
>-<ul>
>-	<li><a href="/cgi-bin/koha/virtualshelves/shelves.pl">Lists</a></li>
>-</ul>
>+[% USE Koha %]
>+<div id="navmenu">
>+    <div id="navmenulist">
>+
>+        [% IF ( CAN_user_tools_stage_marc_import || CAN_user_tools_manage_staged_marc ) %]
>+        <h5>Import</h5>
>+        <ul>
>+            [% IF ( CAN_user_tools_stage_marc_import ) %]
>+            <li>
>+                <a href="/cgi-bin/koha/tools/stage-marc-import.pl">Stage records for import</a>
>+            </li>
>+            [% END %]
>+            [% IF ( CAN_user_tools_manage_staged_marc ) %]
>+            <li>
>+                <a href="/cgi-bin/koha/tools/manage-marc-import.pl">Manage staged records</a>
>+            </li>
>+            [% END %]
>+        </ul>
>+        [% END %]
>+
>+        [% IF ( CAN_user_tools_export_catalog ) %]
>+        <h5>Export</h5>
>+        <ul>
>+            [% IF ( CAN_user_tools_export_catalog ) %]
>+            <li>
>+                <a href="/cgi-bin/koha/tools/export.pl">Export catalog data</a>
>+            </li>
>+            [% END %]
>+        </ul>
>+        [% END %]
>+
>+        [% IF ( CAN_user_tools_inventory ) %]
>+        <h5>Reports</h5>
>+        <ul>
>+            [% IF ( CAN_user_tools_inventory ) %]
>+            <li>
>+                <a href="/cgi-bin/koha/tools/inventory.pl">Inventory</a>
>+            </li>
>+            [% END %]
>+        </ul>
>+        [% END %]
>+
>+        [% IF ( CAN_user_tools_items_batchmod || CAN_user_tools_items_batchdel || CAN_user_tools_records_batchmod || CAN_user_tools_records_batchdel || CAN_user_tools_marc_modification_templates ) %]
>+        <h5>Batch editing</h5>
>+        <ul>
>+            [% IF ( CAN_user_tools_items_batchmod ) %]
>+            <li>
>+                <a href="/cgi-bin/koha/tools/batchMod.pl">Batch item modification</a>
>+            </li>
>+            [% END %]
>+            [% IF ( CAN_user_tools_items_batchdel ) %]
>+            <li>
>+                <a href="/cgi-bin/koha/tools/batchMod.pl?del=1">Batch item deletion</a>
>+            </li>
>+            [% END %]
>+            [% IF CAN_user_tools_records_batchmod %]
>+            <li>
>+                <a href="/cgi-bin/koha/tools/batch_record_modification.pl">Batch record modification</a>
>+            </li>
>+            [% END %]
>+            [% IF CAN_user_tools_records_batchdel %]
>+            <li>
>+                <a href="/cgi-bin/koha/tools/batch_delete_records.pl">Batch record deletion</a>
>+            </li>
>+            [% END %]
>+            [% IF ( CAN_user_tools_marc_modification_templates ) %]
>+            <li>
>+                <a href="/cgi-bin/koha/tools/marc_modification_templates.pl">MARC modification templates</a>
>+            </li>
>+            [% END %]
>+        </ul>
>+        [% END %]
>+
>+        [% IF ( CAN_user_tools_items_batchmod || ( CAN_user_stockrotation_manage_rotas && Koha.Preference('StockRotation') ) ) %]
>+        <h5>Automation</h5>
>+        <ul>
>+            [% IF ( CAN_user_tools_items_batchmod ) %]
>+            <li>
>+                <a href="/cgi-bin/koha/tools/automatic_item_modification_by_age.pl">Item modifications by age</a>
>+            </li>
>+            [% END %]
>+            [% IF ( CAN_user_stockrotation_manage_rotas && Koha.Preference('StockRotation') ) %]
>+            <li>
>+                <a href="/cgi-bin/koha/tools/stockrotation.pl">Stock rotation</a>
>+            </li>
>+            [% END %]
>+        </ul>
>+        [% END %]
>+
>+        [% IF ( CAN_user_tools_label_creator || CAN_user_tools_upload_local_cover_images ) %]
>+        <h5>Tools</h5>
>+        <ul>
>+            [% IF ( 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/barcode-print.pl">Barcode image generator</a>
>+            </li>
>+            <li>
>+                <a href="/cgi-bin/koha/labels/spinelabel-home.pl">Quick spine label creator</a>
>+            </li>
>+            [% END %]
>+
>+            [% IF ( CAN_user_tools_upload_local_cover_images ) %]
>+            <li>
>+                <a href="/cgi-bin/koha/tools/upload-cover-image.pl">Upload local cover image</a>
>+            </li>
>+            [% END %]
>+        </ul>
>+        [% END %]
>+
>+        [% IF ( CAN_user_parameters ) %]
>+        <h5>Administration</h5>
>+        <ul>
>+            [% IF ( CAN_user_parameters_manage_sysprefs ) %]
>+            <li>
>+                <a class="circ-button" href="/cgi-bin/koha/admin/preferences.pl?tab=cataloguing">Preferences</a>
>+            </li>
>+            [% END %]
>+            <li>
>+                <a class="circ-button" href="/cgi-bin/koha/admin/admin-home.pl">Configuration</a>
>+            </li>
>+        </ul>
>+        [% END %]
>+
>+    </div>
>+</div>
>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 93328b2d06..b106cffbea 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
>@@ -1,11 +1,13 @@
> [% USE Koha %]
>+[% USE Branches %]
>+[% USE Registers %]
> 
> <div id="navmenu">
>     <div id="navmenulist">
>         <ul>
>             <li><a href="/cgi-bin/koha/tools/tools-home.pl">Tools home</a></li>
>         </ul>
>-        [% IF ( CAN_user_tools_manage_patron_lists || CAN_user_clubs || CAN_user_tools_moderate_comments || CAN_user_tools_import_patrons  || CAN_user_tools_edit_notices || CAN_user_tools_edit_notice_status_triggers || CAN_user_tools_label_creator || CAN_user_tools_delete_anonymize_patrons  || CAN_user_tools_edit_patrons || CAN_user_tools_moderate_tags || ( CAN_user_tools_batch_upload_patron_images && Koha.Preference('patronimages') ) ) %]
>+        [% IF ( CAN_user_tools_manage_patron_lists || CAN_user_clubs || CAN_user_tools_moderate_comments || CAN_user_tools_import_patrons  || CAN_user_tools_edit_notices || CAN_user_tools_edit_notice_status_triggers || CAN_user_tools_label_creator || CAN_user_tools_delete_anonymize_patrons  || CAN_user_tools_edit_patrons || CAN_user_tools_moderate_tags || ( CAN_user_tools_batch_upload_patron_images && Koha.Preference('patronimages') ) || CAN_user_tools_rotating_collections ) %]
>             <h5>Patrons and circulation</h5>
>             <ul>
>                 [% IF ( CAN_user_tools_manage_patron_lists ) %]
>@@ -44,60 +46,13 @@
>                 [% IF ( CAN_user_tools_batch_upload_patron_images && Koha.Preference('patronimages') ) %]
>                     <li><a href="/cgi-bin/koha/tools/picture-upload.pl">Upload patron images</a></li>
>                 [% END %]
>-            </ul>
>-        [% END # /IF ( CAN_user_tools_manage_patron_lists... %]
>-
>-        [% IF ( CAN_user_tools_items_batchdel || CAN_user_tools_items_batchmod || CAN_user_tools_records_batchdel  || CAN_user_tools_records_batchmod || CAN_user_tools_export_catalog || CAN_user_tools_inventory  || CAN_user_tools_label_creator || CAN_user_tools_rotating_collections  || ( CAN_user_stockrotation_manage_rotas && Koha.Preference('StockRotation') )  || CAN_user_tools_marc_modification_templates || CAN_user_tools_stage_marc_import  || CAN_user_tools_manage_staged_marc || CAN_user_tools_upload_local_cover_images ) %]
>-            <h5>Catalog</h5>
>-            <ul>
>-                [% IF ( CAN_user_tools_items_batchdel ) %]
>-                    <li><a href="/cgi-bin/koha/tools/batchMod.pl?del=1">Batch item deletion</a></li>
>-                [% END %]
>-                [% IF ( CAN_user_tools_items_batchmod ) %]
>-                    <li><a href="/cgi-bin/koha/tools/batchMod.pl">Batch item modification</a></li>
>-                [% END %]
>-                [% IF CAN_user_tools_records_batchdel %]
>-                    <li><a href="/cgi-bin/koha/tools/batch_delete_records.pl">Batch record deletion</a></li>
>-                [% END %]
>-                [% IF CAN_user_tools_records_batchmod %]
>-                    <li><a href="/cgi-bin/koha/tools/batch_record_modification.pl">Batch record modification</a></li>
>-                [% END %]
>-                [% IF CAN_user_tools_items_batchmod %]
>-                    <li><a href="/cgi-bin/koha/tools/automatic_item_modification_by_age.pl">Automatic item modifications by age</a></li>
>-                [% END %]
>-                [% IF ( CAN_user_tools_export_catalog ) %]
>-                    <li><a href="/cgi-bin/koha/tools/export.pl">Export data</a></li>
>-                [% END %]
>-                [% IF ( CAN_user_tools_inventory ) %]
>-                    <li><a href="/cgi-bin/koha/tools/inventory.pl">Inventory</a></li>
>-                [% END %]
>-                [% IF ( 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/barcode-print.pl">Barcode image generator</a></li>
>-                    <li><a href="/cgi-bin/koha/labels/spinelabel-home.pl">Quick spine label creator</a></li>
>-                [% END %]
>                 [% IF ( CAN_user_tools_rotating_collections ) %]
>                     <li><a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Rotating collections</a></li>
>                 [% END %]
>-                [% IF ( CAN_user_stockrotation_manage_rotas && Koha.Preference('StockRotation') ) %]
>-                    <li><a href="/cgi-bin/koha/tools/stockrotation.pl">Stock rotation</a></li>
>-                [% END %]
>-                [% IF ( CAN_user_tools_marc_modification_templates ) %]
>-                    <li><a href="/cgi-bin/koha/tools/marc_modification_templates.pl">MARC modification templates</a></li>
>-                [% END %]
>-                [% IF ( CAN_user_tools_stage_marc_import ) %]
>-                    <li><a href="/cgi-bin/koha/tools/stage-marc-import.pl">Stage MARC for import</a></li>
>-                [% END %]
>-                [% IF ( CAN_user_tools_manage_staged_marc ) %]
>-                    <li><a href="/cgi-bin/koha/tools/manage-marc-import.pl">Staged MARC management</a></li>
>-                [% END %]
>-                [% IF ( CAN_user_tools_upload_local_cover_images ) %]
>-                    <li><a href="/cgi-bin/koha/tools/upload-cover-image.pl">Upload local cover image</a></li>
>-                [% END %]
>             </ul>
>         [% END # /IF ( CAN_user_tools_items_batchdel... %]
> 
>-        [% IF ( CAN_user_tools_edit_calendar || CAN_user_tools_manage_csv_profiles || CAN_user_tools_view_system_logs || CAN_user_tools_edit_additional_contents  || CAN_user_tools_schedule_tasks || CAN_user_tools_edit_quotes || ( plugins_enabled && CAN_user_plugins_tool )  || CAN_user_tools_upload_general_files || CAN_user_tools_access_files ) %]
>+        [% IF ( CAN_user_tools_edit_calendar || CAN_user_tools_manage_csv_profiles || CAN_user_tools_view_system_logs || CAN_user_tools_edit_additional_contents  || CAN_user_tools_schedule_tasks || CAN_user_tools_edit_quotes || ( Koha.ArePluginsEnabled() && CAN_user_plugins_tool )  || CAN_user_tools_upload_general_files || CAN_user_tools_access_files ) %]
>             <h5>Additional tools</h5>
>             <ul>
>                 [% IF ( CAN_user_tools_edit_calendar ) %]
>@@ -134,13 +89,12 @@
>                 [% END %]
>             </ul>
>         [% END # /IF ( CAN_user_tools_edit_calendar... %]
>-
>         [% IF ( Koha.Preference('UseCashRegisters') && ( CAN_user_cash_management_cashup || CAN_user_cash_management_anonymous_refund ) ) %]
>             <h5>Cash management</h5>
>             <ul>
>-                <li><a href="/cgi-bin/koha/pos/registers.pl">Cash summary</a></li>
>-                <li><a href="/cgi-bin/koha/pos/register.pl">Transaction history</a></li>
>+                <li><a href="/cgi-bin/koha/pos/registers.pl">Cash summary for [% Branches.GetLoggedInBranchname | html %]</a></li>
>+                <li><a href="/cgi-bin/koha/pos/register.pl">Transaction history for [% Registers.session_register_name | html %]</a></li>
>             </ul>
>-        [% END # /IF ( Koha.Preference('UseCashRegisters')... %]
>+        [% END %]
>     </div> 
> </div> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/barcode-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/barcode-print.tt
>index 70e2af5880..ad7b953335 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/barcode-print.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/barcode-print.tt
>@@ -129,13 +129,12 @@
> 
>         <div class="col-sm-2 col-sm-pull-10">
>             <aside>
>-                [% INCLUDE 'tools-menu.inc' %]
>+                [% INCLUDE 'cat-menu.inc' %]
>             </aside>
>         </div> 
>      </div> 
> 
> [% MACRO jsinclude BLOCK %]
>-    [% Asset.js("js/tools-menu.js") | $raw %]
>     [% Asset.js("lib/jquery/plugins/humanmsg.js") | $raw %]
>     <script>
>         var base_url = "[% Koha.Preference('staffClientBaseURL') | html %]";
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt
>index dbaef0b44b..9c0d35ca53 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt
>@@ -200,13 +200,12 @@
> 
>         <div class="col-sm-2 col-sm-pull-10">
>             <aside>
>-                [% INCLUDE 'tools-menu.inc' %]
>+                [% INCLUDE 'cat-menu.inc' %]
>             </aside>
>         </div> 
>      </div> 
> 
> [% MACRO jsinclude BLOCK %]
>-    [% Asset.js("js/tools-menu.js") | $raw %]
>     [% INCLUDE 'greybox.inc' %]
>     [% INCLUDE 'datatables.inc' %]
>     <script>
>@@ -322,7 +321,8 @@
>             return (-1);
>         }
> 
>-         $(document).ready(function() {
>+        $(document).ready(function() {
>+            $('#navmenulist a[href$="/cgi-bin/koha/labels/label-home.pl"]').addClass("current");
>             [% IF table_loop %]
>                 $("#description").show();
>             [% ELSE %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt
>index db35bb8d92..4762f73a41 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt
>@@ -216,15 +216,15 @@
> 
>         <div class="col-sm-2 col-sm-pull-10">
>             <aside>
>-                [% INCLUDE 'tools-menu.inc' %]
>+                [% INCLUDE 'cat-menu.inc' %]
>             </aside>
>         </div> 
>      </div> 
> 
> [% MACRO jsinclude BLOCK %]
>-    [% Asset.js("js/tools-menu.js") | $raw %]
>     <script>
>         $(document).ready(function() {
>+            $('#navmenulist a[href$="/cgi-bin/koha/labels/label-home.pl"]').addClass("current");
>             $("input[name='layout_choice']").change( function() { layout_method() } );
>             layout_method();
>             $("#font").on("change",function(){
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt
>index 0869e6b8d2..3031dbea4c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt
>@@ -140,15 +140,15 @@
> 
>         <div class="col-sm-2 col-sm-pull-10">
>             <aside>
>-                [% INCLUDE 'tools-menu.inc' %]
>+                [% INCLUDE 'cat-menu.inc' %]
>             </aside>
>         </div> 
>      </div> 
> 
> [% MACRO jsinclude BLOCK %]
>-    [% Asset.js("js/tools-menu.js") | $raw %]
>     <script>
>         $(document).ready(function(){
>+            $('#navmenulist a[href$="/cgi-bin/koha/labels/label-home.pl"]').addClass("current");
>             var selectedUnit = $("#units option:selected").attr("value");
>             var unitfields = $("#offset_horz,#offset_vert,#creep_horz,#creep_vert");
>             $(unitfields).after("<span class=\"unit\">"+getUnit(selectedUnit)+"</span>");
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-range.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-range.tt
>index c3d902b56b..23dad86897 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-range.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-range.tt
>@@ -59,14 +59,13 @@
> 
>             <div class="col-sm-2 col-sm-pull-10">
>                 <aside>
>-                    [% INCLUDE 'tools-menu.inc' %]
>+                    [% INCLUDE 'cat-menu.inc' %]
>                 </aside>
>             </div> 
>         </div> 
>     </div> 
> 
> [% MACRO jsinclude BLOCK %]
>-    [% Asset.js("js/tools-menu.js") | $raw %]
>     <script>
>         function Xport() {
>             var str = "";
>@@ -104,6 +103,7 @@
>             }
> 
>         $(document).ready(function () {
>+            $('#navmenulist a[href$="/cgi-bin/koha/labels/label-home.pl"]').addClass("current");
>             $.validator.addMethod("gt", function(value, element, params) {
>                 return parseInt(value) >= parseInt($(params).val());
>             }, _("Must be greater or equal to the from value."));
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tt
>index fc5badbf81..e8dd43fac6 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tt
>@@ -185,15 +185,15 @@
> 
>         <div class="col-sm-2 col-sm-pull-10">
>             <aside>
>-                [% INCLUDE 'tools-menu.inc' %]
>+                [% INCLUDE 'cat-menu.inc' %]
>             </aside>
>         </div> 
>      </div> 
> 
> [% MACRO jsinclude BLOCK %]
>-    [% Asset.js("js/tools-menu.js") | $raw %]
>     <script>
>         $(document).ready(function(){
>+            $('#navmenulist a[href$="/cgi-bin/koha/labels/label-home.pl"]').addClass("current");
>             var selectedUnit = $("#units option:selected").attr("value");
>             var unitfields = $("#page_height,#page_width,#label_width,#label_height,#top_margin,#left_margin,#top_text_margin,#left_text_margin,#col_gap,#row_gap");
>             $(unitfields).after("<span class=\"unit\">"+getUnit(selectedUnit)+"</span>");
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt
>index 9e2d813047..5c82d16727 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt
>@@ -39,13 +39,9 @@
> 
>         <div class="col-sm-2 col-sm-pull-10">
>             <aside>
>-                [% INCLUDE 'tools-menu.inc' %]
>+                [% INCLUDE 'cat-menu.inc' %]
>             </aside>
>         </div> 
>      </div> 
> 
>-[% MACRO jsinclude BLOCK %]
>-    [% Asset.js("js/tools-menu.js") | $raw %]
>-[% END %]
>-
> [% INCLUDE 'intranet-bottom.inc' %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt
>index 163c13076a..a15a1b2ccc 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt
>@@ -133,13 +133,12 @@
> 
>         <div class="col-sm-2 col-sm-pull-10">
>             <aside>
>-                [% INCLUDE 'tools-menu.inc' %]
>+                [% INCLUDE 'cat-menu.inc' %]
>             </aside>
>         </div> 
>      </div> 
> 
> [% MACRO jsinclude BLOCK %]
>-    [% Asset.js("js/tools-menu.js") | $raw %]
>     [% INCLUDE 'greybox.inc' %]
>     [% INCLUDE 'datatables.inc' %]
>     <script>
>@@ -191,6 +190,7 @@
>             return (-1);
>         }
>         $(document).ready(function(){
>+            $('#navmenulist a[href$="/cgi-bin/koha/labels/label-home.pl"]').addClass("current");
>             $("#print").click(function(e){
>                 e.preventDefault();
>                 Xport();
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt
>index b4bec94434..a2a0938442 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt
>@@ -50,13 +50,12 @@
> 
>         <div class="col-sm-2 col-sm-pull-10">
>             <aside>
>-                [% INCLUDE 'tools-menu.inc' %]
>+                [% INCLUDE 'cat-menu.inc' %]
>             </aside>
>         </div> 
>      </div> 
> 
> [% MACRO jsinclude BLOCK %]
>-    [% Asset.js("js/tools-menu.js") | $raw %]
>     <script>
>         $(document).ready(function(){
>             $("#spinelabelprint").on("submit", function(e){
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt
>index 569cb232ac..e0103ac6d2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt
>@@ -277,13 +277,12 @@
> 
>         <div class="col-sm-2 col-sm-pull-10">
>             <aside>
>-                [% INCLUDE 'tools-menu.inc' %]
>+                [% INCLUDE 'cat-menu.inc' %]
>             </aside>
>         </div> 
>      </div> 
> 
> [% MACRO jsinclude BLOCK %]
>-    [% Asset.js("js/tools-menu.js") | $raw %]
>     [% Asset.js("lib/hc-sticky.js") | $raw %]
>     [% Asset.js("js/automatic_item_modification_by_age.js") | $raw %]
>     [% IF op == 'edit_form' %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt
>index 67ba1b52a8..1294a5ed90 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt
>@@ -93,13 +93,9 @@
> 
>         <div class="col-sm-2 col-sm-pull-10">
>             <aside>
>-                [% INCLUDE 'tools-menu.inc' %]
>+                [% INCLUDE 'cat-menu.inc' %]
>             </aside>
>         </div> 
>      </div> 
> 
>-[% MACRO jsinclude BLOCK %]
>-    [% Asset.js("js/tools-menu.js") | $raw %]
>-[% END %]
>-
> [% INCLUDE 'intranet-bottom.inc' %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt
>index 7d0d78365a..d615b89c64 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt
>@@ -227,13 +227,12 @@
> 
>         <div class="col-sm-2 col-sm-pull-10">
>             <aside>
>-                [% INCLUDE 'tools-menu.inc' %]
>+                [% INCLUDE 'cat-menu.inc' %]
>             </aside>
>         </div> 
>      </div> 
> 
> [% MACRO jsinclude BLOCK %]
>-    [% Asset.js("js/tools-menu.js") | $raw %]
>     [% INCLUDE 'datatables.inc' %]
>     <script>
>         var MSG_CANNOT_BE_DELETED = _("This record cannot be deleted, at least one item is currently checked out.");
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt
>index c8c9f3ca4a..088c30cea0 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt
>@@ -276,13 +276,12 @@
>             </div> 
>             <div class="col-sm-2 col-sm-pull-10">
>                 <aside>
>-                    [% INCLUDE 'tools-menu.inc' %]
>+                    [% INCLUDE 'cat-menu.inc' %]
>                 </aside>
>             </div> 
>         </div> 
> 
> [% MACRO jsinclude BLOCK %]
>-    [% Asset.js("js/tools-menu.js") | $raw %]
>     [% INCLUDE 'datatables.inc' %]
>     [% Asset.js("lib/jquery/plugins/humanmsg.js") | $raw %]
>     [% Asset.js("js/background-job-progressbar.js") | $raw %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt
>index 99fce7f02b..dd5d570bb4 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt
>@@ -314,13 +314,12 @@
> 
>         <div class="col-sm-2 col-sm-pull-10">
>             <aside>
>-                [% INCLUDE 'tools-menu.inc' %]
>+                [% INCLUDE 'cat-menu.inc' %]
>             </aside>
>         </div> 
>      </div> 
> 
> [% MACRO jsinclude BLOCK %]
>-    [% Asset.js("js/tools-menu.js") | $raw %]
>     [% INCLUDE 'calendar.inc' %]
>     <script>
>         $(document).ready(function() {
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt
>index 4bf6c6ef90..98e0d85589 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt
>@@ -352,13 +352,12 @@
> 
>         <div class="col-sm-2 col-sm-pull-10">
>             <aside>
>-                [% INCLUDE 'tools-menu.inc' %]
>+                [% INCLUDE 'cat-menu.inc' %]
>             </aside>
>         </div> 
>      </div> 
> 
> [% MACRO jsinclude BLOCK %]
>-    [% Asset.js("js/tools-menu.js") | $raw %]
>     [% INCLUDE 'datatables.inc' %]
>     [% INCLUDE 'calendar.inc' %]
>     <script>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
>index f3f9d75520..cd9c63f17b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
>@@ -415,13 +415,12 @@
>             </div> 
>             <div class="col-sm-2 col-sm-pull-10">
>                 <aside>
>-                    [% INCLUDE 'tools-menu.inc' %]
>+                    [% INCLUDE 'cat-menu.inc' %]
>                 </aside>
>             </div> 
>         </div> 
> 
> [% MACRO jsinclude BLOCK %]
>-    [% Asset.js("js/tools-menu.js") | $raw %]
>     [% Asset.js("lib/jquery/plugins/humanmsg.js") | $raw %]
>     [% INCLUDE 'datatables.inc' %]
>     <script>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt
>index b7f42f5eeb..56883bb135 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt
>@@ -352,13 +352,12 @@
> 
>         <div class="col-sm-2 col-sm-pull-10">
>             <aside>
>-                [% INCLUDE 'tools-menu.inc' %]
>+                [% INCLUDE 'cat-menu.inc' %]
>             </aside>
>         </div> 
>      </div> 
> 
> [% MACRO jsinclude BLOCK %]
>-    [% Asset.js("js/tools-menu.js") | $raw %]
>     [% INCLUDE 'datatables.inc' %]
>     [% INCLUDE 'columns_settings.inc' %]
>     <script>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt
>index f6e160ced7..ac974bfdde 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt
>@@ -253,13 +253,12 @@
> 
>         <div class="col-sm-2 col-sm-pull-10">
>             <aside>
>-                [% INCLUDE 'tools-menu.inc' %]
>+                [% INCLUDE 'cat-menu.inc' %]
>             </aside>
>         </div> 
>      </div> 
> 
> [% MACRO jsinclude BLOCK %]
>-    [% Asset.js("js/tools-menu.js") | $raw %]
>     [% Asset.js("lib/jquery/plugins/humanmsg.js") | $raw %]
>     [% Asset.js("js/file-upload.js") | $raw %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt
>index 695d9a8bed..296ca5145f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt
>@@ -607,13 +607,12 @@
>                         </ul>
>                     </div>
>                 [% END %]
>-                [% INCLUDE 'tools-menu.inc' %]
>+                [% INCLUDE 'cat-menu.inc' %]
>             </aside>
>         </div> 
>     </div> 
> 
> [% MACRO jsinclude BLOCK %]
>-    [% Asset.js("js/tools-menu.js") | $raw %]
>     [% INCLUDE 'datatables.inc' %]
>     [% INCLUDE 'columns_settings.inc' %]
>     [% Asset.js("js/pages/stockrotation.js") | $raw %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt
>index 5b872b0f52..2545e29216 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt
>@@ -301,13 +301,12 @@
> 
>         <div class="col-sm-2 col-sm-pull-10">
>             <aside>
>-                [% INCLUDE 'tools-menu.inc' %]
>+                [% INCLUDE 'cat-menu.inc' %]
>             </aside>
>         </div> 
>      </div> 
> 
> [% MACRO jsinclude BLOCK %]
>-    [% Asset.js("js/tools-menu.js") | $raw %]
>     <script>
>         var interface = "[% interface | html %]";
>         var theme = "[% theme | html %]";
>-- 
>2.34.1

Actions: View | Diff | Splinter Review

Attachments on bug 12446: 29278 | 36176 | 39744 | 42469 | 42470 | 42535 | 46277 | 46278 | 46327 | 46328 | 46345 | 46486 | 49793 | 50953 | 53534 | 53535 | 53536 | 53913 | 60929 | 60930 | 60934 | 63148 | 63149 | 63214 | 64793 | 64794 | 64828 | 72295 | 72883 | 77766 | 77767 | 77768 | 79343 | 79344 | 79345 | 79347 | 79348 | 85069 | 88364 | 88365 | 88366 | 88367 | 90389 | 90390 | 90391 | 90392 | 90470 | 90471 | 90472 | 90473 | 93388 | 93389 | 93390 | 93391 | 93392 | 93393 | 93394 | 95411 | 95853 | 95854 | 95855 | 95856 | 95857 | 95858 | 95859 | 95860 | 106753 | 106754 | 106755 | 106756 | 106757 | 107611 | 111052 | 111053 | 111317 | 111318 | 112102 | 112160 | 112161 | 112162 | 112163 | 113583 | 121925 | 121926 | 121927 | 121928 | 121929 | 122084 | 122085 | 122086 | 122087 | 122088 | 122089 | 122090 | 122091 | 122184 | 122185 | 122186 | 122187 | 130398 | 130399 | 130400 | 130401 | 130402 | 131965 | 131966 | 131967 | 131968 | 131969 | 133691 | 133952 | 133953 | 133954 | 133955 | 133956 | 133957 | 134930 | 134931 | 134932 | 134933 | 134934 | 134935 | 134936 | 135506 | 135507 | 135508 | 135509 | 135510 | 135511 | 135512 | 135519 | 135520 | 135521 | 135522 | 135523 | 135544 | 135545 | 142401 | 142408 | 142431 | 142432 | 142433 | 142434 | 142435 | 142436 | 142437 | 142438 | 142439