Bugzilla – Attachment 102041 Details for
Bug 25002
JS Includes should be wrapped with template comments
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 25002: JS Includes should be wrapped with template comments
Bug-25002-JS-Includes-should-be-wrapped-with-templ.patch (text/plain), 22.28 KB, created by
Owen Leonard
on 2020-03-28 16:43:54 UTC
(
hide
)
Description:
Bug 25002: JS Includes should be wrapped with template comments
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2020-03-28 16:43:54 UTC
Size:
22.28 KB
patch
obsolete
>From 04c7214306b806dd4474d8d8c56d8826f0818f6e Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Fri, 27 Mar 2020 23:35:51 +0000 >Subject: [PATCH] Bug 25002: JS Includes should be wrapped with template > comments > >This patch adds HTML comments to Template::Toolkit include files which >contain <script> tags so that it is clear where the embedded scripts can >be found in the code. > >To test, apply the patch and view source on the following pages to >verify the presence of the comments: > >Acquisitions home page: > - acquisitions-toolbar.inc > - validtor-strings.inc > - js_includes.inc > - format-price.inc >Cataloging -> Add/Edit item: > - additem.js.inc > - columns_settings.inc > - strings.inc > - select2.inc > - calendar.inc > - str/cataloging_additem.inc >Authorities home page: > - authorities_js.inc >Bibliographic detail page: > - catalog-strings.inc >Cataloging -> Advanced editor: > - cateditor-ui.inc > - cateditor-widgets-marc21.inc >Administration -> Item types: > - greybox.inc >ILL requests: > - ill-list-table-strings.inc >Web installer > - installer-intranet-bottom.inc >Web installer -> Onboarding > - installer-strings.inc >Lists -> List contents -> Merge records > - merge-record-strings.inc >Patrons -> Patron -> Change password > - password_check.inc > - str/members-menu.inc >Patrons -> Patron -> Print summary > - slip-print.inc >Circulation -> Check out > - timepicker.inc >Administration -> System preferences: > - str/tinymce_i18n.inc > - wysiwyg-systempreferences.inc >Cataloging -> Z39.50 Search: > - z3950_search.inc >--- > .../intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc | 2 ++ > koha-tmpl/intranet-tmpl/prog/en/includes/additem.js.inc | 2 ++ > koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc | 2 ++ > koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc | 2 ++ > koha-tmpl/intranet-tmpl/prog/en/includes/catalog-strings.inc | 2 ++ > koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc | 2 ++ > .../intranet-tmpl/prog/en/includes/cateditor-widgets-marc21.inc | 3 ++- > koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc | 3 ++- > koha-tmpl/intranet-tmpl/prog/en/includes/format_price.inc | 2 ++ > koha-tmpl/intranet-tmpl/prog/en/includes/greybox.inc | 2 ++ > .../intranet-tmpl/prog/en/includes/ill-list-table-strings.inc | 2 ++ > .../intranet-tmpl/prog/en/includes/installer-intranet-bottom.inc | 2 ++ > koha-tmpl/intranet-tmpl/prog/en/includes/installer-strings.inc | 2 ++ > koha-tmpl/intranet-tmpl/prog/en/includes/js-date-format.inc | 2 ++ > koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc | 9 +++++++++ > .../intranet-tmpl/prog/en/includes/merge-record-strings.inc | 2 ++ > koha-tmpl/intranet-tmpl/prog/en/includes/password_check.inc | 2 ++ > koha-tmpl/intranet-tmpl/prog/en/includes/select2.inc | 2 ++ > koha-tmpl/intranet-tmpl/prog/en/includes/slip-print.inc | 2 ++ > .../intranet-tmpl/prog/en/includes/str/cataloging_additem.inc | 2 ++ > koha-tmpl/intranet-tmpl/prog/en/includes/str/members-menu.inc | 3 ++- > koha-tmpl/intranet-tmpl/prog/en/includes/str/tinymce_i18n.inc | 4 +++- > koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc | 2 ++ > koha-tmpl/intranet-tmpl/prog/en/includes/timepicker.inc | 2 ++ > koha-tmpl/intranet-tmpl/prog/en/includes/validator-strings.inc | 2 ++ > .../intranet-tmpl/prog/en/includes/wysiwyg-systempreferences.inc | 3 ++- > koha-tmpl/intranet-tmpl/prog/en/includes/z3950_search.inc | 2 ++ > 27 files changed, 62 insertions(+), 5 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc >index 9e4f802b8c..8191a021ff 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc >@@ -1,4 +1,5 @@ > [% INCLUDE 'blocking_errors.inc' %] >+<!-- acquisitions-toolbar.inc --> > <script> > function confirm_deletion() { > if (confirm(_("Are you sure you want to delete this vendor?"))) { >@@ -37,3 +38,4 @@ > <div class="btn-group"><a class="btn btn-default" href="/cgi-bin/koha/acqui/supplier.pl?op=enter"><i class="fa fa-plus"></i> New vendor</a></div> > [% END %] > </div> >+<!-- / acquisitions-toolbar.inc --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/additem.js.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/additem.js.inc >index 0ad90cf53c..12f5be7a1a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/additem.js.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/additem.js.inc >@@ -1,3 +1,4 @@ >+<!-- additem.js.inc --> > <script> > var MSG_ADDITEM_JS_ADDITEM = _("Add item"); > var MSG_ADDITEM_JS_ADDMULTI = _("Add multiple items"); >@@ -12,3 +13,4 @@ > var MSG_ADDITEM_JS_IS_DUPLICATE = _("is duplicated"); > var MSG_ADDITEM_JS_ALREADY_EXISTS_IN_DB = _("already exists in database"); > </script> >+<!-- / additem.js.inc --> >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 @@ >+<!-- authorities_js.inc --> > <script> > > function mergeAuth(authid, summary) { >@@ -89,3 +90,4 @@ $(document).ready(function () { > }); > > </script> >+<!-- / authorities_js.inc --> >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 %] >+<!-- calendar.inc --> > <script> > > var debug = "[% debug | html %]"; >@@ -208,3 +209,4 @@ $("#dateofbirth").datepicker({ > }); > }); > </script> >+<!-- / calendar.inc --> >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 @@ >+<!-- catalog-strings.inc --> > <script> > /* Strings for translation */ > var MSG_REPLACE_RECORD = _("Please note that this external search could replace the current record."); >@@ -28,3 +29,4 @@ > return strQuery; > } > </script> >+<!-- / catalog-strings.inc --> >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 %] >+<!-- cateditor-ui.inc --> > <script> > [% FOREACH shortcut IN shortcuts -%] > var [% shortcut.shortcut_name | html %] = "[% shortcut.shortcut_keys | html %]"; >@@ -1165,3 +1166,4 @@ require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr > } )(); > > </script> >+<!-- / cateditor-ui.inc --> >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 @@ > <span title="Length of directory elements">4500</span> > </div> > </div> >- >+<!-- cateditor-widgets-marc21.inc --> > <script> > > /** >@@ -300,3 +300,4 @@ require( [ 'koha-backend', 'widget', 'text-marc' ], function( KohaBackend, Widge > } ); > > </script> >+<!-- / cateditor-widgets-marc21.inc --> >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 %] >- >+<!-- columns_settings.inc --> > <script> > function KohaTable(id_selector, dt_parameters, columns_settings, add_filters) { > var counter = 0; >@@ -152,3 +152,4 @@ function KohaTable(id_selector, dt_parameters, columns_settings, add_filters) { > } > > </script> >+<!-- / columns_settings.inc --> >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 %] >+<!-- format-price.inc --> > <script> > [%# This should use the Format template plugin, but not pushed yet %] > [% IF Koha.Preference("CurrencyFormat") == 'FR' %] >@@ -32,3 +33,4 @@ > return value.replace('.', decimal_point).replace(new RegExp(re, 'g'), '$&' + thousands_sep); > } > </script> >+<!-- / format-price.inc --> >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 %] >+<!-- greybox.inc --> > <script> > var GB_ROOT_DIR = "[% interface | html %]/lib/greybox/"; > </script> >@@ -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 %] >+<!-- / greybox.inc --> >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 @@ >+<!-- ill-list-table-strings.inc --> > <script> > var ill_borrower_details = _("View borrower details"); > var ill_biblio_details = _("View biblio details"); >@@ -17,3 +18,4 @@ > updated: _("Updated on") > }; > </script> >+<!-- / ill-list-table-strings.inc --> >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 %] >+ <!-- installer-intranet-bottom.inc --> > <script> > function _(s) { return s } // dummy function for gettext > [%# Prevent XFS attacks -%] >@@ -17,6 +18,7 @@ > } > }); > </script> >+ <!-- / installer-intranet-bottom.inc --> > [% jsinclude | $raw # Parse the page template's JavaScript block if necessary %] > </body> > </html> >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 @@ >+<!-- installer-strings.inc --> > <script> > var MSG_LETTERS_ONLY=(_("Please only enter letters.")); > var MSG_PASSWORD_MISMATCH=(_("The entered passwords do not match")); >@@ -5,3 +6,4 @@ > var MSG_ONLY_ONE_ENROLLMENTPERIOD=(_("Please only choose one enrollment period.")); > var MSG_LETTERS_NUMBERS_ONLY=(_("Please only enter letters or numbers.")); > </script> >+<!-- / installer-strings.inc --> >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 %] >+<!-- js-date-format.inc --> > <script> > (function() { > var def_date_format = '[% Koha.Preference('dateformat') | html %]'; >@@ -66,3 +67,4 @@ > > })(); > </script> >+<!-- / js-date-format.inc --> >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 ) %] >+ <!-- js_includes.inc: IntranetUserJS --> > <script> > [% IntranetUserJS | $raw %] > </script> >+ <!-- / js_includes.inc: IntranetUserJS --> > [% END %] > >+<!-- js_includes.inc --> > [% IF ( virtualshelves || intranetbookbag ) %] > <script> >+ // virtualshelves || intranetbookbag > var MSG_BASKET_EMPTY = _("Your cart is currently empty"); > var MSG_RECORD_IN_BASKET = _("This item is already in your cart"); > var MSG_RECORD_ADDED = _("This item has been added to your cart"); >@@ -58,12 +62,14 @@ > [% IF LocalCoverImages %] > [% Asset.js("js/localcovers.js") | $raw %] > <script> >+ // LocalCoverImages > var NO_LOCAL_JACKET = _("No cover image available"); > </script> > [% END %] > > [% IF Koha.Preference('AudioAlerts') || AudioAlertsPage %] > <script> >+ // AudioAlerts > var AUDIO_ALERT_PATH = '[% interface | html %]/[% theme | html %]/sound/'; > var AUDIO_ALERTS = JSON.parse( "[% To.json(AudioAlerts.AudioAlerts) | $raw %]" ); > >@@ -84,6 +90,7 @@ > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] > [% IF ( PatronAutoComplete ) %] > <script> >+ // PatronAutoComplete && CAN_user_circulate_circulate_remaining_permissions > $(document).ready(function(){ > var obj = $( "#findborrower" ).autocomplete({ > source: "/cgi-bin/koha/circ/ysearch.pl", >@@ -112,6 +119,7 @@ > [% END %] > [% IF ( PatronAutoComplete ) %] > <script> >+ // PatronAutoComplete > $(document).ready(function(){ > var obj = $( "#searchmember" ).autocomplete({ > source: "/cgi-bin/koha/circ/ysearch.pl", >@@ -137,3 +145,4 @@ > }); > </script> > [% END %] >+<!-- / js_includes.inc --> >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 %] >+<!-- merge-record-strings.inc --> > <script> > var MSG_MERGEREC_ALREADY_EXISTS = _("The field is non-repeatable and already exists in the destination record. Therefore, you cannot add it."); > var MSG_MERGEREC_SUBFIELD_ALREADY_EXISTS = _("The subfield is non-repeatable and already exists in the destination record. Therefore, you cannot add it."); > </script> >+<!-- / merge-record-strings.inc --> >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..e776d08b9b 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 %] >+<!-- password_check.inc --> > <script> > var pwd_title = ""; > var pattern_title = ""; >@@ -23,3 +24,4 @@ > }, _("Please enter the same password as above")); > </script> > [% END %] >+<!-- / password_check.inc --> >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 %] >+<!-- select2.inc --> > <script> > jQuery.extend($.fn.select2.defaults, { > allowClear: true, >@@ -52,3 +53,4 @@ > } > }); > </script> >+<!-- / select2.inc --> >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 %] >+<!-- slip-print.inc --> > <script> > [% IF ( Koha.Preference('IntranetSlipPrinterJS') ) %] > [% Koha.Preference('IntranetSlipPrinterJS') | $raw %] >@@ -9,3 +10,4 @@ > }); > [% END %] > </script> >+<!-- / slip-print.inc --> >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 %] >+<!-- str/cataloging_additem.inc --> > <script> > var searchid = '[% searchid | html %]'; > var biblionumber = '[% biblionumber | html %]'; >@@ -21,3 +22,4 @@ > var MSG_CONFIRM_SAVE = _("Are you sure you want to save?"); > var columns_settings = [% ColumnsSettings.GetColumns( 'cataloguing', 'additem', 'itemst', 'json' ) | $raw %]; > </script> >+<!-- / str/cataloging_additem.inc --> >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..832ffb600e 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 %] >- >+<!-- str/members-menu.inc --> > <script> > var MSG_CONFIRM_RENEW_PATRON = _("Are you sure you want to renew this patron's registration?"); > var MSG_CONFIRM_UPDATE_CHILD = _("Are you sure you want to update this child to an Adult category? This cannot be undone."); >@@ -41,3 +41,4 @@ > }); > [% END %] > </script> >+<!-- str/members-menu.inc --> >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..d3b1d171ba 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 @@ >+<!-- str/tinymce_i18n.inc --> > <script> > /* tinymce considers 'en' to be the default translation. > Translating this file will allow us to load the correct language >@@ -397,4 +398,5 @@ > "{ 0 } words ": _("{ 0 } words "), > "{0} words": _("{0} words"), > }); >-</script> >\ No newline at end of file >+</script> >+<!-- str/tinymce_i18n.inc --> >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 @@ >+<!-- strings.inc --> > <script> > var CIRCULATION_RETURNED = _("Checked in"); > var CIRCULATION_NOT_RETURNED = _("Unable to check in"); >@@ -57,3 +58,4 @@ > var BROWSER_PREVIOUS = _("Previous"); > var BROWSER_NEXT = _("Next"); > </script> >+<!-- / strings.inc --> >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 @@ >+<!-- timepicker.inc --> > <script> > /* Localization of the timepicker plugin */ > jQuery(function($){ >@@ -20,3 +21,4 @@ > $.timepicker.setDefaults($.timepicker.regional['']); > }); > </script> >+<!-- / timepicker.inc --> >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 @@ >+<!-- validator-strings.inc --> > <script> > $(document).ready(function(){ > jQuery.extend(jQuery.validator.messages, { >@@ -20,3 +21,4 @@ > }); > }); > </script> >+<!-- / validator-strings.inc --> >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' %] >- >+<!-- wysiwyg-systempreferences.inc --> > <script> > // Save TinyMCE content and trigger an event on the original element > function wysiwyg_change (ed){ >@@ -32,3 +32,4 @@ > } > }); > </script> >+<!-- / wysiwyg-systempreferences.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 @@ >+<!-- z3950_search.inc --> > <script> > > var MSG_CHOOSE_Z3950 = _("Please choose at least one external target"); >@@ -24,3 +25,4 @@ function validate_goto_page(){ > [% END %] > > </script> >+<!-- / z3950_search.inc --> >-- >2.11.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 25002
:
102041
|
103374
|
103841
|
103877