@@ -, +, @@ comments - acquisitions-toolbar.inc - validtor-strings.inc - js_includes.inc - format-price.inc - additem.js.inc - columns_settings.inc - strings.inc - select2.inc - calendar.inc - str/cataloging_additem.inc - authorities_js.inc - catalog-strings.inc - cateditor-ui.inc - cateditor-widgets-marc21.inc - greybox.inc - ill-list-table-strings.inc - installer-intranet-bottom.inc - installer-strings.inc - merge-record-strings.inc - password_check.inc - str/members-menu.inc - slip-print.inc - timepicker.inc - str/tinymce_i18n.inc - wysiwyg-systempreferences.inc - 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(-) --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc @@ -1,4 +1,5 @@ [% INCLUDE 'blocking_errors.inc' %] + + --- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc @@ -1,3 +1,4 @@ + + --- a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc @@ -1,4 +1,5 @@ [% USE Koha %] + + --- a/koha-tmpl/intranet-tmpl/prog/en/includes/catalog-strings.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/catalog-strings.inc @@ -1,3 +1,4 @@ + + --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc +++ a/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 %] + + --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-widgets-marc21.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-widgets-marc21.inc @@ -69,7 +69,7 @@ 4500 - + + --- a/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc @@ -1,5 +1,5 @@ [% USE ColumnsSettings %] - + + --- a/koha-tmpl/intranet-tmpl/prog/en/includes/format_price.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/format_price.inc @@ -1,4 +1,5 @@ [% USE Koha %] + + --- a/koha-tmpl/intranet-tmpl/prog/en/includes/greybox.inc +++ a/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 %] + --- a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-list-table-strings.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-list-table-strings.inc @@ -1,3 +1,4 @@ + + --- a/koha-tmpl/intranet-tmpl/prog/en/includes/installer-intranet-bottom.inc +++ a/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 %] --- a/koha-tmpl/intranet-tmpl/prog/en/includes/installer-strings.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/installer-strings.inc @@ -1,3 +1,4 @@ + + --- a/koha-tmpl/intranet-tmpl/prog/en/includes/js-date-format.inc +++ a/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 %] + + --- a/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc +++ a/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 %] + --- a/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record-strings.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record-strings.inc @@ -1,5 +1,7 @@ [%# transletable strings for merge-record.js %] + + --- a/koha-tmpl/intranet-tmpl/prog/en/includes/password_check.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/password_check.inc @@ -1,5 +1,6 @@ [% USE Koha %] [% BLOCK add_password_check %] + + [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/includes/select2.inc +++ a/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 %] + + --- a/koha-tmpl/intranet-tmpl/prog/en/includes/slip-print.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/slip-print.inc @@ -1,4 +1,5 @@ [% USE raw %] + + --- a/koha-tmpl/intranet-tmpl/prog/en/includes/str/cataloging_additem.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/str/cataloging_additem.inc @@ -1,4 +1,5 @@ [% USE raw %] + + --- a/koha-tmpl/intranet-tmpl/prog/en/includes/str/members-menu.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/str/members-menu.inc @@ -1,7 +1,7 @@ [% USE scalar %] [% USE Koha %] [% USE Categories %] - + + --- a/koha-tmpl/intranet-tmpl/prog/en/includes/str/tinymce_i18n.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/str/tinymce_i18n.inc @@ -1,3 +1,4 @@ + + + --- a/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc @@ -1,3 +1,4 @@ + + --- a/koha-tmpl/intranet-tmpl/prog/en/includes/timepicker.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/timepicker.inc @@ -1,3 +1,4 @@ + + --- a/koha-tmpl/intranet-tmpl/prog/en/includes/validator-strings.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/validator-strings.inc @@ -1,3 +1,4 @@ + + --- a/koha-tmpl/intranet-tmpl/prog/en/includes/wysiwyg-systempreferences.inc +++ a/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' %] - + + --- a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950_search.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950_search.inc @@ -1,3 +1,4 @@ + + --