From 42f850d48dc4d49e305d3d3c6c4288ebf02a8d62 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 3 Jun 2022 15:52:46 +0000 Subject: [PATCH] Bug 30707: Move container's closing div tag into template from intranet-bottom.inc For templates which use the intranet-bottom include file, the markup in that template lacks the main container's closing , expecting it to be closed in intranet-bottom.inc. This patch moves that closing into each template. This is intended to make it clearer to anyone trying to maintain the correct structure of the page and hopefully to make it possible to automatically tidy template files. --- .../prog/en/includes/intranet-bottom.inc | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 3 ++- .../prog/en/modules/acqui/acqui-home.tt | 1 + .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 1 + .../prog/en/modules/acqui/basketheader.tt | 1 + .../prog/en/modules/acqui/booksellers.tt | 1 + .../prog/en/modules/acqui/duplicate_orders.tt | 1 + .../prog/en/modules/acqui/edifactmsgs.tt | 1 + .../prog/en/modules/acqui/histsearch.tt | 1 + .../prog/en/modules/acqui/invoice-files.tt | 1 + .../prog/en/modules/acqui/invoice.tt | 2 ++ .../prog/en/modules/acqui/invoices.tt | 1 + .../prog/en/modules/acqui/lateorders.tt | 1 + .../prog/en/modules/acqui/neworderempty.tt | 1 + .../prog/en/modules/acqui/newordersubscription.tt | 1 + .../prog/en/modules/acqui/newordersuggestion.tt | 1 + .../prog/en/modules/acqui/ordered.tt | 1 + .../prog/en/modules/acqui/orderreceive.tt | 2 ++ .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 1 + .../prog/en/modules/acqui/parcels.tt | 1 + .../intranet-tmpl/prog/en/modules/acqui/spent.tt | 1 + .../prog/en/modules/acqui/supplier.tt | 1 + .../prog/en/modules/acqui/transferorder.tt | 1 + .../prog/en/modules/acqui/uncertainprice.tt | 1 + .../prog/en/modules/acqui/z3950_search.tt | 1 + .../prog/en/modules/admin/additional-fields.tt | 1 + .../prog/en/modules/admin/adveditorshortcuts.tt | 1 + .../prog/en/modules/admin/aqbudgetperiods.tt | 1 + .../prog/en/modules/admin/aqbudgets.tt | 1 + .../prog/en/modules/admin/aqcontract.tt | 1 + .../intranet-tmpl/prog/en/modules/admin/aqplan.tt | 1 + .../prog/en/modules/admin/audio_alerts.tt | 2 ++ .../en/modules/admin/auth_subfields_structure.tt | 1 + .../prog/en/modules/admin/auth_tag_structure.tt | 1 + .../prog/en/modules/admin/authorised_values.tt | 1 + .../prog/en/modules/admin/authtypes.tt | 1 + .../prog/en/modules/admin/background_jobs.tt | 1 + .../prog/en/modules/admin/biblio_framework.tt | 1 + .../en/modules/admin/branch_transfer_limits.tt | 1 + .../prog/en/modules/admin/branches.tt | 1 + .../prog/en/modules/admin/cash_registers.tt | 1 + .../prog/en/modules/admin/categories.tt | 1 + .../prog/en/modules/admin/checkmarc.tt | 1 + .../intranet-tmpl/prog/en/modules/admin/cities.tt | 1 + .../prog/en/modules/admin/classsources.tt | 1 + .../prog/en/modules/admin/clone-rules.tt | 1 + .../prog/en/modules/admin/columns_settings.tt | 1 + .../prog/en/modules/admin/credit_types.tt | 1 + .../prog/en/modules/admin/currency.tt | 1 + .../prog/en/modules/admin/debit_types.tt | 1 + .../intranet-tmpl/prog/en/modules/admin/desks.tt | 1 + .../prog/en/modules/admin/didyoumean.tt | 1 + .../prog/en/modules/admin/edi_accounts.tt | 1 + .../prog/en/modules/admin/edi_ean_accounts.tt | 1 + .../en/modules/admin/item_circulation_alerts.tt | 1 + .../prog/en/modules/admin/items_search_field.tt | 1 + .../prog/en/modules/admin/items_search_fields.tt | 2 +- .../prog/en/modules/admin/itemtypes.tt | 1 + .../prog/en/modules/admin/koha2marclinks.tt | 1 + .../prog/en/modules/admin/library_groups.tt | 1 + .../prog/en/modules/admin/localization.tt | 4 ++-- .../en/modules/admin/marc_subfields_structure.tt | 1 + .../prog/en/modules/admin/marctagstructure.tt | 1 + .../prog/en/modules/admin/matching-rules.tt | 1 + .../prog/en/modules/admin/oai_set_mappings.tt | 1 + .../prog/en/modules/admin/oai_sets.tt | 1 + .../prog/en/modules/admin/overdrive.tt | 1 + .../prog/en/modules/admin/patron-attr-types.tt | 1 + .../prog/en/modules/admin/preferences.tt | 1 + .../admin/searchengine/elasticsearch/mappings.tt | 1 + .../prog/en/modules/admin/share_content.tt | 1 + .../prog/en/modules/admin/smart-rules.tt | 1 + .../prog/en/modules/admin/sms_providers.tt | 1 + .../prog/en/modules/admin/smtp_servers.tt | 1 + .../prog/en/modules/admin/sru_modmapping.tt | 1 + .../prog/en/modules/admin/sru_modmapping_auth.tt | 1 + .../prog/en/modules/admin/systempreferences.tt | 1 + .../prog/en/modules/admin/transfer_limits.tt | 1 + .../en/modules/admin/transport-cost-matrix.tt | 1 + .../prog/en/modules/admin/usage_statistics.tt | 1 + .../prog/en/modules/admin/z3950servers.tt | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt | 1 + .../prog/en/modules/authorities/auth_finder.tt | 1 + .../en/modules/authorities/authorities-home.tt | 2 +- .../authorities/blinddetail-biblio-search.tt | 1 + .../prog/en/modules/authorities/detail.tt | 1 + .../prog/en/modules/authorities/merge.tt | 1 + .../modules/authorities/searchresultlist-auth.tt | 4 ++-- .../en/modules/authorities/searchresultlist.tt | 1 + .../prog/en/modules/catalogue/ISBDdetail.tt | 1 + .../prog/en/modules/catalogue/MARCdetail.tt | 1 + .../prog/en/modules/catalogue/advsearch.tt | 1 + .../prog/en/modules/catalogue/detail.tt | 1 + .../prog/en/modules/catalogue/imageviewer.tt | 1 + .../prog/en/modules/catalogue/issuehistory.tt | 1 + .../prog/en/modules/catalogue/itemsearch.tt | 1 + .../en/modules/catalogue/labeledMARCdetail.tt | 1 + .../prog/en/modules/catalogue/moredetail.tt | 1 + .../prog/en/modules/catalogue/results.tt | 1 + .../prog/en/modules/catalogue/search-history.tt | 3 ++- .../prog/en/modules/catalogue/stockrotation.tt | 1 + .../prog/en/modules/cataloguing/addbooks.tt | 1 + .../prog/en/modules/cataloguing/merge.tt | 1 + .../prog/en/modules/cataloguing/moveitem.tt | 1 + .../en/modules/cataloguing/z3950_auth_search.tt | 3 ++- .../prog/en/modules/cataloguing/z3950_search.tt | 3 ++- .../prog/en/modules/circ/article-requests.tt | 2 +- .../prog/en/modules/circ/bookcount.tt | 1 + .../prog/en/modules/circ/checkout-notes.tt | 1 + .../prog/en/modules/circ/circulation.tt | 1 + .../modules/circ/circulation_batch_checkouts.tt | 1 + .../prog/en/modules/circ/on-site_checkouts.tt | 1 + .../intranet-tmpl/prog/en/modules/circ/overdue.tt | 1 + .../prog/en/modules/circ/pendingreserves.tt | 1 + .../intranet-tmpl/prog/en/modules/circ/renew.tt | 1 + .../prog/en/modules/circ/request-article.tt | 1 + .../prog/en/modules/circ/reserveratios.tt | 1 + .../intranet-tmpl/prog/en/modules/circ/returns.tt | 1 + .../prog/en/modules/circ/set-library.tt | 15 ++++++++------- .../prog/en/modules/circ/transfers_to_send.tt | 1 + .../prog/en/modules/circ/transferstoreceive.tt | 1 + .../prog/en/modules/circ/view_holdsqueue.tt | 1 + .../prog/en/modules/circ/waitingreserves.tt | 1 + .../prog/en/modules/clubs/club-enrollments.tt | 1 + .../prog/en/modules/clubs/clubs-add-modify.tt | 1 + .../intranet-tmpl/prog/en/modules/clubs/clubs.tt | 1 + .../prog/en/modules/clubs/templates-add-modify.tt | 1 + .../en/modules/course_reserves/add_items-step1.tt | 1 + .../en/modules/course_reserves/add_items-step2.tt | 1 + .../en/modules/course_reserves/batch_add_items.tt | 1 + .../en/modules/course_reserves/batch_rm_items.tt | 1 + .../en/modules/course_reserves/course-details.tt | 1 + .../en/modules/course_reserves/course-reserves.tt | 1 + .../prog/en/modules/course_reserves/course.tt | 2 +- .../prog/en/modules/ill/ill-requests.tt | 1 + .../prog/en/modules/installer/step3.tt | 4 ++-- .../prog/en/modules/intranet-main.tt | 2 +- .../prog/en/modules/labels/barcode-print.tt | 1 + .../prog/en/modules/labels/label-edit-batch.tt | 1 + .../prog/en/modules/labels/label-edit-layout.tt | 1 + .../prog/en/modules/labels/label-edit-profile.tt | 1 + .../prog/en/modules/labels/label-edit-template.tt | 1 + .../prog/en/modules/labels/label-home.tt | 1 + .../prog/en/modules/labels/label-manage.tt | 1 + .../prog/en/modules/labels/label-print.tt | 2 +- .../prog/en/modules/labels/result.tt | 2 +- .../prog/en/modules/labels/search.tt | 2 +- .../prog/en/modules/labels/spinelabel-home.tt | 1 + .../en/modules/members/accountline-details.tt | 1 + .../prog/en/modules/members/apikeys.tt | 1 + .../prog/en/modules/members/boraccount.tt | 1 + .../prog/en/modules/members/deletemem.tt | 1 + .../prog/en/modules/members/discharge.tt | 1 + .../prog/en/modules/members/discharges.tt | 1 + .../prog/en/modules/members/files.tt | 1 + .../prog/en/modules/members/holdshistory.tt | 1 + .../prog/en/modules/members/housebound.tt | 1 + .../prog/en/modules/members/ill-requests.tt | 1 + .../prog/en/modules/members/mancredit.tt | 1 + .../prog/en/modules/members/maninvoice.tt | 1 + .../prog/en/modules/members/member-flags.tt | 1 + .../prog/en/modules/members/member-password.tt | 1 + .../prog/en/modules/members/member.tt | 1 + .../prog/en/modules/members/memberentrygen.tt | 2 ++ .../prog/en/modules/members/members-update.tt | 1 + .../prog/en/modules/members/merge-patrons.tt | 1 + .../prog/en/modules/members/moremember-print.tt | 2 ++ .../prog/en/modules/members/moremember.tt | 1 + .../prog/en/modules/members/notices.tt | 1 + .../intranet-tmpl/prog/en/modules/members/pay.tt | 1 + .../prog/en/modules/members/paycollect.tt | 1 + .../en/modules/members/purchase-suggestions.tt | 1 + .../prog/en/modules/members/readingrec.tt | 1 + .../prog/en/modules/members/recallshistory.tt | 1 + .../prog/en/modules/members/routing-lists.tt | 1 + .../prog/en/modules/members/statistics.tt | 1 + .../prog/en/modules/members/two_factor_auth.tt | 1 + .../prog/en/modules/members/update-child.tt | 3 ++- .../prog/en/modules/offline_circ/list.tt | 1 + .../prog/en/modules/offline_circ/process_koc.tt | 1 + .../prog/en/modules/onboarding/onboardingstep2.tt | 4 ++-- .../prog/en/modules/onboarding/onboardingstep3.tt | 4 ++-- .../prog/en/modules/onboarding/onboardingstep4.tt | 4 ++-- .../prog/en/modules/onboarding/onboardingstep5.tt | 4 ++-- .../prog/en/modules/patron_lists/add-modify.tt | 3 ++- .../prog/en/modules/patron_lists/list.tt | 1 + .../prog/en/modules/patron_lists/lists.tt | 1 + .../prog/en/modules/patroncards/edit-batch.tt | 2 ++ .../prog/en/modules/patroncards/edit-layout.tt | 1 + .../prog/en/modules/patroncards/edit-profile.tt | 1 + .../prog/en/modules/patroncards/edit-template.tt | 1 + .../prog/en/modules/patroncards/image-manage.tt | 1 + 192 files changed, 218 insertions(+), 36 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc index cb6b50ae30..8de8e397ef 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc @@ -8,7 +8,7 @@ [% SET CookieConsentPopup = AdditionalContents.get( location => "CookieConsentPopup", lang => lang, library => branchcode || default_branch ) %] [% USE JSConsents %] [% END %] - + [% IF ( ( languages_loop ) && ( ! popup_window ) && ( Koha.Preference('StaffLangSelectorMode') == 'both' || Koha.Preference('StaffLangSelectorMode') == 'footer') ) %] [% UNLESS ( one_language_enabled ) %] - + + [% INCLUDE 'intranet-bottom.inc' %] [% BLOCK about_panel %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt index f8f91cab66..b670c6720d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt @@ -218,6 +218,7 @@ + [% MACRO jsinclude BLOCK %] [% INCLUDE 'calendar.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt index 729661670b..8ee3b6231b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -966,6 +966,7 @@ + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt index 75a5443193..47d1fc3f48 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt @@ -160,6 +160,7 @@ [% END %] + [% MACRO jsinclude BLOCK %] [% Asset.js("js/acquisitions-menu.js") | $raw %] 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 726e10188a..931df5d3d0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt @@ -255,6 +255,7 @@ + [% MACRO jsinclude BLOCK %] [% Asset.js("js/acquisitions-menu.js") | $raw %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt index a430243375..aa382df885 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt @@ -308,6 +308,7 @@ + [% MACRO jsinclude BLOCK %] [% Asset.js("js/acquisitions-menu.js") | $raw %] 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 69cb4c43c5..cc6cd3ef4b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt @@ -68,6 +68,7 @@ + [% MACRO jsinclude BLOCK %] [% Asset.js("js/acquisitions-menu.js") | $raw %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt index 18f3d32df0..2792ad9c7b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt @@ -155,6 +155,7 @@ + [% MACRO jsinclude BLOCK %] [% Asset.js("js/acquisitions-menu.js") | $raw %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt index 5e502804a9..bf2c01e341 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt @@ -123,6 +123,7 @@ + [% MACRO jsinclude BLOCK %] [% Asset.js("js/acquisitions-menu.js") | $raw %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt index baef5c261a..d0fc98709e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt @@ -539,6 +539,8 @@ [% END # /FOREACH budget %] + + [% MACRO jsinclude BLOCK %] [% Asset.js("js/acquisitions-menu.js") | $raw %] [% Asset.js("js/form-submit.js") | $raw %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt index 6c46799d2a..d5d4e718ba 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt @@ -416,6 +416,7 @@ + [% MACRO jsinclude BLOCK %] [% Asset.js("js/acquisitions-menu.js") | $raw %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt index 51873b164d..784185b0f9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt @@ -276,6 +276,7 @@ + + [% PROCESS patron_search_modal columns => columns, modal_title => t("Add user") %] [% SET columns = ['cardnumber','name','category','branch','action'] %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt index 884fdd79bc..09f22aedef 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt @@ -119,6 +119,7 @@ + [% MACRO jsinclude BLOCK %] [% Asset.js("js/acquisitions-menu.js") | $raw %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt index 198934b565..8c1c19324e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt @@ -123,6 +123,7 @@ + [% MACRO jsinclude BLOCK %] [% Asset.js("js/acquisitions-menu.js") | $raw %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt index b948122764..0afb161745 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt @@ -136,6 +136,7 @@ + [% MACRO jsinclude BLOCK %] [% Asset.js("js/acquisitions-menu.js") | $raw %] 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 4ac0cbc33c..3c3aa4c64b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt @@ -455,6 +455,8 @@ + + [% MACRO jsinclude BLOCK %] [% Asset.js("js/acquisitions-menu.js") | $raw %] [% INCLUDE 'calendar.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt index 0d3d2a16ed..7cc04f97c5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt @@ -353,6 +353,7 @@ + [% MACRO jsinclude BLOCK %] [% Asset.js("js/acquisitions-menu.js") | $raw %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt index 2501b191fb..6a04174e51 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt @@ -252,6 +252,7 @@ + [% MACRO jsinclude BLOCK %] [% Asset.js("js/acquisitions-menu.js") | $raw %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt index c074de2512..9dcfab02ea 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt @@ -151,6 +151,7 @@ + [% MACRO jsinclude BLOCK %] [% Asset.js("js/acquisitions-menu.js") | $raw %] 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 1a2450ee93..d989d4b663 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt @@ -529,6 +529,7 @@ + [% MACRO jsinclude BLOCK %] [% Asset.js("js/acquisitions-menu.js") | $raw %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt index 167170c3dd..499eb25b5f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt @@ -156,6 +156,7 @@ + [% MACRO jsinclude BLOCK %] [% IF transferred %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt index 820e49373c..1f96b75e7f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt @@ -176,6 +176,7 @@ + [% MACRO jsinclude BLOCK %] [% Asset.js("js/acquisitions-menu.js") | $raw %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt index 0dac1852d1..855cc1c0da 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt @@ -299,6 +299,7 @@ tr.selected td { [% END %] + [% 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 3cf17ac616..be9d188ddf 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 @@ -286,6 +286,7 @@ + [% MACRO jsinclude BLOCK %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt index 57182803e0..2952d4b295 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt @@ -80,6 +80,7 @@ + [% MACRO jsinclude BLOCK %] [% Asset.js("js/tools-menu.js") | $raw %] 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 210b1043d3..0372dc92aa 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt @@ -550,6 +550,7 @@ + [% MACRO jsinclude BLOCK %] [% INCLUDE 'calendar.inc' %] 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 479ab84895..64549f2d4e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt @@ -542,6 +542,7 @@ + [% MACRO jsinclude BLOCK %] [% Asset.js("js/acq.js") | $raw %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt index 4986b3f5cb..4267797e12 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt @@ -201,6 +201,7 @@ + [% MACRO jsinclude BLOCK %] [% INCLUDE 'calendar.inc' %] 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 9c047d754e..345ea3a491 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt @@ -297,6 +297,7 @@ + [% MACRO jsinclude BLOCK %] [% Asset.js("js/acq.js") | $raw %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt index e1ee9d934a..8877a21986 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt @@ -189,6 +189,8 @@ + + [% MACRO jsinclude BLOCK %] [% Asset.js("js/admin-menu.js") | $raw %] [% Asset.js("js/audio_alerts.js") | $raw %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt index 571ae059e9..3b1c08d9ad 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt @@ -403,6 +403,7 @@ + [% MACRO jsinclude BLOCK %] [% INCLUDE 'datatables.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt index 7f6500c938..d5d72f9860 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt @@ -291,6 +291,7 @@ + [% MACRO jsinclude BLOCK %] [% INCLUDE 'datatables.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt index 2bfb4f3f7f..2a7145f450 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt @@ -398,6 +398,7 @@ + [% MACRO jsinclude BLOCK %] [% Asset.js("js/admin-menu.js") | $raw %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt index 7f1671a3ae..ba4c202bf2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt @@ -296,6 +296,7 @@ + [% MACRO jsinclude BLOCK %] [% INCLUDE 'datatables.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt index 70a9b7776d..d7715dbca8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt @@ -150,6 +150,7 @@ + [% MACRO jsinclude BLOCK %] [% Asset.js("js/admin-menu.js") | $raw %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt index 7e471c48c6..e704d5f8fc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt @@ -334,6 +334,7 @@ + [% MACRO jsinclude BLOCK %] [% INCLUDE 'datatables.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt index cc26798a4f..e8c26d6b0b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt @@ -119,6 +119,7 @@ + [% MACRO jsinclude BLOCK %] [% Asset.js("js/admin-menu.js") | $raw %] 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 cdf73a5b86..c1683e5a21 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt @@ -623,6 +623,7 @@ + [% MACRO jsinclude BLOCK %] [% Asset.js("js/admin-menu.js") | $raw %] 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 b81a5067e5..094f20aa7c 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 @@ -240,6 +240,7 @@ + [% MACRO jsinclude BLOCK %] [% Asset.js("js/admin-menu.js") | $raw %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt index a162519f98..f60cb45555 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt @@ -818,6 +818,7 @@ + [% MACRO jsinclude BLOCK %]