Bugzilla – Attachment 141255 Details for
Bug 31417
Re-instate the cataloguing sidebar menu
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 31417: Update and reference cat-menu.inc
Bug-31417-Update-and-reference-cat-menuinc.patch (text/plain), 31.25 KB, created by
Martin Renvoize (ashimema)
on 2022-10-03 11:21:54 UTC
(
hide
)
Description:
Bug 31417: Update and reference cat-menu.inc
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2022-10-03 11:21:54 UTC
Size:
31.25 KB
patch
obsolete
>From d53c506d2b49d95fec0523061943159aee9bd7aa 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> >--- > .../prog/en/includes/cat-menu.inc | 129 +++++++++++++++++- > .../prog/en/includes/tools-menu.inc | 59 +------- > .../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, 155 insertions(+), 107 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..ee70362501 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,126 @@ >-<ul> >- <li><a href="/cgi-bin/koha/virtualshelves/shelves.pl">Lists</a></li> >-</ul> >+[% USE Koha %] >+<div id="navmenu"> >+ <div id="navmenulist"> >+ >+ <h5>New</h5> >+ <ul> >+ <li> >+ <a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Basic editor</a> >+ </li> >+ [% IF Koha.Preference( 'EnableAdvancedCatalogingEditor' ) == 1 && CAN_user_editcatalogue_advanced_editor %] >+ <li> >+ <a href="/cgi-bin/koha/cataloguing/editor.pl">Advanced editor</a> >+ </li> >+ [% END %] >+ </ul> >+ >+ [% 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_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>Automations</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_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_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 %] >+ >+ </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..60e4848bcd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc >@@ -5,7 +5,7 @@ > <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 +44,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 +87,5 @@ > [% 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> >- </ul> >- [% END # /IF ( Koha.Preference('UseCashRegisters')... %] > </div> <!-- /#navmenulist --> > </div> <!-- /#navmenu --> >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 f020565e43..74aba6c288 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 >@@ -126,13 +126,12 @@ > > <div class="col-sm-2 col-sm-pull-10"> > <aside> >- [% INCLUDE 'tools-menu.inc' %] >+ [% INCLUDE 'cat-menu.inc' %] > </aside> > </div> <!-- /.col-sm-2.col-sm-pull-10 --> > </div> <!-- /.row --> > > [% 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 273bb5ceb2..833adbf525 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 >@@ -197,13 +197,12 @@ > > <div class="col-sm-2 col-sm-pull-10"> > <aside> >- [% INCLUDE 'tools-menu.inc' %] >+ [% INCLUDE 'cat-menu.inc' %] > </aside> > </div> <!-- /.col-sm-2.col-sm-pull-10 --> > </div> <!-- /.row --> > > [% MACRO jsinclude BLOCK %] >- [% Asset.js("js/tools-menu.js") | $raw %] > [% INCLUDE 'greybox.inc' %] > [% INCLUDE 'datatables.inc' %] > <script> >@@ -319,7 +318,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 e3393c763b..bd0d0be0be 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 >@@ -213,15 +213,15 @@ > > <div class="col-sm-2 col-sm-pull-10"> > <aside> >- [% INCLUDE 'tools-menu.inc' %] >+ [% INCLUDE 'cat-menu.inc' %] > </aside> > </div> <!-- /.col-sm-2.col-sm-pull-10 --> > </div> <!-- /.row --> > > [% 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 48073db2f9..5df9dbb227 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 >@@ -137,15 +137,15 @@ > > <div class="col-sm-2 col-sm-pull-10"> > <aside> >- [% INCLUDE 'tools-menu.inc' %] >+ [% INCLUDE 'cat-menu.inc' %] > </aside> > </div> <!-- /.col-sm-2.col-sm-pull-10 --> > </div> <!-- /.row --> > > [% 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 a1bb56fe4f..c0778b8dcd 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 >@@ -56,14 +56,13 @@ > > <div class="col-sm-2 col-sm-pull-10"> > <aside> >- [% INCLUDE 'tools-menu.inc' %] >+ [% INCLUDE 'cat-menu.inc' %] > </aside> > </div> <!-- /.col-sm-2.col-sm-pull-10 --> > </div> <!-- /.row --> > </div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] >- [% Asset.js("js/tools-menu.js") | $raw %] > <script> > function Xport() { > var str = ""; >@@ -101,6 +100,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 b3c06474f4..36908dea74 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 >@@ -182,15 +182,15 @@ > > <div class="col-sm-2 col-sm-pull-10"> > <aside> >- [% INCLUDE 'tools-menu.inc' %] >+ [% INCLUDE 'cat-menu.inc' %] > </aside> > </div> <!-- /.col-sm-2.col-sm-pull-10 --> > </div> <!-- /.row --> > > [% 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 0cf9deaa62..6a3a57fd88 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 >@@ -36,13 +36,9 @@ > > <div class="col-sm-2 col-sm-pull-10"> > <aside> >- [% INCLUDE 'tools-menu.inc' %] >+ [% INCLUDE 'cat-menu.inc' %] > </aside> > </div> <!-- /.col-sm-2.col-sm-pull-10 --> > </div> <!-- /.row --> > >-[% 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 d64c60d531..bb36c7c58c 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 >@@ -130,13 +130,12 @@ > > <div class="col-sm-2 col-sm-pull-10"> > <aside> >- [% INCLUDE 'tools-menu.inc' %] >+ [% INCLUDE 'cat-menu.inc' %] > </aside> > </div> <!-- /.col-sm-2.col-sm-pull-10 --> > </div> <!-- /.row --> > > [% MACRO jsinclude BLOCK %] >- [% Asset.js("js/tools-menu.js") | $raw %] > [% INCLUDE 'greybox.inc' %] > [% INCLUDE 'datatables.inc' %] > <script> >@@ -188,6 +187,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 42f87e3470..a88826d758 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 >@@ -47,13 +47,12 @@ > > <div class="col-sm-2 col-sm-pull-10"> > <aside> >- [% INCLUDE 'tools-menu.inc' %] >+ [% INCLUDE 'cat-menu.inc' %] > </aside> > </div> <!-- /.col-sm-2.col-sm-pull-10 --> > </div> <!-- /.row --> > > [% 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 5e8864597a..e022ce982d 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 >@@ -273,13 +273,12 @@ > > <div class="col-sm-2 col-sm-pull-10"> > <aside> >- [% INCLUDE 'tools-menu.inc' %] >+ [% INCLUDE 'cat-menu.inc' %] > </aside> > </div> <!-- /.col-sm-2.col-sm-pull-10 --> > </div> <!-- /.row --> > > [% 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 a87ed0d939..b7f43f9df4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt >@@ -90,13 +90,9 @@ > > <div class="col-sm-2 col-sm-pull-10"> > <aside> >- [% INCLUDE 'tools-menu.inc' %] >+ [% INCLUDE 'cat-menu.inc' %] > </aside> > </div> <!-- /.col-sm-2.col-sm-pull-10 --> > </div> <!-- /.row --> > >-[% 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 85c618b716..18e1a64fbb 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 >@@ -224,13 +224,12 @@ > > <div class="col-sm-2 col-sm-pull-10"> > <aside> >- [% INCLUDE 'tools-menu.inc' %] >+ [% INCLUDE 'cat-menu.inc' %] > </aside> > </div> <!-- /.col-sm-2.col-sm-pull-10 --> > </div> <!-- /.row --> > > [% 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 7710466e8f..d82e87b6f7 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 >@@ -273,13 +273,12 @@ > </div> <!-- /.col-sm-10.col-sm-push-2 --> > <div class="col-sm-2 col-sm-pull-10"> > <aside> >- [% INCLUDE 'tools-menu.inc' %] >+ [% INCLUDE 'cat-menu.inc' %] > </aside> > </div> <!-- /.col-sm-2.col-sm-pull-10 --> > </div> <!-- /.row --> > > [% 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 b55aa7ff30..7608d879e4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt >@@ -311,13 +311,12 @@ > > <div class="col-sm-2 col-sm-pull-10"> > <aside> >- [% INCLUDE 'tools-menu.inc' %] >+ [% INCLUDE 'cat-menu.inc' %] > </aside> > </div> <!-- .col-sm-2.col-sm-pull-10 --> > </div> <!-- /.row --> > > [% 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 d66d88c63e..b4703aa171 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt >@@ -349,13 +349,12 @@ > > <div class="col-sm-2 col-sm-pull-10"> > <aside> >- [% INCLUDE 'tools-menu.inc' %] >+ [% INCLUDE 'cat-menu.inc' %] > </aside> > </div> <!-- .col-sm-2.col-sm-pull-10 --> > </div> <!-- /.row --> > > [% 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 85e34fb091..9402182ae2 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 >@@ -411,13 +411,12 @@ > </div> <!-- /.col-sm-10.col-sm-push-2 --> > <div class="col-sm-2 col-sm-pull-10"> > <aside> >- [% INCLUDE 'tools-menu.inc' %] >+ [% INCLUDE 'cat-menu.inc' %] > </aside> > </div> <!-- .col-sm-2.col-sm-pull-10 --> > </div> <!-- /.row --> > > [% 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 03c87cedc4..f3288f999f 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 >@@ -349,13 +349,12 @@ > > <div class="col-sm-2 col-sm-pull-10"> > <aside> >- [% INCLUDE 'tools-menu.inc' %] >+ [% INCLUDE 'cat-menu.inc' %] > </aside> > </div> <!-- /.col-sm-2.col-sm-pull-10 --> > </div> <!-- /.row --> > > [% 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 8a23682952..660878ec01 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 >@@ -249,13 +249,12 @@ > > <div class="col-sm-2 col-sm-pull-10"> > <aside> >- [% INCLUDE 'tools-menu.inc' %] >+ [% INCLUDE 'cat-menu.inc' %] > </aside> > </div> <!-- /.col-sm-2.col-sm-pull-10 --> > </div> <!-- /.row --> > > [% 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 %] > <script> >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 3082cea4b8..de04cda169 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt >@@ -604,13 +604,12 @@ > </ul> > </div> > [% END %] >- [% INCLUDE 'tools-menu.inc' %] >+ [% INCLUDE 'cat-menu.inc' %] > </aside> > </div> <!-- /.col-sm-2.col-sm-pull-10 --> > </div> <!-- /.row --> > > [% 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 1f9e697009..dd8783e648 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 >@@ -298,13 +298,12 @@ > > <div class="col-sm-2 col-sm-pull-10"> > <aside> >- [% INCLUDE 'tools-menu.inc' %] >+ [% INCLUDE 'cat-menu.inc' %] > </aside> > </div> <!-- /.col-sm-2.col-sm-pull-10 --> > </div> <!-- /.row --> > > [% MACRO jsinclude BLOCK %] >- [% Asset.js("js/tools-menu.js") | $raw %] > <script> > var interface = "[% interface | html %]"; > var theme = "[% theme | html %]"; >-- >2.20.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 31417
:
139477
|
139522
|
139653
|
141255
|
141994
|
142030