[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/circ circulation.tmpl,1.8,1.9 returns.tmpl,1.9,1.10

Mike Hansen wolfpac444 at users.sourceforge.net
Thu Aug 7 14:42:02 CEST 2003


Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ
In directory sc8-pr-cvs1:/tmp/cvs-serv1998/koha/koha-tmpl/intranet-tmpl/default/en/circ

Modified Files:
	circulation.tmpl returns.tmpl 
Log Message:
Fixed Bug #561.


Index: circulation.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** circulation.tmpl	10 Jul 2003 10:37:45 -0000	1.8
--- circulation.tmpl	7 Aug 2003 12:41:59 -0000	1.9
***************
*** 238,242 ****
  	    <tr><td bgcolor=<TMPL_VAR NAME="tcolor"> align=center><TMPL_VAR NAME="dd"></td>
  	    <td bgcolor=<TMPL_VAR NAME="tcolor"> align=center>
! 	    <a href="/cgi-bin/koha/detail.pl?bib=<TMPL_VAR NAME="biblionumber">&type=intra" onClick="openWindow(this, 'Item', 480, 640)"><TMPL_VAR NAME="barcode"></a></td>
  	    <td bgcolor=<TMPL_VAR NAME="tcolor">><TMPL_VAR NAME="title"></td>
  	    <td bgcolor=<TMPL_VAR NAME="tcolor">><TMPL_VAR NAME="author"></td>
--- 238,242 ----
  	    <tr><td bgcolor=<TMPL_VAR NAME="tcolor"> align=center><TMPL_VAR NAME="dd"></td>
  	    <td bgcolor=<TMPL_VAR NAME="tcolor"> align=center>
! 	    <a href="/cgi-bin/koha/detail.pl?bib=<TMPL_VAR NAME="biblionumber">&type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;"><TMPL_VAR NAME="barcode"></a></td>
  	    <td bgcolor=<TMPL_VAR NAME="tcolor">><TMPL_VAR NAME="title"></td>
  	    <td bgcolor=<TMPL_VAR NAME="tcolor">><TMPL_VAR NAME="author"></td>
***************
*** 260,264 ****
  	    <tr><td bgcolor=<TMPL_VAR NAME="tcolor"> align=center><TMPL_VAR NAME="dd"></td>
  	    <td bgcolor=<TMPL_VAR NAME="tcolor"> align=center>
! 	    <a href="/cgi-bin/koha/detail.pl?bib=<TMPL_VAR NAME="biblionumber">&type=intra" onClick="openWindow(this, 'Item', 480, 640)"><TMPL_VAR NAME="barcode"></a></td>
  	    <td bgcolor=<TMPL_VAR NAME="tcolor">><TMPL_VAR NAME="title"></td>
  	    <td bgcolor=<TMPL_VAR NAME="tcolor">><TMPL_VAR NAME="author"></td>
--- 260,264 ----
  	    <tr><td bgcolor=<TMPL_VAR NAME="tcolor"> align=center><TMPL_VAR NAME="dd"></td>
  	    <td bgcolor=<TMPL_VAR NAME="tcolor"> align=center>
! 	    <a href="/cgi-bin/koha/detail.pl?bib=<TMPL_VAR NAME="biblionumber">&type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;"><TMPL_VAR NAME="barcode"></a></td>
  	    <td bgcolor=<TMPL_VAR NAME="tcolor">><TMPL_VAR NAME="title"></td>
  	    <td bgcolor=<TMPL_VAR NAME="tcolor">><TMPL_VAR NAME="author"></td>

Index: returns.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** returns.tmpl	4 Aug 2003 21:47:23 -0000	1.9
--- returns.tmpl	7 Aug 2003 12:41:59 -0000	1.10
***************
*** 1,14 ****
  <TMPL_INCLUDE Name="circulation-top.inc">
  
- <script language="JavaScript">
- <!-- Hide from old browsers
- function openwindow(targeturl, windowname) {
- newwin =
- window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
- }
- // end hiding -->
- </script>
- 
- 
  <table align="right" cellpadding=10><tr><td>
  	<a class="button" href=circulation.pl>
--- 1,4 ----
***************
*** 36,40 ****
  			<font color='red' size='+2'>Item marked Waiting:</font><br>
  		Item <TMPL_VAR Name="itemtitle"> (<TMPL_VAR Name="itemauthor">) <br>
! 	is marked waiting at <b><TMPL_VAR Name="branchname"></b> for <TMPL_VAR Name="name"> (<a href="Javascript:openWindow('/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR Name="bornum">', 'Member')"><TMPL_VAR Name="borcnum"></a>).
  			<center><form method=post action='returns.pl'>
  			<TMPL_LOOP Name="inputloop">
--- 26,30 ----
  			<font color='red' size='+2'>Item marked Waiting:</font><br>
  		Item <TMPL_VAR Name="itemtitle"> (<TMPL_VAR Name="itemauthor">) <br>
! 	is marked waiting at <b><TMPL_VAR Name="branchname"></b> for <TMPL_VAR Name="name"> (<a href="/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR Name="bornum">" onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR Name="bornum">', 'Member'); return false;"><TMPL_VAR Name="borcnum"></a>).
  			<center><form method=post action='returns.pl'>
  			<TMPL_LOOP Name="inputloop">
***************
*** 51,55 ****
      Item: <TMPL_VAR Name="itemtitle"> (<TMPL_VAR Name="itemauthor">)<br>
   needs to be transfered to <b><TMPL_VAR Name="branchname"></b> <br>
! to be picked up by <TMPL_VAR Name="name"> (<a href="Javascript:openWindow('/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR Name="bornum">', 'Member')"><TMPL_VAR Name="borcnum"></a>).
  			<center><form method=post action='returns.pl'>
  			<TMPL_LOOP Name="inputloop">
--- 41,45 ----
      Item: <TMPL_VAR Name="itemtitle"> (<TMPL_VAR Name="itemauthor">)<br>
   needs to be transfered to <b><TMPL_VAR Name="branchname"></b> <br>
! to be picked up by <TMPL_VAR Name="name"> (<a href="/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR Name="bornum">" onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR Name="bornum">', 'Member'); return false;"><TMPL_VAR Name="borcnum"></a>).
  			<center><form method=post action='returns.pl'>
  			<TMPL_LOOP Name="inputloop">
***************
*** 65,70 ****
  		</TMPL_IF>
  		<TMPL_IF Name="reserved">
! 			<font color='red' size='+2'>Reserve found:</font> Item: <TMPL_VAR Name="itemtitle"> (<TMPL_VAR Name="itemauthor">) <a href="Javascript:openWindow('/cgi-bin/koha/detail.pl?bib=<TMPL_VAR Name="itembiblionumber">&type=intra', 'Item')"><TMPL_VAR Name="itembarcode"></a> <br>
! 			for <TMPL_VAR Name="name"> (<a href="Javascript:openWindow('/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR Name="bornum">', 'Member')"><TMPL_VAR Name="borcnum"></a>) to be collected at <b><TMPL_VAR Name="branchname"></b>.
  			<table cellpadding=5 cellspacing=0>
  			<tr><td valign="top">Change status to waiting and print<a href="" onClick='alert(document.forms[0].resslip.value); return false'>slip</a>?: </td>
--- 55,60 ----
  		</TMPL_IF>
  		<TMPL_IF Name="reserved">
! 			<font color='red' size='+2'>Reserve found:</font> Item: <TMPL_VAR Name="itemtitle"> (<TMPL_VAR Name="itemauthor">) <a href="/cgi-bin/koha/detail.pl?bib=<TMPL_VAR Name="itembiblionumber">&type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=<TMPL_VAR Name="itembiblionumber">&type=intra', 'Item'); return false;"><TMPL_VAR Name="itembarcode"></a> <br>
! 			for <TMPL_VAR Name="name"> (<a href="/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR Name="bornum">" onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR Name="bornum">', 'Member'); return false"><TMPL_VAR Name="borcnum"></a>) to be collected at <b><TMPL_VAR Name="branchname"></b>.
  			<table cellpadding=5 cellspacing=0>
  			<tr><td valign="top">Change status to waiting and print<a href="" onClick='alert(document.forms[0].resslip.value); return false'>slip</a>?: </td>
***************
*** 127,131 ****
  	<td valign=top align=left>
  </TMPL_IF>
- <TMPL_IF NAME="errmsgloop">
  		<table border=1 cellpadding=5 cellspacing=0 bgcolor='#dddddd'>
  		<tr><th  background="<TMPL_VAR name="themelang">/images/background-mem.gif"><font>Messages</font></th></tr>
--- 117,120 ----
***************
*** 152,156 ****
  			</TMPL_LOOP>
  		</td></tr></table>
- 		</TMPL_IF>
  	</td>
  	</tr>
--- 141,144 ----
***************
*** 171,175 ****
  		<font color=black><b>Borrower Information</b></font></td></tr>
  		<tr><td colspan=2>
! 		<a href="Javascript:openWindow('/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR Name="ribornum">','Member')"><TMPL_VAR Name="riborcnum"></a>
  		<TMPL_VAR Name="riborsurname">, <TMPL_VAR Name="ribortitle"> <TMPL_VAR Name="riborfirstname"><br>
  		</td></tr>
--- 159,163 ----
  		<font color=black><b>Borrower Information</b></font></td></tr>
  		<tr><td colspan=2>
! 		<a href="/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR Name="ribornum">" onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR Name="ribornum">','Member'); return false;"><TMPL_VAR Name="riborcnum"></a>
  		<TMPL_VAR Name="riborsurname">, <TMPL_VAR Name="ribortitle"> <TMPL_VAR Name="riborfirstname"><br>
  		</td></tr>
***************
*** 180,189 ****
  				<tr><td valign=top><TMPL_IF Name="redfont"><font color="red"></TMPL_IF><TMPL_VAR Name="flag"><TMPL_IF Name="redfont"></font></TMPL_IF></td>
  				<TMPL_IF Name="charges">
! 					<td bgcolor=<TMPL_VAR Name="color">><b><TMPL_VAR Name="msg"></b><a href="Javascript:openWindow('/cgi-bin/koha/pay.pl?bornum=<TMPL_VAR Name="bornum">', 'Payment')">Payment</a></td></tr>
  				</TMPL_IF>
  				<TMPL_IF Name="waiting">
  					<td bgcolor=<TMPL_VAR Name="color">>
  					<TMPL_LOOP Name="itemloop">
! 						<a href="Javascript:openWindow('/cgi-bin/koha/detail.pl?bib=<TMPL_VAR Name="biblionum">&type=intra','Item')"><TMPL_VAR Name="barcode"></a><TMPL_VAR Name="title">(<TMPL_VAR Name="brname">)<br>
  					</TMPL_LOOP>
  					</td></tr>
--- 168,177 ----
  				<tr><td valign=top><TMPL_IF Name="redfont"><font color="red"></TMPL_IF><TMPL_VAR Name="flag"><TMPL_IF Name="redfont"></font></TMPL_IF></td>
  				<TMPL_IF Name="charges">
! 					<td bgcolor=<TMPL_VAR Name="color">><b><TMPL_VAR Name="msg"></b><a href="/cgi-bin/koha/pay.pl?bornum=<TMPL_VAR Name="bornum">" onclick="openWindow('/cgi-bin/koha/pay.pl?bornum=<TMPL_VAR Name="bornum">', 'Payment'); return false;">Payment</a></td></tr>
  				</TMPL_IF>
  				<TMPL_IF Name="waiting">
  					<td bgcolor=<TMPL_VAR Name="color">>
  					<TMPL_LOOP Name="itemloop">
! 						<a href="/cgi-bin/koha/detail.pl?bib=<TMPL_VAR Name="biblionum">&type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=<TMPL_VAR Name="biblionum">&type=intra','Item'); return false;"><TMPL_VAR Name="barcode"></a><TMPL_VAR Name="title">(<TMPL_VAR Name="brname">)<br>
  					</TMPL_LOOP>
  					</td></tr>
***************
*** 193,197 ****
  					<TMPL_LOOP Name="itemloop">
  					<font color=red><TMPL_VAR Name="duedate"></font>
! 						<a href="Javascript:openWindow('/cgi-bin/koha/detail.pl?bib=<TMPL_VAR Name="biblionum">&type=intra', 'Item')">
  							<TMPL_VAR Name="barcode">
  						</a>
--- 181,185 ----
  					<TMPL_LOOP Name="itemloop">
  					<font color=red><TMPL_VAR Name="duedate"></font>
! 						<a href="/cgi-bin/koha/detail.pl?bib=<TMPL_VAR Name="biblionum">&type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=<TMPL_VAR Name="biblionum">&type=intra', 'Item'); return false;">
  							<TMPL_VAR Name="barcode">
  						</a>
***************
*** 230,234 ****
  			</td>
  			<td bgcolor=<TMPL_VAR Name="color">> align=center>
! 			<a href="Javascript:openWindow('/cgi-bin/koha/detail.pl?bib=<TMPL_VAR Name="itembiblionumber">&type=intra', 'Item')"><TMPL_VAR Name="barcode"></a></td>
  			<td bgcolor=<TMPL_VAR Name="color">><TMPL_VAR Name="itemtitle"></td>
  			<td bgcolor=<TMPL_VAR Name="color">><TMPL_VAR Name="itemauthor"></td>
--- 218,222 ----
  			</td>
  			<td bgcolor=<TMPL_VAR Name="color">> align=center>
! 			<a href="/cgi-bin/koha/detail.pl?bib=<TMPL_VAR Name="itembiblionumber">&type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=<TMPL_VAR Name="itembiblionumber">&type=intra', 'Item'); return false;"><TMPL_VAR Name="barcode"></a></td>
  			<td bgcolor=<TMPL_VAR Name="color">><TMPL_VAR Name="itemtitle"></td>
  			<td bgcolor=<TMPL_VAR Name="color">><TMPL_VAR Name="itemauthor"></td>
***************
*** 236,240 ****
  			<td bgcolor=<TMPL_VAR Name="color">>
  			<TMPL_IF Name="duedate">
! 				<a href="Javascript:openWindow('/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR Name="bornum">','Member')">
  					<TMPL_VAR Name="borcnum">
  				</a> <TMPL_VAR Name="borfirstname"> <TMPL_VAR Name="borsurname">
--- 224,228 ----
  			<td bgcolor=<TMPL_VAR Name="color">>
  			<TMPL_IF Name="duedate">
! 				<a href="/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR Name="bornum">" onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR Name="bornum">','Member'); return false;">
  					<TMPL_VAR Name="borcnum">
  				</a> <TMPL_VAR Name="borfirstname"> <TMPL_VAR Name="borsurname">





More information about the Koha-cvs mailing list