From 5fb0611600b893a5ef3e7894f932549488a00610 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 8 Apr 2021 11:19:14 +0000 Subject: [PATCH] Bug 28058: (follow-up) Make same change in the OPAC; Use "table_settings" as file name This patch moves the JavaScript contained in a [% ELSIF op == 'list' %] [% INCLUDE 'datatables.inc' %] - [% INCLUDE 'columns_settings.inc' %] + [% INCLUDE 'table_settings.inc' %] [% Asset.js("lib/jquery/plugins/treetable/jquery.treetable.js") | $raw %] 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 c257ff96c6..8798680ec5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt @@ -266,7 +266,7 @@ [% MACRO jsinclude BLOCK %] [% Asset.js("js/admin-menu.js") | $raw %] [% INCLUDE 'datatables.inc' %] - [% INCLUDE 'columns_settings.inc' %] + [% INCLUDE 'table_settings.inc' %] [% INCLUDE 'select2.inc' %] [% Asset.js("js/cataloging.js") | $raw %] -[% INCLUDE 'columns_settings.inc' %] +[% INCLUDE 'table_settings.inc' %] [% Asset.js("js/browser.js") | $raw %] [% INCLUDE 'calendar.inc' %] [% INCLUDE 'str/cataloging_additem.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt index 228e94c2d7..37e4eb614d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt @@ -234,7 +234,7 @@ [% END %] [% MACRO jsinclude BLOCK %] - [% INCLUDE 'columns_settings.inc' %] + [% INCLUDE 'table_settings.inc' %] [% INCLUDE 'datatables.inc' %] [% INCLUDE 'z3950_search.inc' %] [% Asset.js("js/z3950_search.js") | $raw %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index 7fcde8578d..c8e3877750 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -1103,7 +1103,7 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'calendar.inc' %] [% INCLUDE 'datatables.inc' %] - [% INCLUDE 'columns_settings.inc' %] + [% INCLUDE 'table_settings.inc' %] [% Asset.js("lib/jquery/plugins/jquery-ui-timepicker-addon.min.js") | $raw %] [% INCLUDE 'timepicker.inc' %] [% Asset.js("lib/jquery/plugins/rowGroup/dataTables.rowGroup.min.js") | $raw %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt index 92d088b446..f94192871f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt @@ -242,7 +242,7 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'calendar.inc' %] [% INCLUDE 'datatables.inc' %] - [% INCLUDE 'columns_settings.inc' %] + [% INCLUDE 'table_settings.inc' %] -- 2.11.0