[Koha-patches] [PATCH] Bug 3414: Cleanup and xhthml correction of parcels.tmpl
Garry Collum
gcollum at gmail.com
Sat Jul 11 22:49:11 CEST 2009
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="<!-- TMPL_VAR NAME="supplierid" -->" /></th>
- <th><label for="filter">Invoice / Code:</label><input type="text" size="20" name="filter" value="<!-- TMPL_VAR NAME="filter" -->" /></th>
+ <th><label for="filter">Invoice / Code:</label><input type="text" size="20" name="filter" id="filter" value="<!-- TMPL_VAR NAME="filter" -->" /></th>
<th><label for="datefrom">From:</label><input type="text" size="9" id="datefrom" name="datefrom" value="<!-- TMPL_VAR NAME="datefrom" -->" />
- <p><label for="dateto">To:</label><input type="text" size="9" id="dateto" name="dateto" value="<!-- TMPL_VAR NAME="dateto" -->" /></th>
+ <p><label for="dateto">To:</label><input type="text" size="9" id="dateto" name="dateto" value="<!-- TMPL_VAR NAME="dateto" -->" /></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 ="<!--TMPL_VAR Name="resultsperpage"-->" 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>
<!-- Actual Search Results -->
<!-- TMPL_LOOP NAME="searchresults" -->
+ <!-- TMPL_UNLESS NAME="__odd__" -->
+ <tr class="highlight">
+ <!-- TMPL_ELSE -->
<tr>
- <!-- TMPL_IF NAME="hilighted" --><td class="hilighted"><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
+ <!-- /TMPL_UNLESS -->
+ <td>
<!-- TMPL_VAR NAME="number" -->
</td>
- <!-- TMPL_IF NAME="hilighted" --><td class="hilighted number"><!-- TMPL_ELSE --><td class="number">
- <!-- /TMPL_IF -->
+ <td>
<a href="/cgi-bin/koha/acqui/parcel.pl?type=intra&supplierid=<!-- TMPL_VAR NAME="supplierid" ESCAPE="URL" -->&datereceived=<!-- TMPL_VAR NAME="raw_datereceived" ESCAPE="URL" --><!--TMPL_IF Name="code"-->&invoice=<!--TMPL_VAR Name="code" ESCAPE="URL" --><!--/TMPL_IF-->">
<!-- TMPL_VAR NAME="datereceived" -->
</a>
</td>
- <!-- TMPL_IF NAME="hilighted" --><td class="hilighted number"><!-- TMPL_ELSE --><td class="number"><!-- /TMPL_IF -->
+ <td>
<!--TMPL_IF Name="code"--><!--TMPL_VAR Name="code" --><!--/TMPL_IF-->
</td>
- <!-- TMPL_IF NAME="hilighted" --><td class="hilighted number"><!-- TMPL_ELSE --><td class="number">
- <!-- /TMPL_IF -->
+ <td>
<!-- TMPL_VAR NAME="reccount" -->
</td>
- <!-- TMPL_IF NAME="hilighted" --><td class="hilighted number"><!-- TMPL_ELSE --><td class="number"><!-- /TMPL_IF -->
+ <td>
<!-- TMPL_VAR NAME="bibcount" -->
</td>
- <!-- TMPL_IF NAME="hilighted" --><td class="hilighted number"><!-- TMPL_ELSE --><td class="number"><!-- /TMPL_IF -->
+ <td>
<!-- TMPL_VAR NAME="itemcount" -->
</td>
</tr>
--
1.5.6.5
More information about the Koha-patches
mailing list