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

[Owen Leonard]

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

Modified Files:
      Tag: rel_2_2
        opac-user.tmpl 
Log Message:
Fixing bug that caused template to always want to display waiting items, adding 
itemtype to reserves list output

Index: opac-user.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-user.tmpl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -r1.1.2.4 -r1.1.2.5
*** opac-user.tmpl      17 Mar 2005 22:47:37 -0000      1.1.2.4
--- opac-user.tmpl      12 Jul 2005 20:39:37 -0000      1.1.2.5
***************
*** 7,11 ****
  <div id="main">
  <!-- TMPL_LOOP NAME="BORROWER_INFO" -->
! <h2>Welcome <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" 
--></h2>
                <!-- TMPL_IF name="textmessaging"-->
                        <div class="error"><h3>Message from the library</h3>
--- 7,13 ----
  <div id="main">
  <!-- TMPL_LOOP NAME="BORROWER_INFO" -->
! <h2>Welcome <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" 
--> <span class="print">(<a href="/cgi-bin/koha/opac-logout.pl">Click here</a> 
if you're not <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> 
<!-- TMPL_VAR NAME="surname" -->)</span></h2>
! <p>   <!-- Hide from NPL--> <a href="/cgi-bin/koha/opac-account.pl">my 
fines</a> | <!-- Hide from NPL -->
!       <a href="/cgi-bin/koha/opac-userdetails.pl">my personal details</a>     
| <a href="/cgi-bin/koha/opac-readingrecord.pl">my reading history</a>  <!-- 
TMPL_IF name="virtualshelves" --> | <a href="/cgi-bin/koha/opac-shelves.pl" 
class="button">my book lists</a> <!-- /TMPL_IF --><!-- TMPL_IF 
name="suggestion" -->| <a href="/cgi-bin/koha/opac-suggestions.pl">purchase 
suggestions</a><!-- /TMPL_IF --></p>
                <!-- TMPL_IF name="textmessaging"-->
                        <div class="error"><h3>Message from the library</h3>
***************
*** 63,89 ****
  <!-- /TMPL_IF -->
  
- <!-- TMPL_IF NAME="overdues_count" -->
  
- <div class="table"><table>
- <caption>Overdues <span class="count">(<!-- TMPL_VAR NAME="overdues_count" 
--> total)</span></caption>
- <!-- OVERDUES TABLE ROWS -->
- <tr>
- <th colspan="2">Title</th><th>Call No.</th>
- <th>Due</th>
- <!-- <th>Fine to Date</th> -->
- <!-- <th>Status</th> --></tr>
- 
- <!-- 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><!-- Display for NPL // <!-- 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 --> //Display for NPL --> <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>
- <td><!-- TMPL_VAR NAME="date_due" --></td>
- <!-- <td><!-- TMPL_VAR NAME="charges" --></td> -->
- </tr>
- <!-- /TMPL_LOOP -->
- </table></div>
- <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="issues_count" -->
--- 65,69 ----
***************
*** 94,103 ****
  <th>Call No.</th>
  <th>Due</th>
! <!-- Hide from NPL --><th>Fines</th><!-- /Hide from NPL -->
  </tr>
  
  <!-- TMPL_LOOP NAME="ISSUES" -->
  
! <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><!-- Display for NPL // <!-- 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 --> //Display for NPL --><a 
href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" 
-->"><!-- TMPL_VAR NAME="title" --></a><span class="item-details">
--- 74,84 ----
  <th>Call No.</th>
  <th>Due</th>
! <th>Renew</th>
! <th>Fines</th>
  </tr>
  
  <!-- 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="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- 
TMPL_VAR NAME="description" -->" /></td>
  <td><!-- Display for NPL // <!-- 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 --> //Display for NPL --><a 
href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" 
-->"><!-- TMPL_VAR NAME="title" --></a><span class="item-details">
***************
*** 105,109 ****
  <td><!-- TMPL_VAR NAME="classification" --></td>
  <!-- TMPL_IF NAME="overdue" --><td class="overdue"><!-- TMPL_VAR 
NAME="date_due" --></td><!-- TMPL_ELSE --><td><!-- TMPL_VAR NAME="date_due" 
--></td><!-- /TMPL_IF -->
! <!-- Hide from NPL --><td><!-- TMPL_IF NAME="charges" -->Yes<!-- TMPL_ELSE 
-->No<!-- /TMPL_IF --></td><!-- /Hide from NPL -->
  </tr>
  <!-- /TMPL_LOOP -->
--- 86,97 ----
  <td><!-- TMPL_VAR NAME="classification" --></td>
  <!-- TMPL_IF NAME="overdue" --><td class="overdue"><!-- TMPL_VAR 
NAME="date_due" --></td><!-- TMPL_ELSE --><td><!-- TMPL_VAR NAME="date_due" 
--></td><!-- /TMPL_IF -->
! <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" 
-->">Renew</a>
! <!-- TMPL_ELSE -->
! Not renewable
! <!-- /TMPL_IF -->
! </td>
! <td><!-- TMPL_IF NAME="charges" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF 
--></td>
  </tr>
  <!-- /TMPL_LOOP -->