From 771c7c2aed14ccd3f5c812af98fb27bf0af66de9 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 27 Mar 2020 23:35:51 +0000 Subject: [PATCH] Bug 25002: JS Includes should be wrapped with template comments MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch adds HTML comments to Template::Toolkit include files which contain + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc index f2966019cf..f8043c5cf1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc @@ -1,3 +1,4 @@ + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc index 9b266b61a9..5b4f809b8f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc @@ -1,4 +1,5 @@ [% USE Koha %] + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/catalog-strings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/catalog-strings.inc index 5c6e0ca124..3e77d6a998 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/catalog-strings.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/catalog-strings.inc @@ -1,3 +1,4 @@ + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc index 0130a63979..8e231e3c6e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc @@ -8,6 +8,7 @@ [% Asset.js("lib/keyboard/layouts/all.min.js") | $raw %] [% Asset.js("lib/koha/cateditor/marc-mode.js") | $raw %] [% Asset.js("lib/require.js") | $raw %] + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-widgets-marc21.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-widgets-marc21.inc index ab5e655080..8e428ee7eb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-widgets-marc21.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-widgets-marc21.inc @@ -69,7 +69,7 @@ 4500 - + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc index 1117050110..59c57e9204 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc @@ -1,5 +1,5 @@ [% USE ColumnsSettings %] - + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/format_price.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/format_price.inc index cf711718fa..fd1d68112b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/format_price.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/format_price.inc @@ -1,4 +1,5 @@ [% USE Koha %] + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/greybox.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/greybox.inc index 0fc2e18dd9..948f5d9211 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/greybox.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/greybox.inc @@ -1,5 +1,6 @@ [% USE raw %] [% USE Asset %] + @@ -7,3 +8,4 @@ [% Asset.js("lib/greybox/AJS_fx.js") | $raw %] [% Asset.js("lib/greybox/gb_scripts.js") | $raw %] [% Asset.css("lib/greybox/gb_styles.css") | $raw %] + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-list-table-strings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-list-table-strings.inc index a02a26b3b3..4d217023c2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-list-table-strings.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-list-table-strings.inc @@ -1,3 +1,4 @@ + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/installer-intranet-bottom.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/installer-intranet-bottom.inc index 42ab14efdc..33f7ffb3d2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/installer-intranet-bottom.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/installer-intranet-bottom.inc @@ -5,6 +5,7 @@ [% Asset.js("lib/jquery/jquery-ui-1.11.4.min.js") | $raw %] [% Asset.js("lib/bootstrap/bootstrap.min.js") | $raw %] [% Asset.js("lib/jquery/plugins/jquery.validate.min.js") | $raw %] + + [% jsinclude | $raw # Parse the page template's JavaScript block if necessary %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/installer-strings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/installer-strings.inc index 2ee1129e02..43ea0ea906 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/installer-strings.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/installer-strings.inc @@ -1,3 +1,4 @@ + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/js-date-format.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/js-date-format.inc index b567a86940..db93f9911a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/js-date-format.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/js-date-format.inc @@ -4,6 +4,7 @@ [% USE KohaDates %] [% Asset.js("lib/moment/moment.min.js") | $raw %] [% Asset.js("lib/moment/moment-timezone-with-data-10-year-range.min.js") | $raw %] + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc index daf0dc7935..bd833a4e76 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc @@ -29,13 +29,17 @@ [% INCLUDE 'validator-strings.inc' %] [% IF ( IntranetUserJS ) %] + + [% END %] + [% IF ( virtualshelves || intranetbookbag ) %] [% END %] [% IF Koha.Preference('AudioAlerts') || AudioAlertsPage %] [% END %] + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record-strings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record-strings.inc index d13a7b9a03..5cab76f232 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record-strings.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record-strings.inc @@ -1,5 +1,7 @@ [%# transletable strings for merge-record.js %] + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/password_check.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/password_check.inc index 5a037fa6eb..9f4266b792 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/password_check.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/password_check.inc @@ -1,5 +1,6 @@ [% USE Koha %] [% BLOCK add_password_check %] + + [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/select2.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/select2.inc index 335420070d..c776cbafc8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/select2.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/select2.inc @@ -3,6 +3,7 @@ [% Asset.js("lib/select2/js/select2.min.js") | $raw %] [% Asset.css("lib/select2/css/select2.min.css") | $raw %] [% Asset.css("css/select2.css") | $raw %] + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/slip-print.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/slip-print.inc index 63f4bc2897..d5e60ac8d9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/slip-print.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/slip-print.inc @@ -1,4 +1,5 @@ [% USE raw %] + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/str/cataloging_additem.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/str/cataloging_additem.inc index 52d8f3353a..49d5857aa6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/str/cataloging_additem.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/str/cataloging_additem.inc @@ -1,4 +1,5 @@ [% USE raw %] + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/str/members-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/str/members-menu.inc index 9395f33331..d07cf4602e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/str/members-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/str/members-menu.inc @@ -1,7 +1,7 @@ [% USE scalar %] [% USE Koha %] [% USE Categories %] - + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/str/tinymce_i18n.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/str/tinymce_i18n.inc index 1f72178555..d7041579f3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/str/tinymce_i18n.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/str/tinymce_i18n.inc @@ -1,3 +1,4 @@ + \ No newline at end of file + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc index 5ef174db7c..26aed46765 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc @@ -1,3 +1,4 @@ + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/timepicker.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/timepicker.inc index 04f5d3dbc8..534c4b1e16 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/timepicker.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/timepicker.inc @@ -1,3 +1,4 @@ + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/validator-strings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/validator-strings.inc index 4b201542d0..0600f0a672 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/validator-strings.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/validator-strings.inc @@ -1,3 +1,4 @@ + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/wysiwyg-systempreferences.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/wysiwyg-systempreferences.inc index 83ee69f198..bcfd0f1648 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/wysiwyg-systempreferences.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/wysiwyg-systempreferences.inc @@ -3,7 +3,7 @@ [% #Enable tinymce for system preferences %] [% Asset.js("lib/tiny_mce/tinymce.min.js") | $raw %] [% INCLUDE 'str/tinymce_i18n.inc' %] - + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950_search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950_search.inc index a59dfacd94..a4bf326b2a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950_search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950_search.inc @@ -1,3 +1,4 @@ + + -- 2.17.1