From f9126608a34a75cce0fb27af56a2703fe9399d20 Mon Sep 17 00:00:00 2001 From: Owen Leonard <oleonard@myacpl.org> Date: Tue, 22 Jan 2013 11:00:13 -0500 Subject: [PATCH] Bug 9443 - Use DataTables on MARC frameworks administration page Content-Type: text/plain; charset="utf-8" Replace the tablesorter plugin with the DataTables plugin on the MARC frameworks administration page. To test, open the MARC frameworks dministration page (Administration -> MARC bibliographic framework -> MARC structure). 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/marctagstructure.tt | 24 ++++++++++++-------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt index 8886fcf..7e9c165 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt @@ -5,14 +5,10 @@ [% IF ( delete_confirmed ) %]MARC frameworks › Data deleted[% END %] [% IF ( else ) %]MARC frameworks[% 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() { - $("#table_marctagstructure").tablesorter({ - sortList: [[0,0]], - headers: { 5: { sorter: false},6: { sorter: false},7: { sorter: false}} - }).tablesorterPager({container: $("#pagertable_marctagstructure"),positionFixed: false,size: 20}); -}); </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[ function Check(f) { @@ -30,6 +26,17 @@ function Check(f) { alert(alertString2); } } +$(document).ready(function() { + new YAHOO.widget.Button("addtag"); + $("#table_marctagstructure").dataTable($.extend(true, {}, dataTablesDefaults, { + "aoColumnDefs": [ + { "aTargets": [ -1, -2, -3 ], "bSortable": false, "bSearchable": false }, + ], + "aLengthMenu": [[10, 20, 50, 100, -1], [10, 20, 50, 100, "All"]], + "iDisplayLength": 20, + "sPaginationType": "four_button" + })); +}); //]]> </script> </head> @@ -153,7 +160,6 @@ function Check(f) { </fieldset> </form> <div id="pagertable_marctagstructure"> -[% INCLUDE 'table-pager.inc' perpage='20' %] </div> <table id="table_marctagstructure"> <thead> -- 1.7.9.5