Attachment 8057 Details for Bug 5345 – [PASSED_QA][SIGNED-OFF] Bug 5345: DataTables integration in acquisition module [16]

[patch] [PASSED_QA][SIGNED-OFF] Bug 5345: DataTables integration in acquisition module [16]

SIGNED-OFF-Bug-5345-DataTables-integration-in-acqu.patch (text/plain), 4.06 KB, created by Owen Leonard on 2012-03-07 15:32:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2012-03-07 15:32:03 UTC

Size: 4.06 KB

patch

obsolete

>From f5af834a321e9f0955022016bb740eca45903b3e Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@biblibre.com>
>Date: Fri, 17 Feb 2012 16:01:47 +0100
>Subject: [PATCH] [SIGNED-OFF] Bug 5345: DataTables integration in acquisition module [16]
>Content-Type: text/plain; charset="utf-8"
>
>z3950_search.tt
>
>Signed-off-by: Owen Leonard <oleonard@myacpl.org>
>---
> .../prog/en/modules/acqui/z3950_search.tt          |   30 ++++++++++----------
> 1 files changed, 15 insertions(+), 15 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
>index 2449c8e..1d17ffa 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
>@@ -1,20 +1,24 @@
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Koha &rsaquo; Acquisitions &rsaquo; [% IF ( opsearch ) %]Order from external source[% ELSE %]Order from external source &rsaquo; Search results[% END %]</title>
> [% INCLUDE 'greybox.inc' %]
>+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
> [% INCLUDE 'doc-head-close.inc' %]
>+<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 %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
>-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
> <script type="text/javascript">
> //<![CDATA[
>-$.tablesorter.addParser({
>-    id: 'articles',
>-    is: function(s) {return false;  },
>-    format: function(s) { return s.toLowerCase().replace(/^(the|an|a) /,''); },
>-    type: 'text'
>-});
>+    $(document).ready(function(){
>+
>+    var resultst = $("#resultst").dataTable($.extend(true, {}, dataTablesDefaults, {
>+        "aoColumnDefs": [
>+            { "aTargets": [ -1, -2 ], "bSortable": false, "bSearchable": false },
>+        ],
>+        "sPaginationType": "four_button"
>+    } ) );
> 
>-	$(document).ready(function(){
>-    $.tablesorter.defaults.widgets = ['zebra'];
>     $("#CheckAll").click(function(){
>         $(".checkboxed").checkCheckboxes();
>         return false;
>@@ -29,10 +33,6 @@ $.tablesorter.addParser({
>         $("tr").removeClass("selected");
>     });
> 
>-	$("#resultst").tablesorter({
>-		sortList: [[1,0]],
>-		headers: { 1: { sorter: 'articles' },5: { sorter: false },6: { sorter: false }}
>-	});
>         /* Inline edit/delete links */
>         $("td").click(function(event){
>             var $tgt = $(event.target);
>@@ -136,7 +136,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
>         <th>Author</th>
>         <th>ISBN</th>
>         <th>LCCN</th>
>-        <th colspan="2">Preview</th>
>+        <th>Preview</th>
> 		<th>&nbsp;</th>
>     </tr></thead>
>     <tbody>[% FOREACH breeding_loo IN breeding_loop %]
>@@ -148,7 +148,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
>             <td>[% breeding_loo.author %]</td>
>             <td>[% breeding_loo.isbn %]</td>
>             <td>[% breeding_loo.lccn %]</td>
>-            <td><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid %]" title="MARC" rel="gb_page_center[600,500]">MARC</a></td><td><a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% breeding_loo.breedingid %]" title="MARC" rel="gb_page_center[600,500]">Card</a></td>
>+            <td><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid %]" title="MARC" rel="gb_page_center[600,500]">MARC</a> |Â <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% breeding_loo.breedingid %]" title="MARC" rel="gb_page_center[600,500]">Card</a></td>
> 			<td><a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode %]&amp;breedingid=[% breeding_loo.breedingid %]&amp;booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]">Order</a></td>
> 
>         </tr>
>-- 
>1.7.3

Actions: View | Diff | Splinter Review

Attachments on bug 5345: 7719 | 7720 | 7721 | 7722 | 7723 | 7724 | 7725 | 7726 | 7727 | 7728 | 7729 | 7730 | 7731 | 7732 | 7733 | 7734 | 8039 | 8040 | 8057 | 8058 | 8292 | 8830 | 8831 | 8833 | 8834 | 8835 | 8836 | 8837 | 9519 | 9601 | 9602