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

Thu Dec 5 01:07:44 CET 2002

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

Modified Files:
	opac-account.tmpl opac-auth.tmpl opac-detail.tmpl 
	opac-main.tmpl opac-moredetail.tmpl opac-reserve.tmpl 
	opac-search.tmpl opac-searchresults.tmpl opac-user.tmpl 
	opac-userupdate.tmpl 
Log Message:

merged changes to the default/en opac files

Index: opac-account.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en/opac-account.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** opac-account.tmpl	15 Oct 2002 04:43:50 -0000	1.2
--- opac-account.tmpl	5 Dec 2002 00:07:36 -0000	1.3
***************
*** 3,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>
--- 3,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-main.pl?logout.x=1>Log Out</a>]<p>
  </TMPL_LOOP>
  <center>

Index: opac-auth.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en/opac-auth.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** opac-auth.tmpl	15 Oct 2002 23:35:10 -0000	1.2
--- opac-auth.tmpl	5 Dec 2002 00:07:36 -0000	1.3
***************
*** 3,7 ****
--- 3,21 ----
  <!-- This is what is displayed if user doesnt have permission -->
  <h2>Sorry, KOHA doesnt think you have permission for this page.<h2>
+ </TMPL_IF>
+ 
+ <TMPL_IF NAME="timed_out">
+ <!-- This is what is displayed if login has timed out -->
+ <h2>Sorry, your session has timed out, please login again.<h2>
+ </TMPL_IF>

+ <TMPL_IF NAME="different_ip">
+ <!-- This is what is displayed if user doesnt have permission -->
+ <h2>You are accessing koha from a different ip address! please login again.<h2>
+ </TMPL_IF>
+ 
+ <TMPL_IF NAME="invalid_username_or_password">
+ <!-- This is what is displayed if user doesnt have permission -->
+ <h2>You entered an incorrect username or password, please try again.<h2>
  </TMPL_IF>

***************
*** 11,15 ****

  <center>
- <h2><TMPL_VAR NAME="message"></h2>

  <form action='<TMPL_VAR NAME="url">' method="post">
--- 25,28 ----
***************
*** 23,44 ****
      <tr><th colspan="2" background="/images/background-mem.gif"><font size="+2">Koha Login</font></th></tr>
      <tr><td>Cardnumber:</td><td><input name="userid"></td></tr>
!     <tr><td>Password:</td><td><input type=password name=password></td></tr>
      <tr><td colspan="2" align="center"><input type="submit" value="login"></td></tr>
      </table>
      </td><td align="center" valign="top">

-     <table border="0" bgcolor="#dddddd" cellpadding="10" cellspacing="0">
-     <tr><th background="/images/background-mem.gif"><font size="+2">Demo Information</font></th></tr>
-     <td>
-     This message will have to change in the live version! <br>
- 
-     Login as finlay : finlay or frank : frank to see what happens.
-     or go and get yourself a password from the password link from the moremember page in the intradev. <br>
- 
-     Oh, and you can also login as superuser : koha :-)
- 
-     </td>
-     </tr>
-     </table>

      </td></tr>
--- 36,44 ----
      <tr><th colspan="2" background="/images/background-mem.gif"><font size="+2">Koha Login</font></th></tr>
      <tr><td>Cardnumber:</td><td><input name="userid"></td></tr>
!     <tr><td>Password:</td><td><input type="password" name="password"></td></tr>
      <tr><td colspan="2" align="center"><input type="submit" value="login"></td></tr>
      </table>
      </td><td align="center" valign="top">

      </td></tr>
***************
*** 47,49 ****

! </TMPL_IF>
\ No newline at end of file
--- 47,49 ----

! </TMPL_IF>

Index: opac-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** opac-detail.tmpl	16 Oct 2002 12:47:24 -0000	1.4
--- opac-detail.tmpl	5 Dec 2002 00:07:36 -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>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>
--- 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-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>

Index: opac-main.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en/opac-main.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** opac-main.tmpl	15 Oct 2002 04:43:50 -0000	1.4
--- opac-main.tmpl	5 Dec 2002 00:07:36 -0000	1.5
***************
*** 1,134 ****
! <HTML>
! <TITLE>WELCOME TO THE  KOHA OPAC </TITLE>
! 
! 
! <style type="text/css">
! <!--
! input{font-size:16px}
! -->
! 
! </style>
! 
! 
! </HEAD>
! 
! <BODY   onload="document.catsearch.keyword.focus()"
! 	BGCOLOR="#339999" 
! 	text="black" 
! 	link="white" 
! 	vlink="white" 
! 	alink="#663366" 
! 	leftmargin=0 
! 	topmargin=0
! 	marginheight=0
! 	marginwidth=0 >
! 
! <center>
! <table cellspacing=0 cellpadding=0 border=0 >
! 	
!   <tr valign=top >
! 	<td background="<TMPL_VAR NAME='themelang'>/images/front-background-med.gif"><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" 
! 	width=1 height=440 align=left alt=" " hspace=0 vspace=0><table
! cellspacing=0 cellpadding=0 border=0 >
! 	
!   <tr valign=top >
! 	<td background=" "><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=228 height=88 
! 	alt=" " hspace=0 vspace=0></td>
! 	<td background=" "><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=57 height=88 
! 	alt=" " hspace=0 vspace=0></td>
! 	<td background=" "><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=47 height=88 
! 	alt=" " hspace=0 vspace=0></td>
! 	<td background=" "><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=1 height=88 
! 	alt=" " hspace=0 vspace=0></td>
! 	<td background=" "><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=1 height=88 
! 	alt=" " hspace=0 vspace=0></td>
!   </tr>
! 
!   <tr valign=top >
! 	<td background=" " rowspan=2 align="right" colspan=2><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif"
!  	width=1 height=30
! 	alt=" " hspace=0 vspace=0><br>
! 	<img src="<TMPL_VAR NAME='themelang'>/images/koha.gif" width=200 height=128
! 	alt="Koha: Horowhenua Library Trust Catalogue and Member Services" hspace=0 vspace=0></td>
! 
! 	<td background=" "  colspan=3><font size=+2><a href="/cgi-bin/koha/opac-search.pl"><img src="<TMPL_VAR NAME='themelang'>/images/heading-search.gif" width=272 	height=38
! 	alt="Search the Catalogue" hspace=0 vspace=0 border=0></a></font></td>
! 
!   </tr>
! 
! 
! <tr valign=top >
! 	<td>&nbsp; &nbsp; </td>
! 	<FORM ACTION="/cgi-bin/koha/opac-searchresults.pl" name=catsearch>
! 	<input type=hidden name=type value=opac>
! 	<td background=" " >
! 
! 	<input type=text size="27" name="keyword"><br>
! 	</font>
! 	<b>Type in the box and press the enter 			key.</b><br>
! 	<a href="/cgi-bin/koha/opac-search.pl">
!       
! 	<img src="<TMPL_VAR NAME='themelang'>/images/front-arrow.gif" width=27 height=22
! 	alt="-" hspace=0 vspace=0 border=0 align=middle >Advanced Search (More Options)</a><br>
! 
! 	<img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=1 height=8
! 	alt=" " hspace=0 vspace=0>
! 	<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>
! 	</TMPL_IF>
! 	</td>
! 	</form>
!   </tr>
! 
! 
!  
! 
! <!--
!   <tr valign=top ><form action="/cgi-bin/koha/member.pl" method=get >
! 	<td background=" "  colspan=3><img src="<TMPL_VAR NAME='themelang'>/images/heading-login.gif" width=279 		height=38
! 	alt="Member Login" hspace=0 vspace=0 border=0></td>
! 
!   </tr>
! <tr valign=top >
!         <td></td>
! 	<form action="/cgi-bin/koha/member.pl" method=get >
! 	<td background=" " >
! 	<font size=3 face="arial narrow,arial,helvetica">Card Number &nbsp;</font></td>
! 	<td background=" " ><input type=text size="12" name="card"></td>
! 
!   </tr>
! 
!   <tr valign=top><td></td>
! 	<td></td>
! 	<td></td>
! 	<td background=" " >
! 	<font size=3 face="arial narrow,arial,helvetica">Password</font></td>
! 	<td background=" " ><input type=password size="12" name="password"><br>
! 	<input type=submit value="OK"><br>
! 
! 	<img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=1 height=8
! 	alt=" " hspace=0 vspace=0></td>
! 	</font>
!  </tr>
! 
!   <tr valign=top >
! 	<td></td>
! 	<td background=" " colspan=4><A href="/cgi-bin/koha/join.html"><img src="<TMPL_VAR NAME='themelang'>/images/heading-member.gif" width=331 		height=38
! 	alt="Become a Website Member" hspace=0 vspace=0 border=0></a>
! 	</td>
! 	<td>
! 	</td>
! 
!   </tr>
! 
! -->
! </table>
! 
! </td>
!   </tr>
! </table>
! <p>
! </center>
--- 1,134 ----
! <HTML>
! <TITLE>WELCOME TO THE  KOHA OPAC </TITLE>
! 
! 
! <style type="text/css">
! <!--
! input{font-size:16px}
! -->
! 
! </style>
! 
! 
! </HEAD>
! 
! <BODY   onload="document.catsearch.keyword.focus()"
! 	BGCOLOR="#339999" 
! 	text="black" 
! 	link="white" 
! 	vlink="white" 
! 	alink="#663366" 
! 	leftmargin=0 
! 	topmargin=0
! 	marginheight=0
! 	marginwidth=0 >
! 
! <center>
! <table cellspacing=0 cellpadding=0 border=0 >
! 	
!   <tr valign=top >
! 	<td background="<TMPL_VAR NAME='themelang'>/images/front-background-med.gif"><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" 
! 	width=1 height=440 align=left alt=" " hspace=0 vspace=0><table
! cellspacing=0 cellpadding=0 border=0 >
! 	
!   <tr valign=top >
! 	<td background=" "><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=228 height=88 
! 	alt=" " hspace=0 vspace=0></td>
! 	<td background=" "><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=57 height=88 
! 	alt=" " hspace=0 vspace=0></td>
! 	<td background=" "><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=47 height=88 
! 	alt=" " hspace=0 vspace=0></td>
! 	<td background=" "><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=1 height=88 
! 	alt=" " hspace=0 vspace=0></td>
! 	<td background=" "><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=1 height=88 
! 	alt=" " hspace=0 vspace=0></td>
!   </tr>
! 
!   <tr valign=top >
! 	<td background=" " rowspan=2 align="right" colspan=2><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif"
!  	width=1 height=30
! 	alt=" " hspace=0 vspace=0><br>
! 	<img src="<TMPL_VAR NAME='themelang'>/images/koha.gif" width=200 height=128
! 	alt="Koha: Horowhenua Library Trust Catalogue and Member Services" hspace=0 vspace=0></td>
! 
! 	<td background=" "  colspan=3><font size=+2><a href="/cgi-bin/koha/opac-search.pl"><img src="<TMPL_VAR NAME='themelang'>/images/heading-search.gif" width=272 	height=38
! 	alt="Search the Catalogue" hspace=0 vspace=0 border=0></a></font></td>
! 
!   </tr>
! 
! 
! <tr valign=top >
! 	<td>&nbsp; &nbsp; </td>
! 	<FORM ACTION="/cgi-bin/koha/opac-searchresults.pl" name=catsearch>
! 	<input type=hidden name=type value=opac>
! 	<td background=" " >
! 
! 	<input type=text size="27" name="keyword"><br>
! 	</font>
! 	<b>Type in the box and press the enter 			key.</b><br>
! 	<a href="/cgi-bin/koha/opac-search.pl">
!       
! 	<img src="<TMPL_VAR NAME='themelang'>/images/front-arrow.gif" width=27 height=22
! 	alt="-" hspace=0 vspace=0 border=0 align=middle >Advanced Search (More Options)</a><br>
! 
! 	<img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=1 height=8
! 	alt=" " hspace=0 vspace=0>
! 	<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/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>
! 	</td>
! 	</form>
!   </tr>
! 
! 
!  
! 
! <!--
!   <tr valign=top ><form action="/cgi-bin/koha/member.pl" method=get >
! 	<td background=" "  colspan=3><img src="<TMPL_VAR NAME='themelang'>/images/heading-login.gif" width=279 		height=38
! 	alt="Member Login" hspace=0 vspace=0 border=0></td>
! 
!   </tr>
! <tr valign=top >
!         <td></td>
! 	<form action="/cgi-bin/koha/member.pl" method=get >
! 	<td background=" " >
! 	<font size=3 face="arial narrow,arial,helvetica">Card Number &nbsp;</font></td>
! 	<td background=" " ><input type=text size="12" name="card"></td>
! 
!   </tr>
! 
!   <tr valign=top><td></td>
! 	<td></td>
! 	<td></td>
! 	<td background=" " >
! 	<font size=3 face="arial narrow,arial,helvetica">Password</font></td>
! 	<td background=" " ><input type=password size="12" name="password"><br>
! 	<input type=submit value="OK"><br>
! 
! 	<img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=1 height=8
! 	alt=" " hspace=0 vspace=0></td>
! 	</font>
!  </tr>
! 
!   <tr valign=top >
! 	<td></td>
! 	<td background=" " colspan=4><A href="/cgi-bin/koha/join.html"><img src="<TMPL_VAR NAME='themelang'>/images/heading-member.gif" width=331 		height=38
! 	alt="Become a Website Member" hspace=0 vspace=0 border=0></a>
! 	</td>
! 	<td>
! 	</td>
! 
!   </tr>
! 
! -->
! </table>
! 
! </td>
!   </tr>
! </table>
! <p>
! </center>

Index: opac-moredetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** opac-moredetail.tmpl	16 Oct 2002 12:47:33 -0000	1.2
--- opac-moredetail.tmpl	5 Dec 2002 00:07:36 -0000	1.3
***************
*** 1,4 ****
--- 1,11 ----
  <TMPL_INCLUDE NAME="cat-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>
  <TMPL_LOOP NAME="BIBITEM_DATA">

Index: opac-reserve.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** opac-reserve.tmpl	15 Oct 2002 04:43:50 -0000	1.4
--- opac-reserve.tmpl	5 Dec 2002 00:07:37 -0000	1.5
***************
*** 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>
--- 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-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>
***************
*** 54,60 ****
--- 54,84 ----

  </table>
+ <p>
  Please select the branch from which you want to collect the item:
  <select name="branch"><TMPL_VAR NAME="branchoptions"></select><br>

+ <p>
+ <table border=0 cellpadding=0 cellspacing=0>
+ <tr><td>Reserve on this date:</td><td>
+ <select name=required-day><option value=0>Day<option value=1 >1<option value=2 >2<option value=3 >3<option value=4 >4<option value=5 >5<option value=6 >6<option value=7 >7<option value=8 >8<option value=9 >9<option value=10 >10<option value=11 >11<option value=12 >12<option value=13 >13<option value=14 >14<option value=15 >15<option value=16 >16<option value=17 >17<option value=18 >18<option value=19 >19<option value=20 >20<option value=21 >21<option value=22 >22<option value=23 >23<option value=24 >24<option value=25 >25<option value=26 >26<option value=27 >27<option value=28 >28<option value=29 >29<option value=30 >30<option value=31 >31</select>
+ 
+ </td><td>
+ <select name=required-month><option value=0>Month<option value=1 >Jan<option value=2 >Feb<option value=3 >Mar<option value=4 >Apr<option value=5 >May<option value=6 >Jun<option value=7 >Jul<option value=8 >Aug<option value=9 >Sep<option value=10 >Oct<option value=11 >Nov<option value=12 >Dec</select>
+ </td><td>
+ <select name=required-year><option value=0>Year<option value=2002 >2002<option value=2003 >2003<option value=2004 >2004<option value=2005 >2005<option value=2006 >2006</select>
+ 
+ </td></tr>
+ <tr><td>End reserve on this date:</td><td>
+ <select name=expires-day><option value=0>Day<option value=1 >1<option value=2 >2<option value=3 >3<option value=4 >4<option value=5 >5<option value=6 >6<option value=7 >7<option value=8 >8<option value=9 >9<option value=10 >10<option value=11 >11<option value=12 >12<option value=13 >13<option value=14 >14<option value=15 >15<option value=16 >16<option value=17 >17<option value=18 >18<option value=19 >19<option value=20 >20<option value=21 >21<option value=22 >22<option value=23 >23<option value=24 >24<option value=25 >25<option value=26 >26<option value=27 >27<option value=28 >28<option value=29 >29<option value=30 >30<option value=31 >31</select>
+ 
+ </td><td>
+ <select name=expires-month><option value=0>Month<option value=1 >Jan<option value=2 >Feb<option value=3 >Mar<option value=4 >Apr<option value=5 >May<option value=6 >Jun<option value=7 >Jul<option value=8 >Aug<option value=9 >Sep<option value=10 >Oct<option value=11 >Nov<option value=12 >Dec</select>
+ </td><td>
+ <select name=expires-year><option value=0>Year<option value=2002 >2002<option value=2003 >2003<option value=2004 >2004<option value=2005 >2005<option value=2006 >2006</select>
+ 
+ </td></tr>
+ </table>
+ 
+ <p>

  <font size=4 face="arial,helvetica"><INPUT type="submit" value="Submit"></font>
***************
*** 74,77 ****
--- 98,103 ----
  <input type="hidden" name="place_reserve" value="1">
  <input type="hidden" name="bib" value="<TMPL_VAR NAME='biblionumber'>">
+ <input type="hidden" name="required_date" value="<TMPL_VAR NAME='required_date'>">
+ <input type="hidden" name="expires_date" value="<TMPL_VAR NAME='expires_date'>">
  <TABLE border=1>
  <tr><th bgcolor="#99cccc" background='<TMPL_VAR NAME="themelang">/images/background-opac.gif'>Item Type</th></tr>
***************
*** 89,93 ****

Which is to be picked up from <TMPL_VAR NAME="branchname">. 
! <input type="hidden" name="bib" value="<TMPL_VAR NAME='branch'>">

  <TMPL_IF NAME="fee">
--- 115,119 ----

Which is to be picked up from <TMPL_VAR NAME="branchname">. 
! <input type="hidden" name="branch" value="<TMPL_VAR NAME='branch'>">

  <TMPL_IF NAME="fee">

Index: opac-search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en/opac-search.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** opac-search.tmpl	15 Oct 2002 04:43:50 -0000	1.5
--- opac-search.tmpl	5 Dec 2002 00:07:37 -0000	1.6
***************
*** 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>
--- 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-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>
***************
*** 40,44 ****
      <option value="">Any
      <!-- fetch class list -->
!     <TMPL_INCLUDE NAME="cat-class-list.inc">
      <!--#include virtual="/includes/cat-class-list.inc" -->
      </select>
--- 40,44 ----
      <option value="">Any
      <!-- fetch class list -->
!     <TMPL_VAR name="classlist">
      <!--#include virtual="/includes/cat-class-list.inc" -->
      </select>

Index: opac-searchresults.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** opac-searchresults.tmpl	15 Oct 2002 04:43:50 -0000	1.7
--- opac-searchresults.tmpl	5 Dec 2002 00:07:37 -0000	1.8
***************
*** 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>
--- 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-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>

Index: opac-user.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en/opac-user.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** opac-user.tmpl	15 Oct 2002 04:43:50 -0000	1.5
--- opac-user.tmpl	5 Dec 2002 00:07:37 -0000	1.6
***************
*** 25,29 ****

Hi <TMPL_VAR NAME="firstname"> <TMPL_VAR NAME="surname"> 
! [<a href="/cgi-bin/koha/opac-logout.pl">Logout</a>]

--- 25,29 ----

Hi <TMPL_VAR NAME="firstname"> <TMPL_VAR NAME="surname"> 
! [<a href="/cgi-bin/koha/opac-main.pl?logout.x=1">Logout</a>]

Index: opac-userupdate.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en/opac-userupdate.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** opac-userupdate.tmpl	15 Oct 2002 23:35:10 -0000	1.2
--- opac-userupdate.tmpl	5 Dec 2002 00:07:37 -0000	1.3
***************
*** 2,6 ****

  <TMPL_IF NAME="loggedinuser">
!     <p align=left>Logged in as: <TMPL_VAR NAME="loggedinuser"> [<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-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>