Attachment 16523 Details for Bug 9446 – Bug 9446 [Revised] Use DataTables on Z39.50 servers administration page

[patch] Bug 9446 [Revised] Use DataTables on Z39.50 servers administration page

Bug-9446-Revised-Use-DataTables-on-Z3950-servers-a.patch (text/plain), 3.72 KB, created by Jonathan Druart on 2013-03-20 14:11:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2013-03-20 14:11:19 UTC

Size: 3.72 KB

patch

obsolete

>From dc53a32c9dbde038e04f76c1219d4cfab18e9dd3 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>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
><th> with a colspan.
>
>This patch also moves embedding of the toolbar and table-sorting JS from
>within the body of the page to the <head> 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 <frederic.durand@unilim.fr>
>Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
>---
> .../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 &rsaquo; Z39.50 server added[% END %]
> [% IF ( delete_confirmed ) %]Z39.50 servers &rsaquo; Z39.50 server deleted[% END %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
>-
>+[% IF ( else ) %]
>+<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>
>+[% END %]
> [% IF ( add_form ) %]
> <script type="text/javascript">
> //<![CDATA[
>@@ -65,15 +70,17 @@
> </script>
> [% END %]
> [% IF ( else ) %]
>-    <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
>     <script type="text/javascript">
>     //<![CDATA[
>      $(document).ready(function() {
>-        [% IF ( loop ) %]$.tablesorter.defaults.widgets = ['zebra'];
>-        $("#serverst").tablesorter({
>-            sortList: [[0,0]],
>-            headers: { 2: {sorter:false},3: { sorter: false },4: { sorter: false },7: { sorter: false },8: { sorter: false },9: { sorter: false },10: { sorter: false }}
>-        });[% END %]
>+        [% IF ( loop ) %]$("#serverst").dataTable($.extend(true, {}, dataTablesDefaults, {
>+            "aoColumnDefs": [
>+                { "aTargets": [ 2,3,4,7,8,9,10,11 ], "bSortable": false, "bSearchable": false },
>+            ],
>+            "iDisplayLength": 20,
>+            "aLengthMenu": [[10, 20, 50, 100, -1], [10, 20, 50, 100, "All"]],
>+            "sPaginationType": "four_button"
>+        }));[% END %]
>      });
>     //]]>
>     </script>
>@@ -284,7 +291,7 @@
>                 You searched for [% searchfield %]
>         [% END %]		
> <table id="serverst">
>-                <thead><tr><th>Target</th><th>Hostname/Port</th><th>Database</th><th>Userid</th><th>Password</th><th>Checked</th><th>Rank</th>       			<th>Syntax</th><th>Encoding</th><th>Timeout</th><th colspan="2">&nbsp;</th>
>+                <thead><tr><th>Target</th><th>Hostname/Port</th><th>Database</th><th>Userid</th><th>Password</th><th>Checked</th><th>Rank</th><th>Syntax</th><th>Encoding</th><th>Timeout</th><th>&nbsp;</th><th>&nbsp;</th>
>                 </tr></thead>
>                 <tbody>[% FOREACH loo IN loop %]
>                 [% UNLESS ( loop.odd ) %]
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 9446: 14756 | 14772 | 15701 | 15745 | 15884 | 16097 | 16506 | 16523