[Koha-cvs] koha opac/opac-user.pl koha-tmpl/opac-tmpl/npl/... [dev_week]

[Chris Cormack]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         dev_week
Changes by:     Chris Cormack <rangi>   07/06/12 00:37:10

Modified files:
        opac           : opac-user.pl 
        koha-tmpl/opac-tmpl/npl/en: opac-user.tmpl 

Log message:
        Fix for weird error that crops up with HTML::Template version 2.9

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-user.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.14.2.9.2.5&r2=1.14.2.9.2.6
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-user.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.11.2.8&r2=1.1.2.11.2.9

Patches:
Index: opac/opac-user.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-user.pl,v
retrieving revision 1.14.2.9.2.5
retrieving revision 1.14.2.9.2.6
diff -u -b -r1.14.2.9.2.5 -r1.14.2.9.2.6
--- opac/opac-user.pl   20 Sep 2006 20:22:06 -0000      1.14.2.9.2.5
+++ opac/opac-user.pl   12 Jun 2007 00:37:10 -0000      1.14.2.9.2.6
@@ -68,6 +68,10 @@
 my @issuedat;
 foreach my $key (keys %$issues) {
     my $issue = $issues->{$key};
+       #sql date returned as 'yyyy-mm-dd', so numeric sort of stripped string 
will work.
+    $issue->{date_due_sort} = $issue->{date_due} ;
+    $issue->{date_due_sort} =~ s/-//g;
+
     $issue->{'date_due'}  = format_date($issue->{'date_due'});
 
     # check for reserves
@@ -107,11 +111,13 @@
     push @issuedat, $issue;
     $count++;
 }
+my @issues_sort = sort { $a->{date_due_sort} <=> $b->{date_due_sort}  }  
@issuedat;
+my @overdues_sort = sort { $a->{date_due_sort} <=> $b->{date_due_sort}  }  
@overdues;
 
-$template->param(ISSUES => address@hidden);
+$template->param(ISSUES => address@hidden);
 $template->param(issues_count => $count);
 
-$template->param(OVERDUES => address@hidden);
+$template->param(OVERDUES => address@hidden);
 $template->param(overdues_count => $overdues_count);
 
 my $branches = getbranches();
@@ -126,7 +132,7 @@
     $res->{'branch'} = $branches->{$res->{'branchcode'}}->{'branchname'};
 }
 
-$template->param(RESERVES => $reserves);
+$template->param(RESERVE => $reserves);
 $template->param(reserves_count => $rcount);
 
 my @waiting;
@@ -135,6 +141,7 @@
     if ($res->{'itemnumber'}) {
        my $item = getiteminformation('',$res->{'itemnumber'},'');
        $res->{'ccode'} = $item->{'ccode'};
+       $res->{'itype'} = $item->{'itype'};
        $res->{'holdingbranch'} = 
$branches->{$item->{'holdingbranch'}}->{'branchname'};
        $res->{'branch'} = $branches->{$res->{'branchcode'}}->{'branchname'};
        if($res->{'holdingbranch'} eq $res->{'branch'}){
@@ -159,7 +166,7 @@
                $template->param(showreserves => 1);
        }
 
-$template->param(WAITING => address@hidden);
+$template->param(WAITINGRESERVES => address@hidden);
 $template->param(waiting_count => $wcount,
                                textmessaging => $borr->{textmessaging},
                                opaclargeimage => 
C4::Context->preference("opaclargeimage"),

Index: koha-tmpl/opac-tmpl/npl/en/opac-user.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/Attic/opac-user.tmpl,v
retrieving revision 1.1.2.11.2.8
retrieving revision 1.1.2.11.2.9
diff -u -b -r1.1.2.11.2.8 -r1.1.2.11.2.9
--- koha-tmpl/opac-tmpl/npl/en/opac-user.tmpl   26 Sep 2006 20:22:31 -0000      
1.1.2.11.2.8
+++ koha-tmpl/opac-tmpl/npl/en/opac-user.tmpl   12 Jun 2007 00:37:10 -0000      
1.1.2.11.2.9
@@ -54,9 +54,9 @@
                        <th>Reserve date</th>
                        <th>Pick Up Branch</th>
                </tr>
-               <!-- TMPL_LOOP NAME="WAITING" -->
+               <!-- TMPL_LOOP NAME="WAITINGRESERVES" -->
                        <!-- TMPL_IF NAME="atdestination" --><tr>
-                       <td><img src="<!-- TMPL_VAR NAME="themelang" 
-->/images/<!-- TMPL_VAR NAME="ccode" -->.gif" alt="<!-- TMPL_VAR NAME="ccode" 
-->" title="<!-- TMPL_VAR NAME="ccode" -->" /></td>
+                       <td><img src="<!-- TMPL_VAR NAME="themelang" 
-->/images/<!-- TMPL_VAR NAME="itype" -->.gif" alt="<!-- TMPL_VAR NAME="itype" 
-->" title="<!-- TMPL_VAR NAME="itype" -->" /></td>
                                <td>
                                        <a href="opac-detail.pl?bib=<!-- 
TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="btitle" --></a><span 
class="item-details">
 <!-- TMPL_VAR NAME="author" --></span></td><td><!-- TMPL_VAR 
NAME="reservedate" --></td><td><!-- TMPL_IF NAME="atdestination" -->
@@ -83,7 +83,7 @@
 
 <!-- TMPL_LOOP NAME="OVERDUES" -->
 <tr>
-<td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR 
NAME="ccode" -->.gif" alt="<!-- TMPL_VAR NAME="ccode" -->" title="<!-- TMPL_VAR 
NAME="ccode" -->" /></td>
+<td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR 
NAME="itype" -->.gif" alt="<!-- TMPL_VAR NAME="itype" -->" title="<!-- TMPL_VAR 
NAME="itype" -->" /></td>
 <td><!-- TMPL_IF NAME="AmazonContent" --><!-- TMPL_IF NAME="isbn" --><a 
href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" 
ESCAPE="URL" -->"><img src="http://images.amazon.com/images/P/<!-- TMPL_VAR 
name="isbn" -->.01.THUMBZZZ.jpg" alt="Book Cover Image" class="thumbnail" 
/></a><!-- /TMPL_IF --><!-- /TMPL_IF --> <a 
href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" 
-->"><!-- TMPL_VAR NAME="title" --></a><span class="item-details">
 <!-- TMPL_VAR NAME="author" --></span></td>
 <td><!-- TMPL_VAR NAME="classification" --></td>
@@ -115,7 +115,7 @@
 <!-- TMPL_LOOP NAME="ISSUES" -->
 
 <!-- TMPL_IF NAME="overdue" --><tr class="overdue"><!-- TMPL_ELSE --><tr><!-- 
/TMPL_IF -->
-<td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR 
NAME="ccode" -->.gif" alt="<!-- TMPL_VAR NAME="ccode" -->" title="<!-- TMPL_VAR 
NAME="ccode" -->" /></td>
+<td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR 
NAME="itype" -->.gif" alt="<!-- TMPL_VAR NAME="itype" -->" title="<!-- TMPL_VAR 
NAME="itype" -->" /></td>
 <td><!-- TMPL_IF NAME="AmazonContent" --><!-- TMPL_IF NAME="isbn" --><a 
href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" 
ESCAPE="URL" -->"><img src="http://images.amazon.com/images/P/<!-- TMPL_VAR 
name="isbn" -->.01.THUMBZZZ.jpg" alt="Book Cover Image" class="thumbnail" 
/></a><!-- /TMPL_IF --><!-- /TMPL_IF --><a 
href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" 
-->"><!-- TMPL_VAR NAME="title" --></a><span class="item-details">
 <!-- TMPL_VAR NAME="author" --></span></td>
 <td><!-- TMPL_VAR NAME="classification" --></td>
@@ -138,21 +138,23 @@
 
 <!-- TMPL_IF NAME="reserves_count" -->
 <div id="reserves"<!-- TMPL_IF name="showreserves" --> 
style="display:block;"<!-- TMPL_ELSE --> style="display:none;"<!-- /TMPL_IF -->>
-<!-- TMPL_IF NAME="RESERVES" --><table>
+<!-- TMPL_IF NAME="RESERVE" --><table>
 <caption>Reserves <span class="count">(<!-- TMPL_VAR NAME="reserves_count" --> 
total)</span></caption>
 <!-- RESERVES TABLE ROWS -->
 <tr>
 <th>Title</th>
 <th>Placed On</th>
 <th>Pick Up Location</th>
+<th>Place in Queue</th>
 <th>Status</th>
 </tr>
-<!-- TMPL_LOOP NAME="RESERVES" -->
+<!-- TMPL_LOOP NAME="RESERVE" -->
 <tr>
 <td><a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR 
NAME="biblionumber" -->"><!-- TMPL_VAR NAME="btitle" --></a><span 
class="item-details">
 <!-- TMPL_VAR NAME="author" --></span></td>
 <td><!-- TMPL_VAR NAME="reservedate" --></td>
 <td><!-- TMPL_VAR Name="branch" --></td>
+<td><!-- TMPL_VAR NAME="priority" --></td>
 <td><!-- TMPL_IF NAME="atdestination" -->
                                <strong>Waiting</strong> at <!-- TMPL_VAR 
Name="branch" --><!-- TMPL_ELSE --><!-- TMPL_IF NAME="holdingbranch" -->In 
transit from <!-- TMPL_VAR NAME="holdingbranch" --> to <!-- TMPL_VAR 
Name="branch" --><!-- TMPL_ELSE -->Pending<!-- /TMPL_IF --><!-- /TMPL_IF 
--></td>
 </tr>