[Koha-cvs] koha/koha-tmpl/intranet-tmpl/default/en/members... [rel_2_2]

[paul poulain]

CVSROOT:	/cvsroot/koha
Module name:	koha
Branch:		rel_2_2
Changes by:	paul poulain <tipaul>	07/04/30 10:05:54

Modified files:
	koha-tmpl/intranet-tmpl/default/en/members: newjmember.tmpl 
	                                            jmemberentry.tmpl 

Log message:
	fix for #1117, child card craziness (from R_2_2_7_1 branch)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/members/newjmember.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.4&r2=1.4.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/members/jmemberentry.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.13.2.1&r2=1.13.2.2

Patches:
Index: newjmember.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/Attic/newjmember.tmpl,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -b -r1.4 -r1.4.2.1
--- newjmember.tmpl	6 Dec 2004 21:10:32 -0000	1.4
+++ newjmember.tmpl	30 Apr 2007 10:05:54 -0000	1.4.2.1
@@ -86,6 +86,22 @@
 						<!-- TMPL_VAR NAME="notes" -->
 						</td>
 					</tr>
+					<tr valign="top" bgcolor="white" >
+						<td>
+						<b>Joining date</b>
+						</td>
+						<td>
+						<!-- TMPL_VAR NAME="joining" -->
+						</td>
+					</tr>
+					<tr valign="top" bgcolor="white" >
+						<td>
+						<b>Expiry date</b>
+						</td>
+						<td>
+						<!-- TMPL_VAR NAME="expiry" -->
+						</td>
+					</tr>
 				</table><p>
 			<!-- /TMPL_IF -->
 	<!-- /TMPL_LOOP -->

Index: jmemberentry.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/Attic/jmemberentry.tmpl,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -u -b -r1.13.2.1 -r1.13.2.2
--- jmemberentry.tmpl	12 Sep 2006 13:25:51 -0000	1.13.2.1
+++ jmemberentry.tmpl	30 Apr 2007 10:05:54 -0000	1.13.2.2
@@ -4,7 +4,7 @@
 	<form action="/cgi-bin/koha/members/newjmember.pl" method="post">
 		<input type="hidden" name="branchcode" value="<!-- TMPL_VAR NAME="branchcode" -->">
 		<input type="hidden" name="expiry" value="<!-- TMPL_VAR NAME="expiry" -->">
-		<input type="hidden" name="expiry" value="<!-- TMPL_VAR NAME="zipcode" -->">
+		<input type="hidden" name="zipcode" value="<!-- TMPL_VAR NAME="zipcode" -->">
 		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="member" -->">
 		<input type="hidden" name="updtype" value="I">
 		<input type="hidden" name="area" value="<!-- TMPL_VAR NAME="area" -->">
@@ -75,6 +75,15 @@
 			<td><input type="text" name="school_child_<!-- TMPL_VAR NAME="i" -->" size="20" value=""></td>
 		</tr>
 		<tr>
+                    <th colspan="5" >LIBRARY USE</th>
+                </tr>
+                <tr>
+                    <td>Joining date (leave blank for today)</td>
+                <td><input type="text" name="joining_child_<!-- TMPL_VAR NAME="i" -->" size="12" maxlength="10" value="<!-- TMPL_VAR name="joining" -->"></td>
+                    <td>Expiry date (leave blank for auto calc)</td>
+                    <td><input type="text" name="expiry_child_<!-- TMPL_VAR NAME="i" -->" size="12" maxlength="10" value="<!-- TMPL_VAR name="expiry" -->"></td>
+                </tr>
+                <tr>
 			<td colspan="5">The 2 following fields are available for your own usage. They can be useful for stat purposes</td>
 		<tr>
 			<td>Sorting field 1</td>