[Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/en opac-account.tmpl,1.1,1.2 opac-main.tmpl,1.3,1.4 opac-reserve.tmpl,1.3,1.4 opac-search.tmpl,1.4,1.5 opac-searchresults.tmpl,1.6,1.7 opac-user.tmpl,1.4,1.5

[Finlay Thompson]

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en
In directory usw-pr-cvs1:/tmp/cvs-serv28733

Modified Files:
        opac-account.tmpl opac-main.tmpl opac-reserve.tmpl 
        opac-search.tmpl opac-searchresults.tmpl opac-user.tmpl 
Log Message:

more little  changes from hlt


Index: opac-account.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en/opac-account.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** opac-account.tmpl   14 Oct 2002 22:51:22 -0000      1.1
--- opac-account.tmpl   15 Oct 2002 04:43:50 -0000      1.2
***************
*** 2,6 ****
  
  <TMPL_LOOP NAME="BORROWER_INFO">
! <FONT SIZE=6><em>Account for <TMPL_VAR NAME="firstname"> <TMPL_VAR 
NAME="surname"></em></FONT><P>
  </TMPL_LOOP>
  <center>
--- 2,7 ----
  
  <TMPL_LOOP NAME="BORROWER_INFO">
! <FONT SIZE=6><em>Account for <TMPL_VAR NAME="firstname"> <TMPL_VAR 
NAME="surname"></em></FONT>
! [<a href=/cgi-bin/koha/opac-user.pl>Home</a>][<a 
href=/cgi-bin/koha/opac-logout.pl>Log Out</a>]<p>
  </TMPL_LOOP>
  <center>

Index: opac-main.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en/opac-main.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** opac-main.tmpl      4 Oct 2002 00:09:27 -0000       1.3
--- opac-main.tmpl      15 Oct 2002 04:43:50 -0000      1.4
***************
*** 76,80 ****
        <p>
        <TMPL_IF NAME="loggedinuser">
!           <p align=left>Logged in as: <TMPL_VAR NAME="loggedinuser"> [<a 
href=/cgi-bin/koha/opac-user.pl>Home</a>][<a href="/cgi-bin/koha/logout.pl">Log 
Out</a>]</p>
        <TMPL_ELSE>
            <p align=left><a href="/cgi-bin/koha/opac-user.pl">Log In</a> to 
Koha</p>
--- 76,80 ----
        <p>
        <TMPL_IF NAME="loggedinuser">
!           <p align=left>Logged in as: <TMPL_VAR NAME="loggedinuser"> [<a 
href=/cgi-bin/koha/opac-user.pl>Members Home</a>][<a 
href="/cgi-bin/koha/logout.pl">Log Out</a>]</p>
        <TMPL_ELSE>
            <p align=left><a href="/cgi-bin/koha/opac-user.pl">Log In</a> to 
Koha</p>

Index: opac-reserve.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** opac-reserve.tmpl   14 Oct 2002 22:49:27 -0000      1.3
--- opac-reserve.tmpl   15 Oct 2002 04:43:50 -0000      1.4
***************
*** 4,8 ****
  
  <TMPL_IF NAME="loggedinuser">
!     <p align=left>Logged in as: <TMPL_VAR NAME="loggedinuser"> [<a 
href=/cgi-bin/koha/opac-user.pl>Home</a>][<a 
href=/cgi-bin/koha/opac-logout.pl>Log Out</a>]</p>
  <TMPL_ELSE>
      <p align=left><a href=/cgi-bin/koha/opac-user.pl>Log In</a> to Koha</p>
--- 4,8 ----
  
  <TMPL_IF NAME="loggedinuser">
!     <p align=left>Logged in as: <TMPL_VAR NAME="loggedinuser"> [<a 
href=/cgi-bin/koha/opac-user.pl>Members Home</a>][<a 
href=/cgi-bin/koha/opac-logout.pl>Log Out</a>]</p>
  <TMPL_ELSE>
      <p align=left><a href=/cgi-bin/koha/opac-user.pl>Log In</a> to Koha</p>
***************
*** 13,18 ****
  <tr bgcolor="#fecc99" >
  <td><font face="arial,helvetica" color="red" size=+1><B>
! <TMPL_IF NAME="too_much_oweing">Sorry, you cannot make reseves because you 
owe <TMPL_VAR NAME="too_much_oweing">, which is too much.  </TMPL_IF>
! <TMPL_IF NAME="too_many_reserves">Sorry, you cannot make reseves because you 
already have <TMPL_VAR NAME="too_many_reserves">, more than enough.  </TMPL_IF>
  <TMPL_IF NAME="already_reserved">You already have a reserve placed on this 
item.</TMPL_IF>
  <TMPL_IF NAME="no_items_selected">You must select at least on item 
type!</TMPL_IF>
--- 13,18 ----
  <tr bgcolor="#fecc99" >
  <td><font face="arial,helvetica" color="red" size=+1><B>
! <TMPL_IF NAME="too_much_oweing">Sorry, you cannot make reserves because you 
owe <TMPL_VAR NAME="too_much_oweing">.  </TMPL_IF>
! <TMPL_IF NAME="too_many_reserves">Sorry, you cannot make more than <TMPL_VAR 
NAME="too_many_reserves"> reserves. </TMPL_IF>
  <TMPL_IF NAME="already_reserved">You already have a reserve placed on this 
item.</TMPL_IF>
  <TMPL_IF NAME="no_items_selected">You must select at least on item 
type!</TMPL_IF>
***************
*** 29,33 ****
  <p> There are <b><TMPL_VAR NAME="rank"></b> reserves already on this item. 
</p>
  <p>
! Please select the item type you want to reserve:
  <p>
  
--- 29,33 ----
  <p> There are <b><TMPL_VAR NAME="rank"></b> reserves already on this item. 
</p>
  <p>
! Please select which item types are ok for you. The first of these item that 
matches one of these types that becomes available will be set kept for you.
  <p>
  
***************
*** 68,72 ****
  
  <p>
! Please confirm:
  <p>
  
--- 68,72 ----
  
  <p>
! Please confirm that you wish to request an item of these types:
  <p>
  
***************
*** 90,93 ****
--- 90,97 ----
  Which is to be picked up from <b><TMPL_VAR NAME="branchname"></b>.<br>
  <input type="hidden" name="bib" value="<TMPL_VAR NAME='branch'>">
+ 
+ <TMPL_IF NAME="fee">
+ <br>Note there will be a reserve charge of <b>$<TMPL_VAR NAME="fee"></b><br>
+ </TMPL_IF>
  
  <font size=4 face="arial,helvetica"><INPUT type="submit" value="Place 
Reserve"></font>

Index: opac-search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en/opac-search.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** opac-search.tmpl    4 Oct 2002 00:09:27 -0000       1.4
--- opac-search.tmpl    15 Oct 2002 04:43:50 -0000      1.5
***************
*** 2,6 ****
  
  <TMPL_IF NAME="loggedinuser">
!     <p align=left>Logged in as: <TMPL_VAR NAME="loggedinuser"> [<a 
href=/cgi-bin/koha/opac-user.pl>Home</a>][<a 
href=/cgi-bin/koha/opac-logout.pl>Log Out</a>]</p>
  <TMPL_ELSE>
      <p align=left><a href=/cgi-bin/koha/opac-user.pl>Log In</a> to Koha</p>
--- 2,6 ----
  
  <TMPL_IF NAME="loggedinuser">
!     <p align=left>Logged in as: <TMPL_VAR NAME="loggedinuser"> [<a 
href=/cgi-bin/koha/opac-user.pl>Members Home</a>][<a 
href=/cgi-bin/koha/opac-logout.pl>Log Out</a>]</p>
  <TMPL_ELSE>
      <p align=left><a href=/cgi-bin/koha/opac-user.pl>Log In</a> to Koha</p>

Index: opac-searchresults.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** opac-searchresults.tmpl     4 Oct 2002 00:09:27 -0000       1.6
--- opac-searchresults.tmpl     15 Oct 2002 04:43:50 -0000      1.7
***************
*** 4,8 ****
  
  <TMPL_IF NAME="loggedinuser">
!     <p align=left>Logged in as: <TMPL_VAR NAME="loggedinuser"> [<a 
href=/cgi-bin/koha/opac-user.pl>Home</a>][<a 
href=/cgi-bin/koha/opac-logout.pl>Log Out</a>]</p>
  <TMPL_ELSE>
      <p align=left><a href=/cgi-bin/koha/opac-user.pl>Log In</a> to Koha</p>
--- 4,8 ----
  
  <TMPL_IF NAME="loggedinuser">
!     <p align=left>Logged in as: <TMPL_VAR NAME="loggedinuser"> [<a 
href=/cgi-bin/koha/opac-user.pl>Members Home</a>][<a 
href=/cgi-bin/koha/opac-logout.pl>Log Out</a>]</p>
  <TMPL_ELSE>
      <p align=left><a href=/cgi-bin/koha/opac-user.pl>Log In</a> to Koha</p>

Index: opac-user.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en/opac-user.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** opac-user.tmpl      14 Oct 2002 22:49:27 -0000      1.4
--- opac-user.tmpl      15 Oct 2002 04:43:50 -0000      1.5
***************
*** 28,46 ****
  
  
! 
  <table cellpadding=5 cellspacing=0 border=1>
  <tr bgcolor="#fecc99">
  <td>
- <TMPL_IF NAME="amountoverfive">
  <font face="arial,helvetica" color="red" size=+2><B>You have Outstanding 
charges and fines of <TMPL_VAR NAME="amountoutstanding"></B></font>
! <TMPL_ELSE>
!   <TMPL_IF NAME="amountoverzero">
!   <td><font face="arial,helvetica" size=+2><B>You have Outstanding charges 
and fines of <TMPL_VAR NAME="amountoutstanding"></B></font>
!   <TMPL_ELSE>
!   <td><font face="arial,helvetica" size=+2><B>You have a credit of <TMPL_VAR 
NAME="amountoutstanding"></B></font>
!   </TMPL_IF>
  </TMPL_IF>
! <a href='/cgi-bin/koha/opac-account.pl'>View Accounts</a>
  </td></tr></table>
  
  </TMPL_LOOP>
--- 28,56 ----
  
  
! <TMPL_IF NAME="amountoverfive">
  <table cellpadding=5 cellspacing=0 border=1>
  <tr bgcolor="#fecc99">
  <td>
  <font face="arial,helvetica" color="red" size=+2><B>You have Outstanding 
charges and fines of <TMPL_VAR NAME="amountoutstanding"></B></font>
! </td></tr></table>
! 
  </TMPL_IF>
! 
! <TMPL_IF NAME="amountoverzero">
! <table cellpadding=5 cellspacing=0 border=1>
! <tr bgcolor="#fecc99">
! <td>
! <td><font face="arial,helvetica" size=+2><B>You have Outstanding charges and 
fines of <TMPL_VAR NAME="amountoutstanding"></B></font>
  </td></tr></table>
+ </TMPL_IF>
+ 
+ <TMPL_IF NAME"amountlessthanzero">
+ <table cellpadding=5 cellspacing=0 border=1>
+ <tr bgcolor="#fecc99">
+ <td>
+ <td><font face="arial,helvetica" size=+2><B>You have a credit of <TMPL_VAR 
NAME="amountoutstanding"></B></font>
+ </td></tr></table>
+ </TMPL_IF>
+ <a href='/cgi-bin/koha/opac-account.pl'>View Accounts</a>
  
  </TMPL_LOOP>