From 73b466e011425dd52df73feb3461d6292e215d9f Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 22 Jan 2013 12:17:55 -0500 Subject: [PATCH] [SIGNED-OFF] Bug 9444 [Revised] Use DataTables in system preferences editor Replace the tablesorter plugin with the DataTables plugin in the "new" system preferences editor. To test, open the system preferences editor on any tab other than Local Use. Confirm that table sorting works correctly within each section. In this configuration there should be no pager and no results filtering. Revision corrects template path to datatables assets. Signed-off-by: Bernardo Gonzalez Kriegel Comment: Sorting works. No errors. --- .../intranet-tmpl/prog/en/js/pages/preferences.js | 11 +++++++---- .../prog/en/modules/admin/preferences.tt | 5 ++++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/pages/preferences.js b/koha-tmpl/intranet-tmpl/prog/en/js/pages/preferences.js index 4d793a1..57f8dd3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/js/pages/preferences.js +++ b/koha-tmpl/intranet-tmpl/prog/en/js/pages/preferences.js @@ -1,8 +1,11 @@ $(document).ready(function() { - $("table.preferences").tablesorter({ - sortList: [[0,0]], - headers: { 1: { sorter:false}} - }); + $("table.preferences").dataTable($.extend(true, {}, dataTablesDefaults, { + "sDom": 't', + "aoColumnDefs": [ + { "aTargets": [ -1 ], "bSortable": false, "bSearchable": false } + ], + "bPaginate": false + })); }); // We can assume 'KOHA' exists, as we depend on KOHA.AJAX diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt index 5b20399..ebb9d8c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt @@ -1,7 +1,10 @@ [% INCLUDE 'doc-head-open.inc' %] Koha › Administration › System preferences [% INCLUDE 'doc-head-close.inc' %] - + + +[% INCLUDE 'datatables-strings.inc' %] +