From b1d3464b324e95fcafd612a4162d26ea16f9d61a Mon Sep 17 00:00:00 2001 From: Owen Leonard <oleonard@myacpl.org> Date: Sat, 19 Jan 2013 19:00:34 -0500 Subject: [PATCH] Bug 9435 [Revised] Use DataTables on libraries and groups administration page Content-Type: text/plain; charset="utf-8" Replace the tablesorter plugin with the DataTables plugin on the libraries and groups administration page. To test, open the libraries and groups administration page (Administration -> Libraries and groups). Confirm that table sorting works correctly. Revision corrects template path to datatables assets. --- .../prog/en/modules/admin/branches.tt | 21 ++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) 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 7cd4b65..f84f60f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt @@ -11,10 +11,22 @@ [% 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> +<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" src="[% themelang %]/js/tinymce/jscripts/tiny_mce/tiny_mce.js"></script> <script type="text/javascript"> +//<![CDATA[ + $(document).ready(function() { + $("#branchest").dataTable($.extend(true, {}, dataTablesDefaults, { + "aoColumnDefs": [ + { "aTargets": [ -1, -2 ], "bSortable": false, "bSearchable": false }, + ], + "iDisplayLength": 10, + "sPaginationType": "four_button" + })); + }); tinyMCE.init({ mode : "textareas", theme : "advanced", @@ -31,6 +43,7 @@ tinyMCE.init({ height : "300", width : "700" }); +//]]> </script> </head> <body id="admin_branches" class="admin"> @@ -166,7 +179,6 @@ tinyMCE.init({ [% IF ( MESSAGE11 ) %]<div class="dialog message">Library cannot be deleted because there are patrons registered at that library</div>[% END %] [% IF ( branches ) %] <div id="pagerbranchest"> -[% INCLUDE 'table-pager.inc' perpage='10' %] </div> <table id="branchest"> <thead><tr> @@ -176,7 +188,8 @@ tinyMCE.init({ <th>Properties</th> <th>IP</th> <!-- <th>Printer</th> --> - <th colspan="2"> </th> + <th> </th> + <th> </th> </tr></thead><tbody> [% FOREACH branche IN branches %] [% IF ( loop.odd ) %] -- 1.7.9.5