From dc53a32c9dbde038e04f76c1219d4cfab18e9dd3 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 13 Mar 2013 12:42:01 -0400 Subject: [PATCH] Bug 9446 [Revised] Use DataTables on Z39.50 servers administration page Replace the tablesorter plugin with the DataTables plugin on the Z39.50 servers administration page. Structural changes were made to deal with a DataTables bug which prevents it from properly parsing a with a colspan. This patch also moves embedding of the toolbar and table-sorting JS from within the body of the page to the for sake of consistency. To test, open the Z39.50 servers administration page (Administration -> Z39.50 client targets). Confirm that table sorting works correctly. Revision corrects template path to datatables assets. Further revision fixes conflict with Bug 9647. Signed-off-by: Frederic Durand Signed-off-by: Jonathan Druart --- .../prog/en/modules/admin/z3950servers.tt | 23 +++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt index adf707d..18f92fc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt @@ -5,7 +5,12 @@ [% IF ( add_validate ) %]Z39.50 servers › Z39.50 server added[% END %] [% IF ( delete_confirmed ) %]Z39.50 servers › Z39.50 server deleted[% END %] [% INCLUDE 'doc-head-close.inc' %] - +[% IF ( else ) %] + + +[% INCLUDE 'datatables-strings.inc' %] + +[% END %] [% IF ( add_form ) %] [% END %] [% IF ( else ) %] - @@ -284,7 +291,7 @@ You searched for [% searchfield %] [% END %] - + [% FOREACH loo IN loop %] [% UNLESS ( loop.odd ) %] -- 1.7.10.4
TargetHostname/PortDatabaseUseridPasswordCheckedRank SyntaxEncodingTimeout 
TargetHostname/PortDatabaseUseridPasswordCheckedRankSyntaxEncodingTimeout