[Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/en opac-detail.tmpl,1.11,1.11.2.1 opac-moredetail.tmpl,1.7,1.7.2.1 opac-reserve.tmpl,1.15,1.15.2.1 opac-searchresults.tmpl,1.15.2.1,1.15.2.2 opac-search.tmpl,1.14,1.14.2.1 opac-user.tmpl,1.14,1.14.2.1 opac-userupdate.tmpl,1.12,1.12.2.1 subject.tmpl,1.4,1.4.2.1

[Paul POULAIN]

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

Modified Files:
      Tag: rel_2_0
        opac-detail.tmpl opac-moredetail.tmpl opac-reserve.tmpl 
        opac-searchresults.tmpl opac-search.tmpl opac-user.tmpl 
        opac-userupdate.tmpl subject.tmpl 
Log Message:
fix for #675

Index: opac-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -C2 -r1.11 -r1.11.2.1
*** opac-detail.tmpl    9 Dec 2003 10:27:07 -0000       1.11
--- opac-detail.tmpl    22 Dec 2003 09:17:02 -0000      1.11.2.1
***************
*** 1,10 ****
  <!-- TMPL_INCLUDE NAME="opac-top.inc" -->
  
- <!-- TMPL_IF NAME="loggedinusername" -->
-     <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-main.pl?logout.x=1">Log Out</a>]</p>
- <!-- TMPL_ELSE -->
-     <p align="left"><a href="/cgi-bin/koha/opac-user.pl">Log In</a> to 
Koha</p>
- <!-- /TMPL_IF -->
- 
  <!-- TMPL_UNLESS NAME="norequests" -->
  <p align="right"><a href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR 
NAME="biblionumber" ESCAPE=URL -->">Request</a></p>
--- 1,4 ----

Index: opac-moredetail.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -C2 -r1.7 -r1.7.2.1
*** opac-moredetail.tmpl        9 Dec 2003 10:27:07 -0000       1.7
--- opac-moredetail.tmpl        22 Dec 2003 09:17:02 -0000      1.7.2.1
***************
*** 1,10 ****
  <!-- TMPL_INCLUDE NAME="opac-top.inc" -->
  <center>
- <!-- 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-main.pl?logout.x=1>Log Out</a>]</p>
- <!-- TMPL_ELSE -->
-     <p align=left><a href=/cgi-bin/koha/opac-user.pl>Log In</a> to Koha</p>
- <!-- /TMPL_IF -->
- 
  
  <br>
--- 1,4 ----

Index: opac-reserve.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -C2 -r1.15 -r1.15.2.1
*** opac-reserve.tmpl   9 Dec 2003 10:27:07 -0000       1.15
--- opac-reserve.tmpl   22 Dec 2003 09:17:02 -0000      1.15.2.1
***************
*** 2,12 ****
  
  <center>
- 
- <!-- TMPL_IF NAME="loggedinusername" -->
-     <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-main.pl?logout.x=1>Log Out</a>]</p>
- <!-- TMPL_ELSE -->
-     <p align=left><a href=/cgi-bin/koha/opac-user.pl>Log In</a> to Koha</p>
- <!-- /TMPL_IF -->
- 
  <!-- TMPL_IF NAME="message" -->
        <table  cellpadding=5 cellspacing=0 border=1 >
--- 2,5 ----

Index: opac-searchresults.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl,v
retrieving revision 1.15.2.1
retrieving revision 1.15.2.2
diff -C2 -r1.15.2.1 -r1.15.2.2
*** opac-searchresults.tmpl     18 Dec 2003 17:28:19 -0000      1.15.2.1
--- opac-searchresults.tmpl     22 Dec 2003 09:17:02 -0000      1.15.2.2
***************
*** 3,13 ****
  <center>
  
- <!-- TMPL_IF NAME="loggedinusername" -->
-     <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-main.pl?logout.x=1>Log Out</a>]</p>
- <!-- TMPL_ELSE -->
-     <p align=left><a href=/cgi-bin/koha/opac-user.pl>Log In</a> to Koha</p>
- <!-- /TMPL_IF -->
- 
- 
  <!-- TMPL_IF NAME="searchdesc" -->
      You searched on <b><!-- TMPL_VAR NAME="searchdesc" --></b>
--- 3,6 ----

Index: opac-search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en/opac-search.tmpl,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -C2 -r1.14 -r1.14.2.1
*** opac-search.tmpl    9 Dec 2003 10:27:07 -0000       1.14
--- opac-search.tmpl    22 Dec 2003 09:17:02 -0000      1.14.2.1
***************
*** 1,11 ****
  <!-- TMPL_INCLUDE NAME="opac-top.inc" -->
  
- <!-- TMPL_IF NAME="loggedinusername" -->
-     <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-main.pl?logout.x=1>Log Out</a>]</p>
- <!-- TMPL_ELSE -->
-     <p align=left><a href=/cgi-bin/koha/opac-user.pl>Log In</a> to Koha</p>
- <!-- /TMPL_IF -->
- 
- 
  <CENTER>
  <FORM ACTION="/cgi-bin/koha/opac-searchresults.pl" method=get>
--- 1,4 ----

Index: opac-user.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en/opac-user.tmpl,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -C2 -r1.14 -r1.14.2.1
*** opac-user.tmpl      9 Dec 2003 10:27:07 -0000       1.14
--- opac-user.tmpl      22 Dec 2003 09:17:02 -0000      1.14.2.1
***************
*** 21,29 ****
  
  
- 
- <font size=6><em>Hi <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR 
NAME="surname" --></em></font>
- [<a href="/cgi-bin/koha/opac-main.pl?logout.x=1">Logout</a>]<p>
- 
- 
  <!-- TMPL_IF NAME="amountoverfive" -->
        <table cellpadding=5 cellspacing=0 border=1>
--- 21,24 ----

Index: opac-userupdate.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en/opac-userupdate.tmpl,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -C2 -r1.12 -r1.12.2.1
*** opac-userupdate.tmpl        9 Dec 2003 10:27:07 -0000       1.12
--- opac-userupdate.tmpl        22 Dec 2003 09:17:02 -0000      1.12.2.1
***************
*** 1,10 ****
  <!-- TMPL_INCLUDE NAME="opac-top.inc" -->
  
- <!-- TMPL_IF NAME="loggedinusername" -->
-     <p align=left>Logged in as: <!-- TMPL_VAR NAME="loggedinuser" --> [<a 
href=/cgi-bin/koha/opac-main.pl?logout.x=1>Log Out</a>]</p>
- <!-- TMPL_ELSE -->
-     <p align=left><a href=/cgi-bin/koha/opac-user.pl>Log In</a> to Koha</p>
- <!-- /TMPL_IF -->
- 
  <i>Please, change what's needed. An email will be sent to the library.<br/>
  Your changes won't appear until the library has validated them.</i><br/><br/>
--- 1,4 ----

Index: subject.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en/subject.tmpl,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -r1.4 -r1.4.2.1
*** subject.tmpl        9 Dec 2003 10:27:07 -0000       1.4
--- subject.tmpl        22 Dec 2003 09:17:02 -0000      1.4.2.1
***************
*** 1,11 ****
  <!-- TMPL_INCLUDE NAME="opac-top.inc" -->
- 
- 
- <!-- TMPL_IF NAME="loggedinuser" -->
-     <p align=left>Logged in as: <!-- TMPL_VAR NAME="loggedinuser" --> [<a 
href=./logout.pl>Log Out</a>]</p>
- <!-- TMPL_ELSE -->
-     <p align=left><a href=./userpage.pl>Log In</a> to Koha</p>
- <!-- /TMPL_IF -->
- 
  <center>
  
--- 1,3 ----