Attachment 1289 Details for Bug 3414 – Proposed patch

[patch] Proposed patch

0003-Bug-3414-Cleanup-and-xhthml-correction-of-parcels.t.patch (text/plain), 5.18 KB, created by Chris Cormack on 2009-07-11 20:43:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Cormack

Created: 2009-07-11 20:43:00 UTC

Size: 5.18 KB

patch

obsolete

>From 8f2c3333b230cb7ff4b3a0c9943e273ff108540b Mon Sep 17 00:00:00 2001
>From: Garry Collum <gcollum@gmail.com>
>Date: Sat, 11 Jul 2009 16:46:28 -0400
>Subject: [PATCH] Bug 3414: Cleanup and xhthml correction of parcels.tmpl
>Content-Type: text/plain; charset="utf-8"
>
>Fixes several xhtml in parcels.tmpl and enables highlighting within its data table.  Removes unnecessary variable from parcels.pl.
>---
> acqui/parcels.pl                                   |    3 --
> .../prog/en/modules/acqui/parcels.tmpl             |   24 ++++++++++---------
> 2 files changed, 13 insertions(+), 14 deletions(-)
>
>diff --git a/acqui/parcels.pl b/acqui/parcels.pl
>index 30dc0a6..349be36 100755
>--- a/acqui/parcels.pl
>+++ b/acqui/parcels.pl
>@@ -133,7 +133,6 @@ if ($count>$resultsperpage){
> }
> my @loopres;
> 
>-my $hilighted=0;
> for (my $i=$startfrom;$i<=($startfrom+$resultsperpage-1<$count-1?$startfrom+$resultsperpage-1:$count-1);$i++){
> 
>     my %cell;
>@@ -146,8 +145,6 @@ for (my $i=$startfrom;$i<=($startfrom+$resultsperpage-1<$count-1?$startfrom+$res
>     $cell{bibcount}=$results[$i]->{biblio};
>     $cell{reccount}=$results[$i]->{itemsreceived};
>     $cell{itemcount}=$results[$i]->{itemsexpected};
>-    $cell{hilighted} = $hilighted%2;
>-    $hilighted++;
>     push @loopres, \%cell;
> }
> $template->param(searchresults=>\@loopres, count=>$count) if ($count);
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl
>index 09f8744..e839063 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl
>@@ -42,16 +42,16 @@
>     <table class="small">
>         <tr>
>             <th> <input type="hidden" name="supplierid" value="" /></th>
>-            <th><label for="filter">Invoice / Code:</label><input type="text" size="20" name="filter" value="" /></th>
>+            <th><label for="filter">Invoice / Code:</label><input type="text" size="20" name="filter" id="filter" value="" /></th>
>             <th><label for="datefrom">From:</label><input type="text" size="9" id="datefrom" name="datefrom" value="" /> 
>-                <p><label for="dateto">To:</label><input type="text" size="9" id="dateto" name="dateto" value="" /></th>
>+                <p><label for="dateto">To:</label><input type="text" size="9" id="dateto" name="dateto" value="" /></p></th>
>             <th><label for="orderby">Sort by :</label><select name="orderby" id="orderby">
>                 <option value="aqorders.booksellerinvoicenumber"> Code</option>
>                 <option value="datereceived"> Date Received</option>
>                 <option value="datereceived desc"> Date Received reverse</option>
>                 <option value="aqorders.booksellerinvoicenumber desc"> Code reverse</option>
>                 </select><br />
>-                <label for="resultsperpage">Results per page :</label><select name="resultsperpage" value ="" id="resultsperpage">
>+                <label for="resultsperpage">Results per page :</label><select name="resultsperpage" id="resultsperpage">
>                 <option value="20">20</option>
>                 <option value="30">30</option>
>                 <option value="50">50</option>
>@@ -71,27 +71,29 @@
>         </tr>
> 
> 
>+    
>+    <tr class="highlight">
>+    
>     <tr>
>-        <td class="hilighted"><td>
>+    
>+        <td>
>             
>         </td>
>-        <td class="hilighted number"><td class="number">
>-        
>+        <td>
>             <a href="/cgi-bin/koha/acqui/parcel.pl?type=intra&amp;supplierid=&amp;datereceived=&amp;invoice=">
>                 
>             </a>
>         </td>
>-        <td class="hilighted number"><td class="number">
>+        <td>
>             
>         </td>
>-        <td class="hilighted number"><td class="number">
>-        
>+        <td>
>              
>         </td>
>-        <td class="hilighted number"><td class="number">
>+        <td>
>             
>         </td>
>-        <td class="hilighted number"><td class="number">
>+        <td>
>             
>         </td>
>     </tr>
>-- 
>1.5.6.5
>

Actions: View | Diff | Splinter Review

Attachments on bug 3414: 1289