[Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-user.tmpl,1.1.2.2,1.1.2.3

[Owen Leonard]

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14030/koha-tmpl/opac-tmpl/npl/en

Modified Files:
      Tag: rel_2_2
        opac-user.tmpl 
Log Message:
Updated to show items as waiting only if destination branch matches holding 
branch.  Reserves table is also updated to show 'waiting' if item is at its 
destination branch, or 'in-transit' if item has been allocated but hasn't 
arrived yet.  Copied from HEAD.  Helps fix Bug 670

Index: opac-user.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-user.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** opac-user.tmpl      25 Jan 2005 21:29:01 -0000      1.1.2.2
--- opac-user.tmpl      28 Jan 2005 20:13:54 -0000      1.1.2.3
***************
*** 41,55 ****
                <caption>Reserved Items Waiting</caption>
                <tr>
!                       <th>Title</th>
!                       <th>Author</th>
                        <th>Reserve date</th>
                        <th>Pick Up Branch</th>
                </tr>
                <!-- TMPL_LOOP NAME="WAITING" -->
!                       <tr>
                                <td>
!                                       <b><a href="opac-detail.pl?bib=<!-- 
TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="btitle" 
--></a></b></td><td><!-- TMPL_IF NAME="author" --><!-- TMPL_VAR NAME="author" 
--><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td><td><!-- TMPL_VAR 
NAME="reservedate" --></td><td><b><!-- TMPL_VAR NAME="branch" --> <!-- TMPL_VAR 
NAME="holdingbranch" --></b>
!                               </td>
!                       </tr>
                <!-- /TMPL_LOOP -->
        </table>
--- 41,59 ----
                <caption>Reserved Items Waiting</caption>
                <tr>
!                       <th colspan="2">Title</th>
                        <th>Reserve date</th>
                        <th>Pick Up Branch</th>
                </tr>
                <!-- TMPL_LOOP NAME="WAITING" -->
!                       <!-- TMPL_IF NAME="atdestination" --><tr>
!                       <td><img src="<!-- TMPL_VAR NAME="themelang" 
-->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR 
NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->" /></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" -->
!                               <strong>Waiting</strong> at <!-- TMPL_VAR 
Name="branch" -->
!                               <!-- TMPL_ELSE -->
!                               In transit from <!-- TMPL_VAR 
NAME="holdingbranch" --> to <!-- TMPL_VAR Name="branch" -->
!                               <!-- /TMPL_IF --></td>
!                       </tr><!-- /TMPL_IF -->
                <!-- /TMPL_LOOP -->
        </table>
***************
*** 69,75 ****
  <!-- TMPL_LOOP NAME="OVERDUES" -->
  <tr>
! <td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR 
NAME="itemtype" -->.gif" alt="" /></td>
  <td> <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" --> (<!-- TMPL_VAR NAME="itemtype" 
-->)</span></td>
  <td><!-- TMPL_VAR NAME="date_due" --></td>
  <!-- <td><!-- TMPL_VAR NAME="charges" --></td> -->
--- 73,79 ----
  <!-- TMPL_LOOP NAME="OVERDUES" -->
  <tr>
! <td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR 
NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- 
TMPL_VAR NAME="description" -->" /></td>
  <td> <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="date_due" --></td>
  <!-- <td><!-- TMPL_VAR NAME="charges" --></td> -->
***************
*** 86,89 ****
--- 90,94 ----
  <th>Due</th>
  <!-- <th>Fines</th> -->
+ <!-- <th>Status</th> -->
  </tr>
  
***************
*** 91,99 ****
  
  <tr>
! <td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR 
NAME="itemtype" -->.gif" alt="" /></td>
  <td><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" --> (<!-- TMPL_VAR NAME="itemtype" 
-->)</span></td>
  <td><!-- TMPL_VAR NAME="date_due" --></td>
  <!-- <td><!-- TMPL_IF NAME="charges" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF 
--></td> -->
  </tr>
  <!-- /TMPL_LOOP -->
--- 96,111 ----
  
  <tr>
! <td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR 
NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- 
TMPL_VAR NAME="description" -->" /></td>
  <td><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="date_due" --></td>
  <!-- <td><!-- TMPL_IF NAME="charges" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF 
--></td> -->
+ <!-- <td>
+ <!-- TMPL_IF NAME="status" -->
+ <a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&amp;item=<!-- TMPL_VAR 
NAME="itemnumber" -->&amp;bornum=<!-- TMPL_VAR NAME="borrowernumber" -->" 
class="padded">Renew</a>
+ <!-- TMPL_ELSE -->
+ Not renewable
+ <!-- /TMPL_IF -->
+ </td> -->
  </tr>
  <!-- /TMPL_LOOP -->
***************
*** 113,132 ****
  <!-- RESERVES TABLE ROWS -->
  <tr>
! <th>Title</th>
  <th>Placed On</th>
  <th>Pick Up Location</th>
  <!-- <th>Status</th> -->
  </tr>
  <!-- TMPL_LOOP NAME="RESERVES" -->
  <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" --> <!-- TMPL_IF NAME="itemtype" -->(<!-- 
TMPL_VAR NAME="itemtype" -->)<!-- /TMPL_IF --></span></td>
  <td><!-- TMPL_VAR NAME="reservedate" --></td>
! <td><!-- TMPL_VAR NAME="branch" --></td>
! <!--  --></tr>
  <!-- /TMPL_LOOP -->
  </table></div>
  
! <p>If you no longer want a reserve, please <!-- Display for NPL <a 
href="mailto:address@hidden";>send us an e-mail</a>, or  /Display for NPL -->go 
to the circulation desk at your library to get it removed.</p>
  
  <!-- /TMPL_IF -->
--- 125,148 ----
  <!-- RESERVES TABLE ROWS -->
  <tr>
! <th colspan="2">Title</th>
  <th>Placed On</th>
  <th>Pick Up Location</th>
+ <th>Status</th>
  <!-- <th>Status</th> -->
  </tr>
  <!-- TMPL_LOOP NAME="RESERVES" -->
  <tr>
+ <td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR 
NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- 
TMPL_VAR NAME="description" -->" /></td>
  <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_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 -->&nbsp;<!-- /TMPL_IF --><!-- /TMPL_IF --></td>
! </tr>
  <!-- /TMPL_LOOP -->
  </table></div>
  
! <p>If you no longer want a reserve, please <a 
href="mailto:address@hidden";>send us an e-mail</a>, or go to the circulation 
desk at your library to get it removed.</p>
  
  <!-- /TMPL_IF -->