From 70f5774bb997d740c64ac9abd9809050df989e44 Mon Sep 17 00:00:00 2001 From: Owen Leonard <oleonard@myacpl.org> Date: Sat, 19 Jan 2013 20:13:33 -0500 Subject: [PATCH] Bug 9437 - Use DataTables on itemtypes administration page Replace the tablesorter plugin with the DataTables plugin on the itemtypes administration page. To test, open the itemtypes administration page (Administration -> Item types). Confirm that table sorting works correctly. Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Amended patch: Add the "All" entry. --- .../prog/en/modules/admin/itemtypes.tt | 23 ++++++++++---------- 1 file changed, 12 insertions(+), 11 deletions(-) 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 30a3a85..94a32da 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt @@ -18,16 +18,10 @@ Data deleted [% END %] </title> [% INCLUDE 'doc-head-close.inc' %] -<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> -<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.pager.js"></script> -<script type="text/javascript" id="js">$(document).ready(function() { - // call the tablesorter plugin - $("#table_item_type").tablesorter({ - sortList: [[1,0]], - headers: { 0: { sorter: false},5: { sorter: false}} - }).tablesorterPager({container: $("#pagertable_item_type"),positionFixed: false,size: 10}); - -}); </script> +<link rel="stylesheet" type="text/css" href="/intranet-tmpl/prog/en/css/datatables.css" /> +<script type="text/javascript" src="/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.dataTables.min.js"></script> +[% INCLUDE 'datatables-strings.inc' %] +<script type="text/javascript" src="/intranet-tmpl/prog/en/js/datatables.js"></script> <script type="text/javascript"> //<![CDATA[ @@ -86,6 +80,14 @@ function Check(f) { } $(document).ready(function() { $('#icons').tabs(); + $("#table_item_type").dataTable($.extend(true, {}, dataTablesDefaults, { + "aoColumnDefs": [ + { "aTargets": [ -1 ], "bSortable": false, "bSearchable": false }, + ], + "aLengthMenu": [[10, 25, 50, 100, -1], [10, 25, 50, 100, "All"]], + "aaSorting": [[ 2, "asc" ]], + "iDisplayLength": 10 + })); }); //]]> </script> @@ -291,7 +293,6 @@ Item types administration [% IF ( else ) %] <h2>Item types administration</h2> [% IF ( loop ) %]<div id="pagertable_item_type"> -[% INCLUDE 'table-pager.inc' perpage='10' %] </div> <table id="table_item_type"> <thead> -- 1.7.10.4