@@ -, +, @@
---
.../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(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-menu.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-menu.inc
@@ -1,3 +1,126 @@
-
+[% USE Koha %]
+
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
@@ -5,7 +5,7 @@
- [% 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 ) %]
Patrons and circulation
[% IF ( CAN_user_tools_manage_patron_lists ) %]
@@ -44,60 +44,13 @@
[% IF ( CAN_user_tools_batch_upload_patron_images && Koha.Preference('patronimages') ) %]
- Upload patron images
[% END %]
-
- [% 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 ) %]
- Catalog
-
[% 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 ) %]
Additional tools
[% IF ( CAN_user_tools_edit_calendar ) %]
@@ -134,13 +87,5 @@
[% END %]
[% END # /IF ( CAN_user_tools_edit_calendar... %]
-
- [% IF ( Koha.Preference('UseCashRegisters') && ( CAN_user_cash_management_cashup || CAN_user_cash_management_anonymous_refund ) ) %]
- Cash management
-
- [% END # /IF ( Koha.Preference('UseCashRegisters')... %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/barcode-print.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/barcode-print.tt
@@ -126,13 +126,12 @@
[% MACRO jsinclude BLOCK %]
- [% Asset.js("js/tools-menu.js") | $raw %]
[% Asset.js("lib/jquery/plugins/humanmsg.js") | $raw %]