From 26297cb99baf60a9233b426319a31a1b753cb3be Mon Sep 17 00:00:00 2001 From: Owen Leonard <oleonard@myacpl.org> Date: Sat, 19 Jan 2013 19:53:50 -0500 Subject: [PATCH] [SIGNED-OFF] Bug 9436 [Revised] Use DataTables on cities administration page Replace the tablesorter plugin with the DataTables plugin on the cities administration page. To test, open the cities administration page (Administration -> Cities and towns). Confirm that table sorting works correctly. Revision corrects template path to datatables assets. Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Comment: Sorting works. No errors. --- .../intranet-tmpl/prog/en/modules/admin/cities.tt | 24 ++++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt index 65de2be..6fe40f9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt @@ -1,15 +1,10 @@ [% INCLUDE 'doc-head-open.inc' %] <title>Koha › Administration › [% IF ( add_form ) %]Cities › [% IF ( cityid ) %] Modify city[% ELSE %] New city[% END %][% ELSE %][% IF ( delete_confirm ) %]Cities › Confirm deletion of city[% ELSE %] Cities[% END %][% 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() { - $.tablesorter.defaults.widgets = ['zebra']; - $("#table_cities").tablesorter({ - sortList: [[1,0]], - headers: { 5: { sorter: false},6: { sorter: false}} - }).tablesorterPager({container: $("#pagertable_cities"),positionFixed: false,size: 20}); -}); </script> +<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> +<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script> +[% INCLUDE 'datatables-strings.inc' %] +<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script> <script type="text/javascript"> //<![CDATA[ function Check(f) { @@ -19,6 +14,16 @@ document.Aform.submit(); } } + $(document).ready(function() { + new YAHOO.widget.Button("newcity"); + $("#table_cities").dataTable($.extend(true, {}, dataTablesDefaults, { + "aoColumnDefs": [ + { "aTargets": [ -1, -2 ], "bSortable": false, "bSearchable": false }, + ], + "aaSorting": [[ 1, "asc" ]], + "iDisplayLength": 10 + })); + }); //]]> </script> </head> @@ -126,7 +131,6 @@ [% IF ( loop ) %] <div id="pagertable_cities"> -[% INCLUDE 'table-pager.inc' perpage='20' %] </div> <table id="table_cities"> <thead> -- 1.7.9.5