Bugzilla – Attachment 119321 Details for
Bug 28058
Move JavaScript out of columns_settings.inc into separate file
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 28058: (follow-up) Make same change in the OPAC; Use "table_settings" as file name
Bug-28058-follow-up-Make-same-change-in-the-OPAC-U.patch (text/plain), 44.24 KB, created by
Owen Leonard
on 2021-04-08 12:32:45 UTC
(
hide
)
Description:
Bug 28058: (follow-up) Make same change in the OPAC; Use "table_settings" as file name
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2021-04-08 12:32:45 UTC
Size:
44.24 KB
patch
obsolete
>From 5fb0611600b893a5ef3e7894f932549488a00610 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >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 <script> block inside >columns_settings.inc in the OPAC into a separate file. > >The new JavaScript file, table_settings.js, contains some corrections to >minor errors highlighted by eslint (missing semicolons, undeclared >variables, etc). > >This patch also moves template include files and corresponding >JavaScript files to the name "table_settings" instead of >"columns_settings." Updated are all files where "columns_settings.inc" >was referenced. > >To test, apply the patch and test pages in the OPAC and staff interface >that use the table_settings include file, e.g. > >Staff interface: > > - Administration -> Libraries > - Circulation -> Check out > >OPAC: > > - Course reserves > - Logged in patron -> "Your summary" > >In all cases DataTable should display correctly, with all associated >controls. Changes made to the tables' configuration via 'Administration >-> Table settings' should be reflected in the corresponding page. >--- > .../prog/en/includes/columns_settings.inc | 6 --- > .../prog/en/includes/table_settings.inc | 6 +++ > .../prog/en/modules/acqui/acqui-home.tt | 2 +- > .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 2 +- > .../prog/en/modules/acqui/duplicate_orders.tt | 2 +- > .../prog/en/modules/acqui/histsearch.tt | 2 +- > .../prog/en/modules/acqui/lateorders.tt | 2 +- > .../prog/en/modules/admin/aqbudgets.tt | 2 +- > .../prog/en/modules/admin/authorised_values.tt | 2 +- > .../prog/en/modules/admin/branches.tt | 2 +- > .../prog/en/modules/admin/categories.tt | 2 +- > .../prog/en/modules/admin/currency.tt | 2 +- > .../prog/en/modules/admin/itemtypes.tt | 2 +- > .../prog/en/modules/catalogue/detail.tt | 2 +- > .../prog/en/modules/catalogue/issuehistory.tt | 2 +- > .../prog/en/modules/cataloguing/additem.tt | 2 +- > .../prog/en/modules/cataloguing/z3950_search.tt | 2 +- > .../prog/en/modules/circ/circulation.tt | 2 +- > .../intranet-tmpl/prog/en/modules/circ/overdue.tt | 2 +- > .../prog/en/modules/circ/pendingreserves.tt | 2 +- > .../prog/en/modules/circ/reserveratios.tt | 2 +- > .../intranet-tmpl/prog/en/modules/circ/returns.tt | 2 +- > .../prog/en/modules/circ/view_holdsqueue.tt | 2 +- > .../prog/en/modules/circ/waitingreserves.tt | 2 +- > .../en/modules/course_reserves/course-details.tt | 2 +- > .../en/modules/course_reserves/course-reserves.tt | 2 +- > .../prog/en/modules/ill/ill-requests.tt | 2 +- > .../prog/en/modules/members/boraccount.tt | 2 +- > .../prog/en/modules/members/holdshistory.tt | 2 +- > .../prog/en/modules/members/ill-requests.tt | 2 +- > .../prog/en/modules/members/member.tt | 2 +- > .../prog/en/modules/members/moremember.tt | 2 +- > .../intranet-tmpl/prog/en/modules/members/pay.tt | 2 +- > .../prog/en/modules/members/readingrec.tt | 2 +- > .../prog/en/modules/patron_lists/list.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt | 2 +- > .../prog/en/modules/reports/catalogue_stats.tt | 2 +- > .../en/modules/reports/guided_reports_start.tt | 2 +- > .../prog/en/modules/reports/itemslost.tt | 2 +- > .../prog/en/modules/reports/orders_by_budget.tt | 2 +- > .../prog/en/modules/reserve/request.tt | 2 +- > .../prog/en/modules/serials/subscription-detail.tt | 2 +- > .../prog/en/modules/suggestion/suggestion.tt | 2 +- > .../intranet-tmpl/prog/en/modules/tools/letter.tt | 2 +- > .../prog/en/modules/tools/stockrotation.tt | 2 +- > .../intranet-tmpl/prog/en/modules/tools/upload.tt | 2 +- > .../intranet-tmpl/prog/en/modules/tools/viewlog.tt | 2 +- > .../js/{tablesettings.js => table_settings.js} | 0 > .../bootstrap/en/includes/table_settings.inc | 6 +++ > .../bootstrap/en/modules/opac-course-details.tt | 2 +- > .../bootstrap/en/modules/opac-course-reserves.tt | 2 +- > .../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 2 +- > .../bootstrap/en/modules/opac-holdshistory.tt | 2 +- > .../bootstrap/en/modules/opac-readingrecord.tt | 2 +- > .../columns_settings.inc => js/table_settings.js} | 56 +++++++++++----------- > 55 files changed, 89 insertions(+), 85 deletions(-) > delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc > create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/table_settings.inc > rename koha-tmpl/intranet-tmpl/prog/js/{tablesettings.js => table_settings.js} (100%) > create mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/includes/table_settings.inc > rename koha-tmpl/opac-tmpl/bootstrap/{en/includes/columns_settings.inc => js/table_settings.js} (71%) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc >deleted file mode 100644 >index 1284657466..0000000000 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc >+++ /dev/null >@@ -1,6 +0,0 @@ >-[% USE raw %] >-[% USE Asset %] >-[% USE TablesSettings %] >-<!-- columns_settings.inc --> >-[% Asset.js("js/tablesettings.js") | $raw %] >-<!-- / columns_settings.inc --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/table_settings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/table_settings.inc >new file mode 100644 >index 0000000000..c52a208b96 >--- /dev/null >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/table_settings.inc >@@ -0,0 +1,6 @@ >+[% USE raw %] >+[% USE Asset %] >+[% USE TablesSettings %] >+<!-- table_settings.js --> >+[% Asset.js("js/table_settings.js") | $raw %] >+<!-- / table_settings.js --> >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 60f3fdb9a5..6c2b3ca6d4 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 >@@ -191,7 +191,7 @@ > [% INCLUDE 'datatables.inc' %] > [% Asset.js("lib/jquery/plugins/treetable/jquery.treetable.js") | $raw %] > [% Asset.js("js/acquisitions-menu.js") | $raw %] >- [% INCLUDE 'columns_settings.inc' %] >+ [% INCLUDE 'table_settings.inc' %] > <script> > dt_overwrite_html_sorting_localeCompare(); > >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 c9149a4af1..6afb6d9b81 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >@@ -812,7 +812,7 @@ > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/acquisitions-menu.js") | $raw %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] >+ [% INCLUDE 'table_settings.inc' %] > [% Asset.js("lib/hc-sticky.js") | $raw %] > [% Asset.js("js/acq.js") | $raw %] > <script> >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 a75fdc0485..b386028a61 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 >@@ -310,7 +310,7 @@ Basket [% basket.basketno | html %] › Duplicate existing orders > [% Asset.js("js/acquisitions-menu.js") | $raw %] > [% INCLUDE 'calendar.inc' %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] >+ [% INCLUDE 'table_settings.inc' %] > [% Asset.js("js/autocomplete/patrons.js") | $raw %] > [% Asset.js("js/acq.js") | $raw %] > [% Asset.js("js/funds_sorts.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 7c4d2c3f1d..b21e26e02b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt >@@ -148,7 +148,7 @@ > [% Asset.js("js/acquisitions-menu.js") | $raw %] > [% INCLUDE 'calendar.inc' %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] >+ [% INCLUDE 'table_settings.inc' %] > [% Asset.js("js/autocomplete/patrons.js") | $raw %] > <script> > var MSG_REMOVE_PATRON = _("Remove"); >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 40ff1d1352..f15c4b5d0b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >@@ -287,7 +287,7 @@ > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/acquisitions-menu.js") | $raw %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] >+ [% INCLUDE 'table_settings.inc' %] > [% INCLUDE 'calendar.inc' %] > <script> > var late_orderst; >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 60f75c1e0e..771f679384 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt >@@ -647,7 +647,7 @@ > </script> > [% ELSIF op == 'list' %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] >+ [% INCLUDE 'table_settings.inc' %] > [% Asset.js("lib/jquery/plugins/treetable/jquery.treetable.js") | $raw %] > > <script> >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 ca36a496ec..0ff477b3d4 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 >@@ -350,7 +350,7 @@ > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/admin-menu.js") | $raw %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] >+ [% INCLUDE 'table_settings.inc' %] > <script> > $(document).ready(function() { > var columns_settings = []; // Empty because there are no columns we want to be configurable >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 40a11a4ee5..75c9abb68a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >@@ -317,7 +317,7 @@ > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/admin-menu.js") | $raw %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] >+ [% INCLUDE 'table_settings.inc' %] > [% Asset.js("lib/tiny_mce/tinymce.min.js") | $raw %] > [% INCLUDE 'str/tinymce_i18n.inc' %] > <script> >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 54831764e2..8479d57ef5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt >@@ -687,7 +687,7 @@ > [% Asset.js("js/messaging-preference-form.js") | $raw %] > [% INCLUDE 'calendar.inc' %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] >+ [% INCLUDE 'table_settings.inc' %] > <script> > var columns_settings = [% TablesSettings.GetColumns( 'admin', 'categories', 'patron_categories', 'json' ) | $raw %]; > </script> >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' %] > <script> > > function check_currency(val) { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt >index b419619a30..d1569f9a74 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt >@@ -574,7 +574,7 @@ Data deleted > [% Asset.js("js/admin-menu.js") | $raw %] > [% INCLUDE 'greybox.inc' %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] >+ [% INCLUDE 'table_settings.inc' %] > <script> > $(document).ready(function() { > $('#icons').tabs(); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >index 042495a426..14f476417e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >@@ -1279,7 +1279,7 @@ Note that permanent location is a code, and location may be an authval. > [% END %] > [% INCLUDE 'datatables.inc' %] > [% Asset.js("lib/jquery/plugins/jquery.dataTables.columnFilter.js") | $raw %] >- [% INCLUDE 'columns_settings.inc' %] >+ [% INCLUDE 'table_settings.inc' %] > [% Asset.js("js/browser.js") | $raw %] > <script> > var browser; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt >index 4b6de9fd1b..03cfa518b4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt >@@ -128,7 +128,7 @@ > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >-[% INCLUDE 'columns_settings.inc' %] >+[% INCLUDE 'table_settings.inc' %] > <script id="js"> > $(document).ready(function() { > var columns_settings = [% TablesSettings.GetColumns('catalogue', 'detail', 'checkoutshistory-table', 'json') %]; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt >index dab81daee5..bbaf96750e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt >@@ -13,7 +13,7 @@ > </script> > [% 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' %] > <script> > function clone_parent(node) { > var parent = node.parentNode; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt >index b3c30b33dd..d972a0399e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt >@@ -293,7 +293,7 @@ > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'calendar.inc' %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] >+ [% INCLUDE 'table_settings.inc' %] > <script> > $(document).ready(function() { > var columns_settings = [% TablesSettings.GetColumns('circ', 'holds', 'holds-to-pull', 'json') | $raw %]; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >index c5249dfa17..19582aa2b0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >@@ -191,7 +191,7 @@ > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'calendar.inc' %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] >+ [% INCLUDE 'table_settings.inc' %] > <script> > var columns_settings = [% TablesSettings.GetColumns( 'circ', 'holdsratios', 'holds-ratios', 'json' ) | $raw %]; > $(document).ready(function() { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >index 6c8eab60e0..648bae3a2a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >@@ -981,7 +981,7 @@ > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] >+ [% INCLUDE 'table_settings.inc' %] > [% INCLUDE 'calendar.inc' %] > [% Asset.js("lib/jquery/plugins/jquery-ui-timepicker-addon.min.js") | $raw %] > [% Asset.js("js/pages/circulation.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt >index 10c36a1e9d..d013902910 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt >@@ -232,7 +232,7 @@ > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] >+ [% INCLUDE 'table_settings.inc' %] > <script> > $(document).ready(function() { > var holdst; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >index 6c44a5334f..488522a31c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >@@ -130,7 +130,7 @@ > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] >+ [% INCLUDE 'table_settings.inc' %] > <script> > var holdst_columns_settings = [% TablesSettings.GetColumns( 'circ', 'holds_awaiting_pickup', 'holdst', 'json' ) | $raw %]; > var holdso_columns_settings = [% TablesSettings.GetColumns( 'circ', 'holds_awaiting_pickup', 'holdso', 'json' ) | $raw %]; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt >index 48815ed552..0d42245e55 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt >@@ -284,7 +284,7 @@ > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] >+ [% INCLUDE 'table_settings.inc' %] > <script> > var columns_settings = [% TablesSettings.GetColumns( 'coursereserves', 'reserves', 'course_reserves_table', 'json' ) | $raw %]; > $(document).ready(function(){ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt >index dc8705c345..695268f721 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt >@@ -89,7 +89,7 @@ > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] >+ [% INCLUDE 'table_settings.inc' %] > <script> > var columns_settings = [% TablesSettings.GetColumns( 'coursereserves', 'courses', 'course_reserves_table', 'json' ) | $raw %]; > $(document).ready(function() { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt >index ee04c25d70..273f03f45b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt >@@ -832,7 +832,7 @@ > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] >+ [% INCLUDE 'table_settings.inc' %] > [% INCLUDE 'calendar.inc' %] > [% Asset.js("lib/jquery/plugins/jquery-ui-timepicker-addon.min.js") | $raw %] > <script> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >index 58682f35d9..4330c85782 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >@@ -337,7 +337,7 @@ > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] >+ [% INCLUDE 'table_settings.inc' %] > [% INCLUDE 'str/members-menu.inc' %] > [% Asset.js("js/members-menu.js") | $raw %] > <script> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt >index bd2aad334f..0fd04d3851 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt >@@ -132,7 +132,7 @@ > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] >+ [% INCLUDE 'table_settings.inc' %] > [% INCLUDE 'str/members-menu.inc' %] > [% Asset.js("js/members-menu.js") | $raw %] > <script> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt >index ea250e2397..15a89f5524 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt >@@ -54,7 +54,7 @@ > [% INCLUDE 'str/members-menu.inc' %] > [% Asset.js("js/members-menu.js") | $raw %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] >+ [% INCLUDE 'table_settings.inc' %] > [% INCLUDE 'calendar.inc' %] > <script> > var prefilters = '[% prefilters | html %]'; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt >index bef874d088..0fffd8ea13 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt >@@ -212,7 +212,7 @@ > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] >+ [% INCLUDE 'table_settings.inc' %] > [% INCLUDE 'str/members-menu.inc' %] > [% Asset.js("lib/hc-sticky.js") | $raw %] > [% Asset.js("js/members-menu.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >index 3e86766aff..c16188dcd7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >@@ -929,7 +929,7 @@ > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] > [% Asset.js("lib/jquery/plugins/rowGroup/dataTables.rowGroup.min.js") | $raw %] >- [% INCLUDE 'columns_settings.inc' %] >+ [% INCLUDE 'table_settings.inc' %] > [% INCLUDE 'calendar.inc' %] > [% Asset.js("lib/jquery/plugins/jquery-ui-timepicker-addon.min.js") | $raw %] > [% INCLUDE 'timepicker.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt >index 4bd00a3f08..7d46a7a0cc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt >@@ -187,7 +187,7 @@ > [% INCLUDE 'str/members-menu.inc' %] > [% Asset.js("js/members-menu.js") | $raw %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] >+ [% INCLUDE 'table_settings.inc' %] > <script> > function enableCheckboxActions(){ > // Enable/disable controls if checkboxes are checked >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt >index d51cc435c8..4ea47f00e9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt >@@ -147,7 +147,7 @@ > [% INCLUDE 'str/members-menu.inc' %] > [% Asset.js("js/members-menu.js") | $raw %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] >+ [% INCLUDE 'table_settings.inc' %] > <script id="js"> > $(document).ready(function() { > var columns_settings = [% TablesSettings.GetColumns('members', 'checkouthistory', 'checkouthistory-table', 'json') %]; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt >index 152d64077b..704eeb7c9b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt >@@ -4,7 +4,7 @@ > [% USE TablesSettings %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-[% INCLUDE 'columns_settings.inc' %] >+[% INCLUDE 'table_settings.inc' %] > <title>Koha › Tools › Patron lists › [% list.name | html %] › Add patrons</title> > [% INCLUDE 'doc-head-close.inc' %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt >index c2bfdaf975..826cbd1f82 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt >@@ -195,7 +195,7 @@ > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'format_price.inc' %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] >+ [% INCLUDE 'table_settings.inc' %] > [% Asset.js("lib/jquery/plugins/jquery.jeditable.mini.js") | $raw %] > <script> > function moneyFormat(textObj) { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt >index d1beb7d139..f9429c0dff 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt >@@ -335,7 +335,7 @@ > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'calendar.inc' %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] >+ [% INCLUDE 'table_settings.inc' %] > <script> > function changeRemovedDateTrStatus() { > var Cellvalue = $("input[name='Cellvalue']:checked").val(); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt >index d57cd7e513..1700348a6c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt >@@ -1358,7 +1358,7 @@ > [% INCLUDE 'calendar.inc' %] > [% INCLUDE 'datatables.inc' %] > [% IF ( saved1 ) %] >- [% INCLUDE 'columns_settings.inc' %] >+ [% INCLUDE 'table_settings.inc' %] > [% END %] > [% Asset.js( "lib/codemirror/codemirror.min.js" ) | $raw %] > [% Asset.js( "lib/codemirror/overlay.min.js" ) | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt >index c97828983b..e1a37afb6a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt >@@ -207,7 +207,7 @@ > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] > [% Asset.js("lib/jquery/plugins/jquery.dataTables.columnFilter.js") | $raw %] >- [% INCLUDE 'columns_settings.inc' %] >+ [% INCLUDE 'table_settings.inc' %] > <script> > $(document).ready(function() { > var columns_settings = [% TablesSettings.GetColumns( 'reports', 'lostitems', 'lostitems-table', 'json' ) | $raw %]; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt >index 37a1f6769f..7b0e6ad266 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt >@@ -169,7 +169,7 @@ > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] >+ [% INCLUDE 'table_settings.inc' %] > <script> > var columns_settings = [% TablesSettings.GetColumns( 'reports', 'orders_by_fund', 'funds-table', 'json' ) | $raw %]; > [% SET table_settings = TablesSettings.GetTableSettings( 'reports', 'orders_by_fund', 'funds-table' ) %]; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >index 963889cc68..a169af7360 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >@@ -1011,7 +1011,7 @@ > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] > [% INCLUDE 'calendar.inc' %] >- [% INCLUDE 'columns_settings.inc' %] >+ [% INCLUDE 'table_settings.inc' %] > [% Asset.js("lib/hc-sticky.js") | $raw %] > [% Asset.js("js/circ-patron-search-results.js") | $raw %] > [% INCLUDE 'select2.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt >index 361fdb671f..e1cdf4968e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt >@@ -516,7 +516,7 @@ > [% Asset.js("js/mana.js") | $raw %] > [% INCLUDE 'datatables.inc' %] > [% Asset.js("lib/jquery/plugins/treetable/jquery.treetable.js") | $raw %] >- [% INCLUDE 'columns_settings.inc' %] >+ [% INCLUDE 'table_settings.inc' %] > <script> > // the english words used in display purposes > var text = new Array(_("Number"),_("Volume"),_("Issue"),_("Month"),_("Week"),_("Starting with:"),_("Rollover at:"),_("Choose Hemisphere:"),_("Northern"),_("Southern", >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >index d2d044b4f7..467a0b709b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >@@ -1294,7 +1294,7 @@ > [% END %] > [% IF op == 'else' %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] >+ [% INCLUDE 'table_settings.inc' %] > <script> > $(document).ready(function() { > $('#suggestiontabs').tabs(); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt >index ba2a5f426a..a1476602c3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt >@@ -592,7 +592,7 @@ > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/tools-menu.js") | $raw %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] >+ [% INCLUDE 'table_settings.inc' %] > [% Asset.js("lib/hc-sticky.js") | $raw %] > [% Asset.js("lib/jquery/plugins/jquery.insertatcaret.js") | $raw %] > <script> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt >index 4092ea492b..87dc9bdc06 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt >@@ -612,7 +612,7 @@ > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/tools-menu.js") | $raw %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] >+ [% INCLUDE 'table_settings.inc' %] > [% Asset.js("js/pages/stockrotation.js") | $raw %] > <script> > var stock_rotation_items_columns_settings = [% TablesSettings.GetColumns( 'tools', 'stockrotation', 'stock_rotation_manage_items', 'json' ) | $raw %]; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt >index 847940f628..cb74d0a544 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt >@@ -271,7 +271,7 @@ > [% Asset.js("js/tools-menu.js") | $raw %] > [% INCLUDE 'datatables.inc' %] > [% Asset.js("js/file-upload.js") | $raw %] >- [% INCLUDE 'columns_settings.inc' %] >+ [% INCLUDE 'table_settings.inc' %] > <script> > function StartUpload() { > if( $('#fileToUpload').prop('files').length == 0 ) return; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt >index 97862f674b..b86faf8013 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt >@@ -430,7 +430,7 @@ > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'calendar.inc' %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] >+ [% INCLUDE 'table_settings.inc' %] > [% Asset.js("lib/jquery/plugins/humanmsg.js") | $raw %] > [% Asset.js("js/tools-menu.js") | $raw %] > [% Asset.js("lib/hc-sticky.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/js/tablesettings.js b/koha-tmpl/intranet-tmpl/prog/js/table_settings.js >similarity index 100% >rename from koha-tmpl/intranet-tmpl/prog/js/tablesettings.js >rename to koha-tmpl/intranet-tmpl/prog/js/table_settings.js >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/table_settings.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/table_settings.inc >new file mode 100644 >index 0000000000..c52a208b96 >--- /dev/null >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/table_settings.inc >@@ -0,0 +1,6 @@ >+[% USE raw %] >+[% USE Asset %] >+[% USE TablesSettings %] >+<!-- table_settings.js --> >+[% Asset.js("js/table_settings.js") | $raw %] >+<!-- / table_settings.js --> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt >index 9b17b5075a..b637e898fd 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt >@@ -117,7 +117,7 @@ > [% INCLUDE 'opac-bottom.inc' %] > [% BLOCK jsinclude %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] >+ [% INCLUDE 'table_settings.inc' %] > <script> > $(document).ready(function() { > columns_settings = [% TablesSettings.GetColumns( 'opac', 'biblio-detail', 'course-items-table', 'json' ) | $raw %]; >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt >index 8d2ba836fb..750e372604 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt >@@ -71,7 +71,7 @@ > [% INCLUDE 'opac-bottom.inc' %] > [% BLOCK jsinclude %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] >+ [% INCLUDE 'table_settings.inc' %] > <script> > $(document).ready(function() { > columns_settings = [% TablesSettings.GetColumns( 'opac', 'biblio-detail', 'course_reserves_table', 'json' ) | $raw %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt >index 224bab3f71..819a4826c0 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt >@@ -1438,7 +1438,7 @@ > > [% BLOCK jsinclude %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] >+ [% INCLUDE 'table_settings.inc' %] > [% INCLUDE greybox.inc %] > [% IF ( OpacStarRatings != 'disable' ) %][% Asset.js("lib/jquery/plugins/jquery.barrating.min.js") | $raw %][% END %] > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdshistory.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdshistory.tt >index 26b9676fa7..9c584e096d 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdshistory.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdshistory.tt >@@ -161,7 +161,7 @@ > [% INCLUDE 'opac-bottom.inc' %] > [% BLOCK jsinclude %] > [% INCLUDE 'datatables.inc' %] >-[% INCLUDE 'columns_settings.inc' %] >+[% INCLUDE 'table_settings.inc' %] > <script> > $(document).ready(function() { > $('#sort').change(function() { >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt >index 324d587d19..4e74f5b840 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt >@@ -204,7 +204,7 @@ > [% INCLUDE 'opac-bottom.inc' %] > [% BLOCK jsinclude %] > [% INCLUDE 'datatables.inc' %] >-[% INCLUDE 'columns_settings.inc' %] >+[% INCLUDE 'table_settings.inc' %] > <script> > $(document).ready(function(){ > [% IF ( GoogleJackets ) %]KOHA.Google.GetCoverFromIsbn();[% END %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/columns_settings.inc b/koha-tmpl/opac-tmpl/bootstrap/js/table_settings.js >similarity index 71% >rename from koha-tmpl/opac-tmpl/bootstrap/en/includes/columns_settings.inc >rename to koha-tmpl/opac-tmpl/bootstrap/js/table_settings.js >index 78935a9d5c..65709a53ee 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/columns_settings.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/js/table_settings.js >@@ -1,61 +1,61 @@ >-[% USE TablesSettings %] >+/* global dataTablesDefaults columnsInit __ */ >+/* exported KohaTable */ > >-<script> > function KohaTable(selector, dt_parameters, columns_settings) { > var id = 0; > var hidden_ids = []; > var included_ids = []; >- $(columns_settings).each( function() { >- var named_id = $( 'thead th[data-colname="' + this.columnname + '"]', selector ).index( selector+' th' ); >+ $(columns_settings).each(function () { >+ var named_id = $('thead th[data-colname="' + this.columnname + '"]', selector).index(selector + ' th'); > > var used_id = dt_parameters.bKohaColumnsUseNames ? named_id : id; >- if ( used_id == -1 ) return; >+ if (used_id == -1) return; > >- if ( this['is_hidden'] == "1" ) { >- hidden_ids.push( used_id ); >+ if (this['is_hidden'] == "1") { >+ hidden_ids.push(used_id); > } >- if ( this['cannot_be_toggled'] == "0" ) { >- included_ids.push( used_id ); >+ if (this['cannot_be_toggled'] == "0") { >+ included_ids.push(used_id); > } > id++; > }); > > // By default we include all visible columns in exports and print unless they have the "noExport" class > var exportColumns = ":visible:not(.noExport)"; >- if( dt_parameters.hasOwnProperty("exportColumns") ){ >+ if (dt_parameters.hasOwnProperty("exportColumns")) { > // A custom buttons configuration has been passed from the page > exportColumns = dt_parameters["exportColumns"]; > } > // Data which has the "noExport" class should not appear in print or export > var export_format = { >- body: function ( data, row, column, node ) { >+ body: function (data, row, column, node) { > var newnode = $(node); > >- if ( newnode.find(".noExport").length > 0 ) { >+ if (newnode.find(".noExport").length > 0) { > newnode = newnode.clone(); > newnode.find(".noExport").remove(); > } > >- return newnode.text().replace( /\n/g, ' ' ).trim(); >+ return newnode.text().replace(/\n/g, ' ').trim(); > } >- } >+ }; > > // Add a "Clear filter" button to table filter form field >- dt_parameters[ "buttons" ] = [ >+ dt_parameters["buttons"] = [ > { > fade: 100, > className: "dt_button_clear_filter", >- titleAttr: _("Clear filter"), >+ titleAttr: __("Clear filter"), > enabled: false, >- text: '<i class="fa fa-lg fa-remove" aria-hidden="true"></i> <span class="dt-button-text">' + _("Clear filter") + '</span>', >- action: function ( e, dt, node, config ) { >- dt.search( "" ).draw("page"); >+ text: '<i class="fa fa-lg fa-remove" aria-hidden="true"></i> <span class="dt-button-text">' + __("Clear filter") + '</span>', >+ action: function (e, dt, node) { >+ dt.search("").draw("page"); > node.addClass("disabled"); > } > }, > { > extend: 'csvHtml5', >- text: _("CSV"), >+ text: __("CSV"), > exportOptions: { > columns: exportColumns, > format: export_format >@@ -63,7 +63,7 @@ function KohaTable(selector, dt_parameters, columns_settings) { > }, > { > extend: 'copyHtml5', >- text: _("Copy"), >+ text: __("Copy"), > exportOptions: { > columns: exportColumns, > format: export_format >@@ -71,7 +71,7 @@ function KohaTable(selector, dt_parameters, columns_settings) { > }, > { > extend: 'print', >- text: _("Print"), >+ text: __("Print"), > exportOptions: { > columns: exportColumns, > format: export_format >@@ -79,15 +79,15 @@ function KohaTable(selector, dt_parameters, columns_settings) { > } > ]; > >- if( included_ids.length > 0 ){ >- dt_parameters[ "buttons" ].push( >+ if (included_ids.length > 0) { >+ dt_parameters["buttons"].push( > { > extend: 'colvis', > fade: 100, > columns: included_ids, > className: "columns_controls", >- titleAttr: _("Columns settings"), >- text: '<i class="fa fa-lg fa-gear" aria-hidden="true"></i> <span class="dt-button-text">' + _("Columns") + '</span>', >+ titleAttr: __("Columns settings"), >+ text: '<i class="fa fa-lg fa-gear" aria-hidden="true"></i> <span class="dt-button-text">' + __("Columns") + '</span>', > exportOptions: { > columns: exportColumns > } >@@ -96,7 +96,7 @@ function KohaTable(selector, dt_parameters, columns_settings) { > } > > var table = $(selector); >- var new_parameters = {} >+ var new_parameters = {}; > $.extend(true, new_parameters, dataTablesDefaults, dt_parameters); > var default_column_defs = [ > { "aTargets": ["string-sort"], "sType": "string" }, >@@ -123,5 +123,3 @@ function KohaTable(selector, dt_parameters, columns_settings) { > > return table; > } >- >-</script> >-- >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 28058
:
119024
|
119163
|
119165
|
119321