[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/members memberentry.tmpl,1.35,1.36 pay.tmpl,1.8,1.9

[Paul POULAIN]

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

Modified Files:
	memberentry.tmpl pay.tmpl 
Log Message:
synch'ing 2.2 and head

Index: memberentry.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** memberentry.tmpl	4 May 2005 08:59:59 -0000	1.35
--- memberentry.tmpl	20 Jun 2005 14:20:05 -0000	1.36
***************
*** 40,45 ****
  	<!-- /TMPL_IF -->
  	<form action="/cgi-bin/koha/members/memberentry.pl" method="post">
- 		<input type="hidden" name="joining" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
- 		<input type="hidden" name="expiry" value="<!-- TMPL_VAR NAME="expiry" -->">
  		<input type="hidden" name="type" value="borrowers">
  		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
--- 40,43 ----
***************
*** 239,242 ****
--- 237,251 ----
  			</tr>
  			<tr>
+ 				<!-- TMPL_IF NAME="addAction" -->
+ 					<td>Joining date (leave blank for today)</td>
+ 					<td><input type="text" name="joining" size="12" maxlength="10" value="<!-- TMPL_VAR name="joining" -->"></td>
+ 				<!-- TMPL_ELSE -->
+ 					<td>Joining date</td>
+ 					<td><!-- TMPL_VAR name="joining" --></td>
+ 				<!-- /TMPL_IF -->
+ 				<td>Expiry date (leave blank for auto calc)</td>
+ 				<td><input type="text" name="expiry" size="12" maxlength="10" value="<!-- TMPL_VAR name="expiry" -->"></td>
+ 			</tr>
+ 			<tr>
  				<td>Borrower message (appears in OPAC)</td>
  				<td colspan="4"><textarea name="textmessaging" cols="70" rows="3"><!-- TMPL_VAR NAME="textmessaging" --></textarea></td>

Index: pay.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/pay.tmpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** pay.tmpl	19 Jul 2004 20:33:52 -0000	1.8
--- pay.tmpl	20 Jun 2005 14:20:05 -0000	1.9
***************
*** 3,24 ****
  <h1>Pay Fines for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h1>
  
! 	<form action="/cgi-bin/koha/pay.pl" method="post">
! <table cellspacing="0" cellpadding="5" border="1">
! <tr valign="top">
! 	<td  bgcolor="#99cc33" background="/images/background-mem.gif" colspan="4"><b>FINES &amp; CHARGES</b></td>
! 	<td bgcolor="#99cc33" background="/images/background-mem.gif" colspan="4"><b>AMOUNT OWING</b></td>
  </tr>
  	
  <!-- TMPL_LOOP NAME="loop_pay" -->
! <tr valign="top">
! 	<td><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->"><input type="radio" name="payfine<!-- TMPL_VAR NAME="i" -->" value="no" checked="checked">Unpaid
! 	<input type="radio" name="payfine<!-- TMPL_VAR NAME="i" -->" value="yes">Pay
! 	<input type="radio" name="payfine<!-- TMPL_VAR NAME="i" -->" value="wo">Writeoff
! 	<input type="hidden" name="itemnumber<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="itemnumber" -->">
! 	<input type="hidden" name="accounttype<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="accounttype" -->">
! 	<input type="hidden" name="amount<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="amount'}" -->">
! 	<input type="hidden" name="out<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="amountoutstanding" -->">
! 	<input type="hidden" name="bornum<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="bornum" -->">
! 	<input type="hidden" name="accountno<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="accountno" -->">
  	</td>
  	<td><!-- TMPL_VAR NAME="description" --> <!-- TMPL_VAR NAME="title" --></td>
--- 3,26 ----
  <h1>Pay Fines for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h1>
  
! <form action="/cgi-bin/koha/pay.pl" method="post">
! <table>
! <tr>
! 	<th colspan="3">FINES &amp; CHARGES</th>
! 	<th colspan="2">AMOUNT OWING</th>
  </tr>
  	
  <!-- TMPL_LOOP NAME="loop_pay" -->
! <tr>
! 	<td>
! 		<input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->">
! 		<input type="radio" name="payfine<!-- TMPL_VAR NAME="i" -->" value="no" checked="checked">Unpaid
! 		<input type="radio" name="payfine<!-- TMPL_VAR NAME="i" -->" value="yes">Pay
! 		<input type="radio" name="payfine<!-- TMPL_VAR NAME="i" -->" value="wo">Writeoff
! 		<input type="hidden" name="itemnumber<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="itemnumber" -->">
! 		<input type="hidden" name="accounttype<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="accounttype" -->">
! 		<input type="hidden" name="amount<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="amount'}" -->">
! 		<input type="hidden" name="out<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="amountoutstanding" -->">
! 		<input type="hidden" name="bornum<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="bornum" -->">
! 		<input type="hidden" name="accountno<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="accountno" -->">
  	</td>
  	<td><!-- TMPL_VAR NAME="description" --> <!-- TMPL_VAR NAME="title" --></td>
***************
*** 29,36 ****
  <!-- /TMPL_LOOP -->
  <tr valign="top">
! 	<td colspan="4" align="right"><b>Total Due</b></td>
! 	<td><b><!-- TMPL_VAR NAME="total" --></b></td>
! 	</tr>
! 	<tr valign="top">
  	<td colspan="5" align="right">
  	<input type="submit" name="submit"  value="Pay" class="button"></td>
--- 31,38 ----
  <!-- /TMPL_LOOP -->
  <tr valign="top">
! 	<th colspan="4" align="right">Total Due</th>
! 	<th><!-- TMPL_VAR NAME="total" --></th>
! </tr>
! <tr>
  	<td colspan="5" align="right">
  	<input type="submit" name="submit"  value="Pay" class="button"></td>
***************
*** 39,43 ****
  </form>
  
! <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Return</a> to Member Record
  </div>
  <!-- TMPL_INCLUDE NAME="members-bottom.inc" -->
--- 41,45 ----
  </form>
  
! <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" class="button member">Return to Member Record </a>
  </div>
  <!-- TMPL_INCLUDE NAME="members-bottom.inc" -->