[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/circ circulation.tmpl,1.15,1.16

[Paul POULAIN]

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28336/koha-tmpl/intranet-tmpl/default/en/circ

Modified Files:
	circulation.tmpl 
Log Message:
synch'ing 2.0.0 branch (RC4 tag) and head

Index: circulation.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** circulation.tmpl	9 Dec 2003 10:29:05 -0000	1.15
--- circulation.tmpl	11 Feb 2004 09:03:46 -0000	1.16
***************
*** 5,9 ****
  		<tr>
  			<td>
! 				<a class="button" href="circulation.pl?borrnumber=<!-- TMPL_VAR name="borrowernumber" -->&amp;branch=<!-- TMPL_VAR name="branch" -->&amp;printer=<!-- TMPL_VAR name="printer" -->&amp;print=yes">
  				Next Borrower</a>&nbsp;
  				<a class="button" href="returns.pl">
--- 5,9 ----
  		<tr>
  			<td>
! 				<a class="button" href="circulation.pl?branch=<!-- TMPL_VAR name="branch" -->&amp;printer=<!-- TMPL_VAR name="printer" -->&amp;print=yes">
  				Next Borrower</a>&nbsp;
  				<a class="button" href="returns.pl">
***************
*** 14,24 ****
  		</tr>
  	</table>
! 	<h1>Circulation: Issues</h1><br>
! 	<b>Branch:</b> <!-- TMPL_VAR name="branchname" --><br>
! 	<b>Printer:</b> <!-- TMPL_VAR name="printername" --><br>
! 	<a href="selectbranchprinter.pl">Change Settings</a>
  	<input type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" -->">
  	<input type="hidden" name="printer" value="<!-- TMPL_VAR name="printer" -->">
- 	<p>&nbsp;</p>
  <!-- TMPL_ELSE -->
  	<table align="right" cellpadding="10">
--- 14,21 ----
  		</tr>
  	</table>
! 	<h1>Circulation: Issues</h1>
! 	<i>Branch:</i> <!-- TMPL_VAR name="branchname" --> <i>Printer:</i> <!-- TMPL_VAR name="printername" --> <a href="selectbranchprinter.pl" class="button">Change Settings</a>
  	<input type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" -->">
  	<input type="hidden" name="printer" value="<!-- TMPL_VAR name="printer" -->">
  <!-- TMPL_ELSE -->
  	<table align="right" cellpadding="10">
***************
*** 38,42 ****
  	<b>Branch:</b> <!-- TMPL_VAR name="branchname" --> <br>
  	<b>Printer:</b> <!-- TMPL_VAR name="printername" --><br>
! 	<a href="selectbranchprinter.pl">Change Settings</a>
  	<input type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" -->">
  	<input type="hidden" name="printer" value="<!-- TMPL_VAR name="printer" -->">
--- 35,39 ----
  	<b>Branch:</b> <!-- TMPL_VAR name="branchname" --> <br>
  	<b>Printer:</b> <!-- TMPL_VAR name="printername" --><br>
! 	<a href="selectbranchprinter.pl" class="button">Change Settings</a>
  	<input type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" -->">
  	<input type="hidden" name="printer" value="<!-- TMPL_VAR name="printer" -->">
***************
*** 141,145 ****
  				<!-- TMPL_VAR name="CGIselectborrower" -->
  				<br>
! 				<input type="submit">
  			</td>
  		</tr>
--- 138,142 ----
  				<!-- TMPL_VAR name="CGIselectborrower" -->
  				<br>
! 				<input type="submit" value="OK" class="button">
  			</td>
  		</tr>
***************
*** 172,176 ****
  <td>
  <form method="post" action="/cgi-bin/koha/circ/circulation.pl">
! <table border="1" cellpadding="5">
  	<tr>
  	<td align="center" valign="top">
--- 169,173 ----
  <td>
  <form method="post" action="/cgi-bin/koha/circ/circulation.pl">
! <table border="1" cellpadding="2">
  	<tr>
  	<td align="center" valign="top">
***************
*** 187,191 ****
  							<td>Item Barcode:</td>
  							<td><input name="barcode" size="10"></td>
! 							<td><input type="submit" value="Issue"></td>
  						</tr>
  						<tr>
--- 184,188 ----
  							<td>Item Barcode:</td>
  							<td><input name="barcode" size="10"></td>
! 							<td><input type="submit" value="Issue" class="button"></td>
  						</tr>
  						<tr>
***************
*** 225,230 ****
  </td>
  <td>
! <table border="1" cellpadding="5" cellspacing="0" align="right">
!     <tr><td colspan="2"><font color="black"><b>Patron information</b></font></td></tr>
      <tr><td colspan="2">
      <a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR name="borrowernumber" -->" onClick="openWindow(this,'Member', 480, 640)">
--- 222,227 ----
  </td>
  <td>
! <table border="1" cellpadding="2" cellspacing="0" align="right">
!     <tr><td colspan="2"><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="borrowernumber" -->" onClick="openWindow(this,'Member', 480, 640)">
***************
*** 233,236 ****
--- 230,242 ----
      </td></tr>
  <!-- TMPL_IF name="noissues" -->
+ <!-- TMPL_IF NAME="gna" -->
+ <tr><td valign="top"><font color="red">GNA</font></td><td bgcolor=<!-- TMPL_VAR name="color" -->>Borrower is gone with no address</td></tr>
+ <!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="lost" -->
+ <tr><td valign="top"><font color="red">LOST</font></td><td bgcolor=<!-- TMPL_VAR name="color" -->>Borrower's card is lost</td></tr>
+ <!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="dbarred" -->
+ <tr><td valign="top"><font color="red">DBARRED</font></td><td bgcolor=<!-- TMPL_VAR name="color" -->>Borrower is debarred</td></tr>
+ <!-- /TMPL_IF -->
  	<!-- TMPL_IF name="charges" -->
  		<tr><td valign="top"><font color="red">CHARGES</font></td><td bgcolor=<!-- TMPL_VAR name="color" -->><a href="/cgi-bin/koha/pay.pl?bornum=<!-- TMPL_VAR name="borrowernumber" -->" onClick="openWindow(this, 'Payment', 480,640)">Payment</a></td></tr>
***************
*** 254,258 ****
  			<!-- TMPL_IF name="odues" -->
  				<!-- TMPL_IF name="nonreturns" -->
! 					<tr><td valign="top">ODUES</td><td>Yes, See below</td></tr>
  				<!-- /TMPL_IF -->
  			<!-- /TMPL_IF -->
--- 260,264 ----
  			<!-- TMPL_IF name="odues" -->
  				<!-- TMPL_IF name="nonreturns" -->
! 					<tr><td valign="top"><font color="red">ODUES</font></td><td><font color="red">Yes, See below</font></td></tr>
  				<!-- /TMPL_IF -->
  			<!-- /TMPL_IF -->
***************
*** 264,270 ****
  <!-- /TMPL_IF -->
  </table>
! <p clear="all"><br><br></p>
  <!-- TMPL_IF name="todayissues" -->
! <table border="1" cellpadding="5" cellspacing="0" width="80%">
  	<tr>
  		<th colspan="5" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
--- 270,276 ----
  <!-- /TMPL_IF -->
  </table>
! <br/>
  <!-- TMPL_IF name="todayissues" -->
! <table border="1" cellpadding="5" cellspacing="0" width="100%">
  	<tr>
  		<th colspan="5" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">