From c0881c8f9155013b55c9723fbe7a7369ac7366d8 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 18 Jan 2021 11:26:22 +0100 Subject: [PATCH] Bug 26602: [20.05.x] Don't export "actions" column This patch add the noExport class to all "Actions" columns in the codebase. It's a stupid search and replace, maybe the class is added to table where there is no export button. Test plan: Search tables where the export button is available. Confirm that the "Actions" columns is not exported. Example: /admin/branches.pl, /admin/cities.pl Signed-off-by: Sally Signed-off-by: Nick Clemens Bug 26602: (QA follow-up) Cleanup datatables settings On letter.tt we had nosort and set things via settings that are default in KohaTable so removed those from letter.js. Also made the last updated column exportable On upload.tt the noExport didn't do anything, because we couldn't export, so moved to used KohaTable Signed-off-by: Nick Clemens Bug 26602: Rebase fixes Signed-off-by: Andrew Fuerste-Henry --- .../en/includes/mana/mana-report-search-result.inc | 2 +- .../includes/mana/mana-subscription-search-result.inc | 2 +- .../intranet-tmpl/prog/en/modules/acqui/booksellers.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt | 2 +- .../prog/en/modules/acqui/neworderempty.tt | 2 +- .../prog/en/modules/acqui/orderreceive.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/supplier.tt | 2 +- .../prog/en/modules/admin/additional-fields.tt | 2 +- .../prog/en/modules/admin/aqbudgetperiods.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/admin/aqbudgets.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/aqplan.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/branches.tt | 2 +- .../prog/en/modules/admin/cash_registers.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/cities.tt | 2 +- .../prog/en/modules/admin/classsources.tt | 6 +++--- .../prog/en/modules/admin/credit_types.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/currency.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/debit_types.tt | 2 +- .../prog/en/modules/admin/edi_accounts.tt | 2 +- .../prog/en/modules/admin/edi_ean_accounts.tt | 2 +- .../prog/en/modules/admin/items_search_fields.tt | 2 +- .../prog/en/modules/admin/marc_subfields_structure.tt | 3 ++- .../prog/en/modules/admin/matching-rules.tt | 2 +- .../prog/en/modules/admin/patron-attr-types.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/smart-rules.tt | 6 +++--- .../prog/en/modules/admin/systempreferences.tt | 2 +- .../prog/en/modules/admin/z3950servers.tt | 2 +- .../prog/en/modules/cataloguing/z3950_auth_search.tt | 2 +- .../prog/en/modules/circ/article-requests.tt | 4 ++-- .../prog/en/modules/circ/checkout-notes.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt | 2 +- .../prog/en/modules/course_reserves/course-details.tt | 2 +- .../prog/en/modules/labels/label-manage.tt | 2 +- .../intranet-tmpl/prog/en/modules/members/apikeys.tt | 2 +- .../prog/en/modules/members/boraccount.tt | 2 +- .../prog/en/modules/members/housebound.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt | 2 +- .../prog/en/modules/patroncards/edit-batch.tt | 2 +- .../prog/en/modules/patroncards/manage.tt | 2 +- .../prog/en/modules/plugins/plugins-home.tt | 2 +- .../intranet-tmpl/prog/en/modules/pos/register.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/pos/registers.tt | 2 +- .../prog/en/modules/reports/guided_reports_start.tt | 2 +- .../prog/en/modules/serials/checkexpiration.tt | 2 +- .../prog/en/modules/serials/serials-search.tt | 2 +- .../en/modules/serials/subscription-frequencies.tt | 2 +- .../en/modules/serials/subscription-numberpatterns.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt | 2 +- .../prog/en/modules/tools/csv-profiles.tt | 2 +- .../intranet-tmpl/prog/en/modules/tools/koha-news.tt | 2 +- .../intranet-tmpl/prog/en/modules/tools/letter.tt | 4 ++-- .../en/modules/tools/marc_modification_templates.tt | 2 +- .../prog/en/modules/tools/problem-reports.tt | 2 +- .../prog/en/modules/tools/quotes-upload.tt | 2 +- .../intranet-tmpl/prog/en/modules/tools/upload.tt | 10 +++++----- .../prog/en/modules/virtualshelves/shelves.tt | 2 +- koha-tmpl/intranet-tmpl/prog/js/letter.js | 8 -------- 57 files changed, 69 insertions(+), 76 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/mana/mana-report-search-result.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/mana/mana-report-search-result.inc index da67d1c452..49920699f4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/mana/mana-report-search-result.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/mana/mana-report-search-result.inc @@ -41,7 +41,7 @@ Last import Comments [% UNLESS search_only %] - Actions + Actions [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/mana/mana-subscription-search-result.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/mana/mana-subscription-search-result.inc index 1ffef40c31..9725e239ba 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/mana/mana-subscription-search-result.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/mana/mana-subscription-search-result.inc @@ -19,7 +19,7 @@ Last import Comments [% UNLESS search_only %] - Actions + Actions [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt index 6271d8d0b1..1adb7f0be9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt @@ -92,7 +92,7 @@ Date Basket group Closed - Actions + Actions diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt index 5f0dc43ac6..2457cd83b9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt @@ -38,7 +38,7 @@ Vendor Details Filename -Actions +Actions diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt index 7a7df3e265..0b0f631899 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt @@ -258,7 +258,7 @@ - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt index fb228f65d2..489475adb4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt @@ -147,7 +147,7 @@
ActionsActions Barcode Home library Holding library
- + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt index 3cea6c7a10..779fb0595c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt @@ -358,7 +358,7 @@ [% IF CAN_user_acquisition_contracts_manage %] - + [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt index a2dbb632e2..2f75f21ce8 100755 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt @@ -91,7 +91,7 @@ [% END %] - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt index d270976218..3332e6e116 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt @@ -430,7 +430,7 @@ - + @@ -466,7 +466,7 @@ - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt index feeb1224a3..9b7487a691 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt @@ -73,7 +73,7 @@ - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt index 12bb308303..1127514847 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt @@ -65,7 +65,7 @@ [% END %] - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt index 5dc947fbac..f18bbd45f1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt @@ -193,7 +193,7 @@ - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt index 3496015b03..f00c7dbffb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt @@ -133,7 +133,7 @@ - + [% FOREACH cash_register IN cash_registers %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt index 618e757773..3a4e6f5097 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt @@ -142,7 +142,7 @@ - +
ActionsActions Barcode Home library Holding libraryStart date End dateActionsActions
MARC fieldSearchableActionsActions
End date Locked TotalActionsActions
End date Locked TotalActionsActions
Total spent Base-level available Total availableActionsActions
Fund remainingActionsActions
MARC organization code IP Pickup locationActionsActions
Library Default Initial floatActionsActions
State ZIP/Postal code CountryActionsActions
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt index aee77dadf6..93a4fd86f0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt @@ -294,7 +294,7 @@ In use Filing rule Splitting rule - Actions + Actions [% FOREACH class_source IN class_sources %] @@ -317,7 +317,7 @@ Code Description Sorting routine - Actions + Actions [% FOREACH rule IN sort_rules %] @@ -338,7 +338,7 @@ Code Description Splitting routine - Actions + Actions [% FOREACH rule IN split_rules %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt index 1f6dfd8cea..850898697d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt @@ -124,7 +124,7 @@ Description Available for Library limitations - Actions + Actions [% FOREACH credit_type IN credit_types %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt index e16313110b..33dadc566e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt @@ -183,7 +183,7 @@ Last updated Active Archived - Actions + Actions diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt index 48808ffe46..5de8f1766f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt @@ -138,7 +138,7 @@ Default amount Available for Library limitations - Actions + Actions [% FOREACH debit_type IN debit_types %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt index 980c2e7f85..db0ae0ad29 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt @@ -259,7 +259,7 @@ Invoices Responses Auto ordering - Actions + Actions [% FOREACH account IN ediaccounts %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt index 3cc14a247e..9aaf0b732e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt @@ -138,7 +138,7 @@ Description EAN Qualifier - Actions + Actions [% FOREACH ean IN eans %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt index b68b6bd77f..52eb80bd8e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt @@ -65,7 +65,7 @@ MARC field MARC subfield Authorised values category - Actions + Actions diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt index df5395cedf..46764d9aeb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt @@ -270,6 +270,7 @@ [% END %] +<<<<<<< HEAD [% IF ( else ) %]

MARC subfield structure admin for [% tagfield | html %] [% IF ( frameworkcode ) %](framework [% frameworkcode | html %])[% ELSE %](default framework)[% END %]

This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on edit.

@@ -281,7 +282,7 @@ Subfield Text Constraints - Actions + Actions diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt index 9eccfaa329..e08b7b265c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt @@ -452,7 +452,7 @@ # Code Description - Actions + Actions [% FOREACH available_matching_rule IN available_matching_rules %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt index b15529ceda..0c6ccf9937 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt @@ -225,7 +225,7 @@ Code Description Branches limitation - Actions + Actions diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt index 04b44c60ab..d9ff8d7191 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt @@ -88,7 +88,7 @@ Patron category Item type - Actions + Actions Note Current checkouts allowed Current on-site checkouts allowed @@ -117,7 +117,7 @@ OPAC item level holds Article requests Rental discount (%) - Actions + Actions @@ -465,7 +465,7 @@ Hold policy Hold pickup library match Return policy - Actions + Actions Defaults diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt index 019d945796..31af56ab02 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt @@ -248,7 +248,7 @@ Preference Explanation Value - Actions + Actions [% END %] [% FOREACH loo IN loop %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt index 45117ad44d..abff6947c4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt @@ -162,7 +162,7 @@ [% END %] - + [% FOREACH loo IN loop %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt index 51aa454619..987a870076 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt @@ -79,7 +79,7 @@ - + [% FOREACH breeding_loo IN breeding_loop %] [% IF ( breeding_loo.breedingid ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt index 10e69f48a4..ec09e7ec05 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt @@ -112,7 +112,7 @@ - + @@ -217,7 +217,7 @@ - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt index fa8f783735..693b752540 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt @@ -70,7 +70,7 @@ - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt index 2258635d92..49ce43125c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt @@ -59,7 +59,7 @@ - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt index 56cb7b9780..7543771869 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt @@ -89,7 +89,7 @@ [% IF CAN_user_coursereserves_add_reserves || CAN_user_coursereserves_delete_reserves %] - + [% END %] 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 86e8fa2200..35c3afd6ae 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 @@ -67,7 +67,7 @@ [% CASE 'Template ID' %] [% CASE 'Template Name' %] [% CASE 'Description' %] - [% CASE 'Actions' %] + [% CASE 'Actions' %] [% CASE 'Profile ID' %] [% CASE 'Printer Name' %] [% CASE 'Paper Bin' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt index 3285dc15e0..6389e1994a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt @@ -55,7 +55,7 @@ - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt index b6286d70a1..27c3b20456 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt @@ -55,7 +55,7 @@ - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt index 38a2cbabe6..d9515160f7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt @@ -380,7 +380,7 @@ [% IF housebound_visits.size > 0 %]
TargetHostname/PortDatabaseUseridPasswordPreselectedRankSyntaxEncodingTimeoutRecord typeAttributesActions
TargetHostname/PortDatabaseUseridPasswordPreselectedRankSyntaxEncodingTimeoutRecord typeAttributesActions
Server Heading Authority TypeActionsActions
Barcode Patron DateActionsActions
Barcode Patron DateActionsActions
Date Set by StatusActionsActions
Public enrollment Email required LibraryActionsActions
Other course reserves StatusActionsActions
Template IDTemplate nameDescriptionActionsActionsProfile IDPrinter namePaper binClient ID Secret ActiveActionsActions
Note Amount OutstandingActionsActions
- + [% FOREACH entry IN housebound_visits %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt index a967b9e600..a34d87d3f1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt @@ -45,7 +45,7 @@ - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt index e786485684..438acb4809 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt @@ -79,7 +79,7 @@ [% CASE "Borrower Number" %] [% CASE "Actions " %] - + [% CASE "Select" -%] [% CASE %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt index 87ab3083a4..e624273593 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt @@ -57,7 +57,7 @@ [%- CASE 'Layout ID' -%] [%- CASE 'Layout' -%] [%- CASE 'Action' -%] - [%- CASE 'Actions' -%] + [%- CASE 'Actions' -%] [%- CASE 'Select' -%][% IF ( print ) %][% END %] [%- CASE 'Template ID' -%] [%- CASE 'Template Name' -%] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt index e02a974f7f..bdb2262e1e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt @@ -111,7 +111,7 @@ [% IF ( CAN_user_plugins_configure || CAN_user_plugins_manage || CAN_user_plugins_report || CAN_user_plugins_tool ) %] - + [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt index eb400a19f0..14801ad90b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt @@ -72,7 +72,7 @@ - + [% FOREACH accountline IN accountlines %] @@ -161,7 +161,7 @@ - + [% FOREACH accountline IN past_accountlines %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt index 384bae596c..d9a0453167 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt @@ -57,7 +57,7 @@ [% IF CAN_user_cash_management_cashup %] - + [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt index 99507b9425..0e8559154d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt @@ -241,7 +241,7 @@ [% ELSE %] [% END %] - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt index 091451c2a7..d17e61821d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt @@ -80,7 +80,7 @@ - + [% FOREACH subscriptions_loo IN subscriptions_loop %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt index b239efe571..5d892221ab 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt @@ -62,7 +62,7 @@ [% FOR field IN additional_fields_for_subscription %] [% END %] - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt index bb267bd68e..5ec803dee6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt @@ -133,7 +133,7 @@ - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt index c361fc08e6..4480f47efa 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt @@ -268,7 +268,7 @@ - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt index e588174d32..3e67352a59 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt @@ -80,7 +80,7 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } - + [% UNLESS ( filter_approved_pending ) %][% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt index 1d2dbfd2d0..56d67652fe 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt @@ -266,7 +266,7 @@ - + [% FOREACH csv_profile IN csv_profiles %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt index 1b777fe1c5..2047542f31 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt @@ -124,7 +124,7 @@ Edit news item[% ELSE %]Add news item[% END %][% ELSE %]News[% END %] - + [% FOREACH opac_new IN opac_news %] [% IF ( opac_new.expired ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt index 313e44bebf..52a45383c2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt @@ -142,8 +142,8 @@ - - + + 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 14fda8f1b5..0943ba7dbf 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 @@ -69,7 +69,7 @@ - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/problem-reports.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/problem-reports.tt index 4b59c661a4..32e2db4aa6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/problem-reports.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/problem-reports.tt @@ -68,7 +68,7 @@ - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt index dc5da4b0f2..8103d17abd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt @@ -53,7 +53,7 @@ - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt index 3ed10dcae3..713ae723c7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt @@ -159,7 +159,7 @@ [% IF !plugin %][% END %] [% IF !plugin %][% END %] - + @@ -256,6 +256,7 @@ [% Asset.js("js/tools-menu.js") | $raw %] [% INCLUDE 'datatables.inc' %] [% Asset.js("js/file-upload.js") | $raw %] + [% INCLUDE 'columns_settings.inc' %]
IDDateChooserDelivererActionsIDDateChooserDelivererActions
 ActionsActions Account type Description DateBorrower numberActionsActionsSelectLayout IDLayoutActionActionsActionsSelectTemplate IDTemplate nameMaximum Koha version Last updatedActionsActions
Description Price TotalActionsActions
Description Price TotalActionsActions
Income (cash) Outgoing (cash)ActionsActions
ActionsActions
OPAC note Nonpublic note Expiration dateActionsActions
[% field.name | html %]ActionsActions
Issues per unit Units per issue Display orderActionsActions
Description Numbering formula Display orderActionsActions
Status Term WeightActionsActionsReviewerDate
CSV separator CSV type UsageActionsActions
Title Author NewsActionsActions
Module Code NameCopy noticeActionsCopy noticeActions
TemplateActionsActions
Created on Set by StatusActionsActions
Source TextActionsActions
CategoryPublicTemporaryActionsActions