[Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/vanilla/en opac-main.tmpl,1.2,1.3 opac-user.tmpl,1.2,1.3

[Paul POULAIN]

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

Modified Files:
	opac-main.tmpl opac-user.tmpl 
Log Message:
synch'ing 2.0.0 branch (RC4 tag) and head

Index: opac-main.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/vanilla/en/opac-main.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** opac-main.tmpl	18 Mar 2003 19:52:36 -0000	1.2
--- opac-main.tmpl	11 Feb 2004 08:46:05 -0000	1.3
***************
*** 162,166 ****
  <p>

  For more information on the koha libary system<br> 

! vist  <b><a href="http://www.koha.org">www.koha.org</a></b></center>

  

  </html>
\ No newline at end of file
--- 162,166 ----
  <p>

  For more information on the koha libary system<br> 

! visit  <b><a href="http://www.koha.org">www.koha.org</a></b></center>

  

  </html>
\ No newline at end of file

Index: opac-user.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/vanilla/en/opac-user.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** opac-user.tmpl	18 Mar 2003 19:52:37 -0000	1.2
--- opac-user.tmpl	11 Feb 2004 08:46:05 -0000	1.3
***************
*** 139,144 ****
  <td class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td>

  <td valign="top" >

! <TMPL_IF NAME="renewable">

  <A HREF='/cgi-bin/koha/opac-renew.pl?from=opac_user&item=<TMPL_VAR NAME="itemnumber">&bornum=<TMPL_VAR NAME="borrowernumber">' class="padded">Renew</A>

  <TMPL_ELSE>

  Not renewable

--- 139,148 ----
  <td class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td>

  <td valign="top" >

! <TMPL_IF NAME="status">

! <TMPL_IF NAME="reserved">

! Not renewable

! <TMPL_ELSE>

  <A HREF='/cgi-bin/koha/opac-renew.pl?from=opac_user&item=<TMPL_VAR NAME="itemnumber">&bornum=<TMPL_VAR NAME="borrowernumber">' class="padded">Renew</A>

+ </TMPL_IF>

  <TMPL_ELSE>

  Not renewable

***************
*** 227,231 ****
  <td class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td>

  <td valign="top" >

! <TMPL_IF NAME="renewable">

  <A HREF='/cgi-bin/koha/opac-renew.pl?from=opac_user&item=<TMPL_VAR NAME="itemnumber">&bornum=<TMPL_VAR NAME="borrowernumber">' class="padded">Renew</A>

  <TMPL_ELSE>

--- 231,235 ----
  <td class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td>

  <td valign="top" >

! <TMPL_IF NAME="status">

  <A HREF='/cgi-bin/koha/opac-renew.pl?from=opac_user&item=<TMPL_VAR NAME="itemnumber">&bornum=<TMPL_VAR NAME="borrowernumber">' class="padded">Renew</A>

  <TMPL_ELSE>