From e4a226a9d19422b829dfb12b06f8dbc5579beef6 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 26 Sep 2022 14:53:56 +0000 Subject: [PATCH] Bug 31625: Reindent tools home and tools sidebar This patch performs general template cleanup to the tools-home and tools-menu templates: Make indentation consistent, replace tabs with spaces, fix invalid HTML. To test, apply the patch and go to Tools. The page should look correct, with no visible changes from before the patch. Go to any tools page which shows the left-hand sidebar, e.g. Patron lists, Batch item deletion, Inventory, etc. The menu should look correct. Signed-off-by: Andrew Fuerste-Henry --- .../prog/en/includes/tools-menu.inc | 267 +++++----- .../prog/en/modules/tools/tools-home.tt | 495 +++++++++--------- 2 files changed, 384 insertions(+), 378 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 d994c22ecb..e9a983df88 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc @@ -1,135 +1,138 @@ [% USE Koha %] + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt index 612cf23b25..f84dea7e64 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt @@ -27,251 +27,254 @@

Tools

-[% 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_batch_extend_due_dates || CAN_user_tools_moderate_tags || ( CAN_user_tools_batch_upload_patron_images && Koha.Preference('patronimages') ) ) %] -

Patrons and circulation

-[% END %] -
- [% IF (CAN_user_tools_manage_patron_lists) %] -
Patron lists -
Manage lists of patrons
- [% END %] - - [% IF (CAN_user_clubs) %] -
Patron clubs -
Manage patron clubs
- [% END %] - - [% IF ( CAN_user_tools_moderate_comments ) %] -
Comments [% IF ( pendingcomments ) %][% pendingcomments | html %][% END %]
-
Moderate patron comments
- [% END %] - - [% IF ( CAN_user_tools_import_patrons ) %] -
Import patrons
-
Import patron data
- [% END %] - - [% IF ( CAN_user_tools_edit_notices ) %] -
Notices and slips
-
Define notices (print and email notification messages for overdues, etc.)
- [% END %] - - [% IF ( CAN_user_tools_edit_notice_status_triggers ) %] -
Overdue notice/status triggers
-
Set notice/status triggers for overdue items
- [% END %] - - [% IF ( CAN_user_tools_label_creator ) %] -
Patron card creator
-
Create printable patron cards
- [% END %] - - [% IF ( CAN_user_tools_delete_anonymize_patrons ) %] -
Batch patron deletion and anonymization
-
Batch delete patrons and delete patron circulation history
- [% END %] - - [% IF ( CAN_user_tools_edit_patrons ) %] -
Batch patron modification
-
Modify patrons in batch
- [% END %] - - [% IF ( CAN_user_tools_batch_extend_due_dates ) %] -
Batch extend due dates
-
Modify the due date checkouts in batch
- [% END %] - - [% IF ( CAN_user_tools_moderate_tags ) %] -
Tags [% IF ( pendingtags ) %][% pendingtags | html %][% END %]
-
Moderate patron tags
- [% END %] - - [% IF ( CAN_user_tools_batch_upload_patron_images && Koha.Preference('patronimages') ) %] -
Upload patron images
-
Upload patron images in a batch or one at a time
- [% END %] - -
-
- - -
-[% 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 ) %] -

Additional tools

-[% END %] -
- [% IF ( CAN_user_tools_edit_calendar ) %] -
Calendar
-
Define days when the library is closed
- [% END %] - - [% IF ( CAN_user_tools_manage_csv_profiles ) %] -
CSV profiles
-
Manage CSV export profiles
- [% END %] - - [% IF ( CAN_user_tools_view_system_logs ) %] -
Log viewer
-
Browse the system logs
- [% END %] - - [% IF ( CAN_user_tools_edit_additional_contents ) %] -
News
-
Write news for the OPAC and staff interfaces
- -
HTML customizations
-
Write HTML customizations
- -
Pages
-
Write custom pages
- [% END %] - - [% IF ( CAN_user_tools_schedule_tasks ) %] -
Task scheduler
-
Schedule tasks to run
- [% END %] - - [% IF ( CAN_user_tools_edit_quotes ) %] -
Quote editor
-
Manage 'Quote of the day' quotes
- [% END %] - - [% IF ( plugins_enabled && CAN_user_plugins_tool && tool_plugins ) %] -
Tool plugins
-
- Use tool plugins - -
- [% END %] - - [% IF ( CAN_user_tools_upload_general_files ) %] -
Upload
-
Upload any type of file, manage uploads
- [% END %] - - [% IF CAN_user_tools_access_files %] -
Access files
-
Access files stored on the server, like log files or reports
- [% END %] - - [% IF ( Koha.Preference('OPACReportProblem') && CAN_user_problem_reports ) %] -
OPAC problem reports
-
Manage OPAC problem reports submitted by patrons
- [% END %] - -
- -[% IF ( Koha.Preference('UseCashRegisters') && ( CAN_user_cash_management_cashup || CAN_user_cash_management_anonymous_refund ) ) %] -

Cash management

-
- -
Cash summary for [% Branches.GetLoggedInBranchname | html %]
-
View cash takings for the current library
- -
Transaction history for [% Registers.session_register_name | html %]
-
View transaction history for the current cash register
- -
-[% END %] - -
- -
-[% 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 ) %] -
Batch item deletion
-
Delete a batch of items
- [% END %] - - [% IF ( CAN_user_tools_items_batchmod ) %] -
Batch item modification
-
Modify items in a batch
- [% END %] - - [% IF CAN_user_tools_records_batchdel %] -
Batch record deletion
-
Delete a batch of bibliographic or authority records
- [% END %] - - [% IF CAN_user_tools_records_batchmod %] -
Batch record modification
-
Modify a batch of bibliographic or authority records
- [% END %] - - [% IF ( CAN_user_tools_items_batchmod ) %] -
Automatic item modifications by age
-
Define rules to modify items by age
- [% END %] - - [% IF ( CAN_user_tools_export_catalog ) %] -
Export data
-
Export bibliographic, holdings, and authority records
- [% END %] - - [% IF ( CAN_user_tools_inventory ) %] -
Inventory
-
Perform inventory of your catalog
- [% END %] - - [% IF ( CAN_user_tools_label_creator ) %] -
Label creator
-
Create printable labels and barcodes from catalog data
- [% END %] - - [% IF ( CAN_user_tools_label_creator ) %] -
Barcode image generator
-
Configure and create barcodes of various types to be output as an image
- [% END %] - - [% IF ( CAN_user_tools_label_creator ) %] -
Quick spine label creator
-
Enter a barcode to generate a printable spine label. For use with dedicated label printers
- [% END %] - - [% IF ( CAN_user_tools_rotating_collections ) %] -
Rotating collections
-
Manage rotating collections
- [% END %] - - [% IF ( CAN_user_stockrotation_manage_rotas && Koha.Preference('StockRotation') ) %] -
Stock rotation
-
Manage Stock rotation rotas, rota stages and rota items
- [% END %] - - [% IF ( CAN_user_tools_marc_modification_templates ) %] -
MARC modification templates
-
Manage templates for modifying MARC records during import
- [% END %] - - [% IF ( CAN_user_tools_stage_marc_import ) %] -
Stage MARC records for import
-
Stage MARC records into the reservoir
- [% END %] - - [% IF ( CAN_user_tools_manage_staged_marc ) %] -
Staged MARC record management
-
Managed staged MARC records, including completing and reversing imports
- [% END %] - - [% IF ( CAN_user_tools_upload_local_cover_images ) %] -
Upload local cover image
-
Utility to upload scanned cover images for display in OPAC
- [% END %] - -
-
- -
+ [% 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_batch_extend_due_dates || CAN_user_tools_moderate_tags || ( CAN_user_tools_batch_upload_patron_images && Koha.Preference('patronimages') ) ) %] +

Patrons and circulation

+ [% END %] +
+ [% IF (CAN_user_tools_manage_patron_lists) %] +
Patron lists
+
Manage lists of patrons
+ [% END %] + + [% IF (CAN_user_clubs) %] +
Patron clubs
+
Manage patron clubs
+ [% END %] + + [% IF ( CAN_user_tools_moderate_comments ) %] +
+ Comments + [% IF ( pendingcomments ) %] + [% pendingcomments | html %] + [% END %] +
+
Moderate patron comments
+ [% END %] + + [% IF ( CAN_user_tools_import_patrons ) %] +
Import patrons
+
Import patron data
+ [% END %] + + [% IF ( CAN_user_tools_edit_notices ) %] +
Notices and slips
+
Define notices (print and email notification messages for overdues, etc.)
+ [% END %] + + [% IF ( CAN_user_tools_edit_notice_status_triggers ) %] +
Overdue notice/status triggers
+
Set notice/status triggers for overdue items
+ [% END %] + + [% IF ( CAN_user_tools_label_creator ) %] +
Patron card creator
+
Create printable patron cards
+ [% END %] + + [% IF ( CAN_user_tools_delete_anonymize_patrons ) %] +
Batch patron deletion and anonymization
+
Batch delete patrons and delete patron circulation history
+ [% END %] + + [% IF ( CAN_user_tools_edit_patrons ) %] +
Batch patron modification
+
Modify patrons in batch
+ [% END %] + + [% IF ( CAN_user_tools_batch_extend_due_dates ) %] +
Batch extend due dates
+
Modify the due date checkouts in batch
+ [% END %] + + [% IF ( CAN_user_tools_moderate_tags ) %] +
+ Tags + [% IF ( pendingtags ) %] + [% pendingtags | html %] + [% END %] +
+
Moderate patron tags
+ [% END %] + + [% IF ( CAN_user_tools_batch_upload_patron_images && Koha.Preference('patronimages') ) %] +
Upload patron images
+
Upload patron images in a batch or one at a time
+ [% END %] +
+ + +
+ [% 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 ) %] +

Additional tools

+ [% END %] +
+ [% IF ( CAN_user_tools_edit_calendar ) %] +
Calendar
+
Define days when the library is closed
+ [% END %] + + [% IF ( CAN_user_tools_manage_csv_profiles ) %] +
CSV profiles
+
Manage CSV export profiles
+ [% END %] + + [% IF ( CAN_user_tools_view_system_logs ) %] +
Log viewer
+
Browse the system logs
+ [% END %] + + [% IF ( CAN_user_tools_edit_additional_contents ) %] +
News
+
Write news for the OPAC and staff interfaces
+ +
HTML customizations
+
Write HTML customizations
+ +
Pages
+
Write custom pages
+ [% END %] + + [% IF ( CAN_user_tools_schedule_tasks ) %] +
Task scheduler
+
Schedule tasks to run
+ [% END %] + + [% IF ( CAN_user_tools_edit_quotes ) %] +
Quote editor
+
Manage 'Quote of the day' quotes
+ [% END %] + + [% IF ( plugins_enabled && CAN_user_plugins_tool && tool_plugins ) %] +
Tool plugins
+
+ Use tool plugins + +
+ [% END %] + + [% IF ( CAN_user_tools_upload_general_files ) %] +
Upload
+
Upload any type of file, manage uploads
+ [% END %] + + [% IF CAN_user_tools_access_files %] +
Access files
+
Access files stored on the server, like log files or reports
+ [% END %] + + [% IF ( Koha.Preference('OPACReportProblem') && CAN_user_problem_reports ) %] +
OPAC problem reports
+
Manage OPAC problem reports submitted by patrons
+ [% END %] + +
+ + [% IF ( Koha.Preference('UseCashRegisters') && ( CAN_user_cash_management_cashup || CAN_user_cash_management_anonymous_refund ) ) %] +

Cash management

+
+
Cash summary for [% Branches.GetLoggedInBranchname | html %]
+
View cash takings for the current library
+ +
Transaction history for [% Registers.session_register_name | html %]
+
View transaction history for the current cash register
+
+ [% END %] +
+ +
+ [% 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 ) %] +
Batch item deletion
+
Delete a batch of items
+ [% END %] + + [% IF ( CAN_user_tools_items_batchmod ) %] +
Batch item modification
+
Modify items in a batch
+ [% END %] + + [% IF CAN_user_tools_records_batchdel %] +
Batch record deletion
+
Delete a batch of bibliographic or authority records
+ [% END %] + + [% IF CAN_user_tools_records_batchmod %] +
Batch record modification
+
Modify a batch of bibliographic or authority records
+ [% END %] + + [% IF ( CAN_user_tools_items_batchmod ) %] +
Automatic item modifications by age
+
Define rules to modify items by age
+ [% END %] + + [% IF ( CAN_user_tools_export_catalog ) %] +
Export data
+
Export bibliographic, holdings, and authority records
+ [% END %] + + [% IF ( CAN_user_tools_inventory ) %] +
Inventory
+
Perform inventory of your catalog
+ [% END %] + + [% IF ( CAN_user_tools_label_creator ) %] +
Label creator
+
Create printable labels and barcodes from catalog data
+ [% END %] + + [% IF ( CAN_user_tools_label_creator ) %] +
Barcode image generator
+
Configure and create barcodes of various types to be output as an image
+ [% END %] + + [% IF ( CAN_user_tools_label_creator ) %] +
Quick spine label creator
+
Enter a barcode to generate a printable spine label. For use with dedicated label printers
+ [% END %] + + [% IF ( CAN_user_tools_rotating_collections ) %] +
Rotating collections
+
Manage rotating collections
+ [% END %] + + [% IF ( CAN_user_stockrotation_manage_rotas && Koha.Preference('StockRotation') ) %] +
Stock rotation
+
Manage Stock rotation rotas, rota stages and rota items
+ [% END %] + + [% IF ( CAN_user_tools_marc_modification_templates ) %] +
MARC modification templates
+
Manage templates for modifying MARC records during import
+ [% END %] + + [% IF ( CAN_user_tools_stage_marc_import ) %] +
Stage MARC records for import
+
Stage MARC records into the reservoir
+ [% END %] + + [% IF ( CAN_user_tools_manage_staged_marc ) %] +
Staged MARC record management
+
Managed staged MARC records, including completing and reversing imports
+ [% END %] + + [% IF ( CAN_user_tools_upload_local_cover_images ) %] +
Upload local cover image
+
Utility to upload scanned cover images for display in OPAC
+ [% END %] +
+
+ [% INCLUDE 'intranet-bottom.inc' %] -- 2.30.2