[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/members memberentry.tmpl,1.25,1.26 member-flags.tmpl,1.1,1.2 member-password.tmpl,1.6,1.7 members-home.tmpl,1.8,1.9 member.tmpl,1.10,1.11 moremember.tmpl,1.27,1.28

Paul POULAIN tipaul at users.sourceforge.net
Wed Mar 24 15:59:38 CET 2004


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

Modified Files:
	memberentry.tmpl member-flags.tmpl member-password.tmpl 
	members-home.tmpl member.tmpl moremember.tmpl 
Log Message:
css'ing & merging members management.
memberentry merges 
* memberentry, moremember & insertdata (form, validation & storing)
* and the I series (Institution management)

Index: memberentry.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** memberentry.tmpl	10 Mar 2004 15:14:30 -0000	1.25
--- memberentry.tmpl	24 Mar 2004 14:59:33 -0000	1.26
***************
*** 1,211 ****
  <!-- TMPL_INCLUDE NAME="members-top.inc" -->
  
! <!-- TMPL_IF NAME=addAction -->
! <h1>
! 	Add member
! </h1>
! <!-- TMPL_ELSE -->
! <h1>
! 	Update Member Details
! </h1>
! <!-- /TMPL_IF -->
! <br>
! 
! <form action=/cgi-bin/koha/members/newmember.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=member -->">
! 	<input type=hidden name=updtype value="<!-- TMPL_VAR NAME=updtype -->">
! 
! 	<table border=0 cellspacing=0 cellpadding=5 >
! 
! 	<tr valign=top>
! 		<td COLSPAN=2><input type=reset value="Clear all Fields"></td>
! 		<td COLSPAN=3 ALIGN=RIGHT><font size=4 face='arial,helvetica'>Member# <!-- TMPL_VAR NAME=member -->, Card number* <input type=text name=cardnumber size=10 value="<!-- TMPL_VAR NAME=cardnumber -->"><br></td>
! 	</tr>
! 
! 	<tr valign=top>
! 		<td COLSPAN=3 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>MEMBER PERSONAL DETAILS</b></td>
! 		<td COLSPAN=2 ALIGN=RIGHT background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">*
! 		<input type="radio" name="sex" value="F"<!-- TMPL_IF NAME=female --> checked<!-- /TMPL_IF -->>F
! 		<input type="radio" name="sex" value="M"<!-- TMPL_UNLESS NAME=female --> checked<!-- /TMPL_UNLESS -->> M
! 		&nbsp; &nbsp;  <B>Date of Birth</B> (<!-- TMPL_VAR NAME=dateformat -->)
! 		<input type=text name=dateofbirth size=10 value="<!-- TMPL_VAR NAME=dateofbirth -->">
! 		</td>
! 	</tr>
! 
! 	<tr valign=top bgcolor=white>
! 		<td><FONT SIZE=2>Salutation</FONT></td>
! 		<td><FONT SIZE=2>Initials</FONT></td>
! 		<td><FONT SIZE=2><b> Given Names*</b></FONT></td>
! 		<td><FONT SIZE=2><b> Surname*</b></FONT></td>
! 		<td><FONT SIZE=2> Prefered Name</FONT></td>
! 	</tr>
! 	<tr valign=top bgcolor=white>
! 		<td><!-- TMPL_VAR name="Mr" -->
! 		<SELECT NAME="title">
! 			<option <!-- TMPL_VAR name="title_selected_ " --> value=" ">No Title</option>
! 			<option value="Miss" <!-- TMPL_VAR name="title_Miss" -->>Miss</option>
! 			<option value="Mrs" <!-- TMPL_VAR name="title_Mrs" -->>Mrs</option>
! 			<option value="Ms" <!-- TMPL_VAR name="title_Ms" -->>Ms</option>
! 			<option <!-- TMPL_VAR name="title_Mr" --> value="Mr" >Mr</option>
! 			<option value="Dr" <!-- TMPL_VAR name="title_Dr" -->>Dr</option>
! 			<option value="Sir" <!-- TMPL_VAR name="title_Sir" -->>Sir</option>
! 		</SELECT>
! 		</td>
! 		<td><input type=text name=initials size=5 value="<!-- TMPL_VAR NAME=initials -->"></td>
! 		<td><input type=text name=firstname size=20 value="<!-- TMPL_VAR NAME=firstname -->"></td>
! 		<td><input type=text name=surname size=20 value="<!-- TMPL_VAR NAME=surname -->"></td>
! 		<td><input type=text name=othernames size=20 value="<!-- TMPL_VAR NAME=othernames -->"></td>
! 	</tr>
! 
! 
! 	<tr valign=top bgcolor=white>
! 		<!-- TMPL_IF NAME=ethcatpopup --><!-- TMPL_VAR NAME=ethcatpopup -->
! 		<td colspan=2><FONT SIZE=2>Ethnicity</FONT></td>
! 		<td colspan=2><FONT SIZE=2>Ethnicity Notes</FONT></td>
  		<!-- TMPL_ELSE -->
! 		<td colspan=2>&nbsp;</td><td colspan=2>&nbsp;</td>
  		<!-- /TMPL_IF -->
! 		<td><FONT SIZE=2><b>Membership Category*</b></FONT></td>
! 	</tr>
! 	<tr valign=top bgcolor=white>
! 		<td colspan=2>
  			<!-- TMPL_IF name="ethcatpopup" -->
! 				<select name="ethnicity" size=1>
! 					<!-- TMPL_LOOP NAME=ethnicityloop -->
! 					<option value=<!-- TMPL_VAR NAME=value --><!-- TMPL_VAR NAME=selected -->><!-- TMPL_VAR NAME=label -->
  					<!-- /TMPL_LOOP -->
! 				</select>
  			<!-- /TMPL_IF -->
- 			</td>
- 			<!-- TMPL_IF NAME=ethcatpopup --><!-- TMPL_VAR NAME=ethcatpopup -->
- 			<td colspan=2><input type=text name=ethnicnotes size=40 ></td>
- 			<!-- TMPL_ELSE -->
- 			<td colspan=2>&nbsp;</td>
- 			<!-- /TMPL_IF -->
- 		<td><!-- TMPL_VAR NAME=catcodepopup --></td>
- 	</tr>
- 
- 
- 	<tr valign=top bgcolor="99cc33" >
- 		<td COLSPAN=5 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>MEMBER ADDRESS</b></td>
- 	</tr>
- 
- 	<tr valign=top bgcolor=white>
- 		<td  COLSPAN=3><FONT SIZE=2><b>Postal Address*</b></FONT></td>
- 		<td><FONT SIZE=2><b>Zipcode / Town*</b></FONT></td>
- 		<td><FONT SIZE=2>Joining Branch</FONT></td>
- 	</tr>
- 	<tr valign=top bgcolor=white>
- 		<td COLSPAN=3><input type=text name=address size=40 value="<!-- TMPL_VAR NAME=address -->"></td>
- 		<td>
- 			<input type=text name="zipcode" size=20 value="<!-- TMPL_VAR NAME="zipcode" -->"><br />
- 			<input type=text name=city size=20 value="<!-- TMPL_VAR NAME=city -->">
- 		</td>
- 		<td>
- 			<!-- TMPL_VAR name="CGIbranch" -->
- 		</td>
- 	</tr>
- 
- 
- 	<tr valign=top bgcolor=white>
- 		<td COLSPAN=3><FONT SIZE=2>Street Address if different</FONT></td>
- 		<td><FONT SIZE=2>Zipcode / Town</FONT></td>
- 	</tr>
- 	<tr valign=top bgcolor=white>
- 		<td COLSPAN=3><input type=text name=streetaddress size=40 value="<!-- TMPL_VAR NAME=streetaddress -->"></td>
- 		<td>
- 			<input type=text name="homezipcode" size=20 value="<!-- TMPL_VAR NAME="homezipcode" -->"></br/>
- 			<input type=text name=streetcity size=20 value="<!-- TMPL_VAR NAME=streetcity -->"></td>
- 	</tr>
- 
- 	<tr valign=top bgcolor=white>
- 		<td COLSPAN=2 ><FONT SIZE=2>Phone home</td>
- 		<td><FONT SIZE=2>Fax</td>
- 		<td><FONT SIZE=2>Email</td>
- 		<td><FONT SIZE=2>Text Messaging</td>
- 	</tr>
- 	<tr valign=top bgcolor=white>
- 		<td COLSPAN=2><input type=text name=phone size=20 value="<!-- TMPL_VAR NAME=phone -->"></td>
- 		<td><input type=text name=faxnumber size=20 value="<!-- TMPL_VAR NAME=faxnumber -->"></td>
- 		<td><input type=text name=emailaddress size=20 value="<!-- TMPL_VAR NAME=emailaddress -->"></td>
- 		<td><input type=text name=textmessaging size=20 value="<!-- TMPL_VAR NAME=textmessaging -->"></td>
- 	</tr>
- 
- 
- 	<tr valign=top bgcolor=white>
- 		<td COLSPAN=2 ><FONT SIZE=2>Phone daytime</td>
- 		<td></td>
- 		<td></td>
- 		<td></td>
- 	</tr>
- 	<tr valign=top bgcolor=white>
- 		<td COLSPAN=2><input type=text name=phoneday size=20 value="<!-- TMPL_VAR NAME=phoneday -->"></td>
- 		<td></td>
- 		<td></td>
- 		<td></td>
- 	</tr>
- 
- 
- 	<tr valign=top bgcolor="99cc33">
- 		<td  COLSPAN=5  background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>ALTERNATE CONTACT DETAILS</b></td>
- 	</tr>
- 
- 	<tr valign=top bgcolor=white>
- 		<td   COLSPAN=3 ><FONT SIZE=2><b> Surname*</b></td>
- 		<td><FONT SIZE=2>Phone</td>
- 		<td><FONT SIZE=2><b>Relationship*</b></td>
- 	</tr>
- 	<tr valign=top bgcolor=white>
- 		<td COLSPAN=3 ><input type=text name=contactname size=40 value="<!-- TMPL_VAR NAME=contactname -->"></td>
- 		<td><input type=text name=altphone size=20 value="<!-- TMPL_VAR NAME=altphone -->"></td>
- 		<td>
- 		<select name=altrelationship size=1>
- 		<!-- TMPL_LOOP NAME=relshiploop -->
- 			<OPTION <!-- TMPL_VAR NAME=selected -->><!-- TMPL_VAR NAME=relationship -->
- 		<!-- /TMPL_LOOP -->
- 		</select>
- 		</td>
- 	</tr>
- 
- 	<tr valign=top bgcolor=white>
- 		<td><FONT SIZE=2> Notes</font></td>
- 		<td COLSPAN=4><textarea name=altnotes wrap=physical cols=70 rows=3><!-- TMPL_VAR NAME=altnotes --></textarea></td>
- 	</tr>
- 
- 
- 	<tr valign=top bgcolor="99cc33">
- 		<td  COLSPAN=5  background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>LIBRARY USE</B></td>
- 	</tr>
- 
- 	<tr valign=top >
- 		<td><FONT SIZE=2> Notes</font></td>
- 		<td COLSPAN=4><textarea name=borrowernotes wrap=physical cols=70 rows=3><!-- TMPL_VAR NAME=borrowernotes --></textarea></td>
- 	</tr>
- 
- 	<!-- TMPL_IF NAME=modify -->
- 		<tr><td COLSPAN=5><Font size=2>FLAGS</font></td></tr>
- 		<!-- TMPL_LOOP NAME=flagloop -->
- 		<tr>
- 			<td COLSPAN=2><!-- TMPL_VAR NAME=html --></td>
- 			<td COLSPAN=3><input type=radio name="<!-- TMPL_VAR NAME=name -->" value="1" <!-- TMPL_VAR NAME=yes -->>Yes
- 			<input type=radio name="<!-- TMPL_VAR NAME=name -->" value="0" <!-- TMPL_VAR NAME=no -->>No
- 			</td>
- 		</tr>
- 		<!-- /TMPL_LOOP -->
- 	<!-- /TMPL_IF -->
- 
  
- 	<tr>
- 		<td></td>
- 		<td>
- 			<input type=hidden name=type value=<!-- TMPL_VAR NAME="type" -->>
- 			<input type="submit" value="save" class="button">
- 		</td>
- 	</tr>
- 	</table>
- </form>
  
  <!-- TMPL_INCLUDE NAME="members-bottom.inc" -->
--- 1,270 ----
  <!-- TMPL_INCLUDE NAME="members-top.inc" -->
  
! <div id="mainbloc">
! 	<!-- TMPL_IF NAME=addAction -->
! 	<h1>
! 		Add member
! 	</h1>
! 	<!-- TMPL_ELSE -->
! 	<h1>
! 		Update Member Details
! 	</h1>
! 	<!-- /TMPL_IF -->
! 
! 	<!-- TMPL_IF Name="NOK" -->
! 		<h1 >ERROR</H1>
! 		<div id="problem">
! 			<p>The following fields have a forbidden value. Correct them and press OK again :</p>
! 			<!-- TMPL_IF name="ERROR_cardnumber" -->
! 				Card number<br/>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF name="ERROR_invalid_cardnumber" -->
! 				Invalid cardnumber<br/>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF name="ERROR_gender" -->
! 				Gender<br/>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF name="ERROR_firstname" -->
! 				Given Names<br/>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF name="ERROR_surname" -->
! 				Surname<br/>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF name="aERROR_ddress" -->
! 				Postal Street Address<br/>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF name="ERROR_city" -->
! 				Postal city<br/>
! 			<!-- /TMPL_IF -->
! 		</div>
! 	<!-- /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=member -->">
! 		<input type=hidden name=updtype value="<!-- TMPL_VAR NAME=updtype -->">
! 		<!-- TMPL_IF NAME=addAction -->
! 			<input type="hidden" name="op" value="add">
  		<!-- TMPL_ELSE -->
! 			<input type="hidden" name="op" value="modify">
  		<!-- /TMPL_IF -->
! 		<table>
! 			<tr>
! 				<td colspan=5>Member# <!-- TMPL_VAR NAME=member -->, Card number* <input type=text name=cardnumber size=10 value="<!-- TMPL_VAR NAME=cardnumber -->"></td>
! 			</tr>
! 			<tr>
! 				<th colspan=5>MEMBER PERSONAL DETAILS</th>
! 			</tr>
! 			<tr>
! 				<td><!-- TMPL_UNLESS name="institution" -->Salutation<!-- /TMPL_UNLESS --></td>
! 				<td><!-- TMPL_UNLESS name="institution" -->Initials<!-- /TMPL_UNLESS --></td>
! 				<td><!-- TMPL_UNLESS name="institution" --><b> Given Names*</b><!-- /TMPL_UNLESS --></td>
! 				<td><!-- TMPL_IF name="institution" --><b>Institution name*</b><!-- TMPL_ELSE --><b> Surname*</b><!-- /TMPL_IF --></td>
! 				<td><!-- TMPL_UNLESS name="institution" -->Prefered Name<!-- /TMPL_UNLESS --></td>
! 			</tr>
! 			<tr>
! 				<td>
! 				<!-- TMPL_UNLESS name="institution" -->
! 				<!-- TMPL_VAR name="Mr" -->
! 				<SELECT NAME="title">
! 					<option <!-- TMPL_VAR name="title_selected_ " --> value=" ">No Title</option>
! 					<option value="Miss" <!-- TMPL_VAR name="title_Miss" -->>Miss</option>
! 					<option value="Mrs" <!-- TMPL_VAR name="title_Mrs" -->>Mrs</option>
! 					<option value="Ms" <!-- TMPL_VAR name="title_Ms" -->>Ms</option>
! 					<option <!-- TMPL_VAR name="title_Mr" --> value="Mr" >Mr</option>
! 					<option value="Dr" <!-- TMPL_VAR name="title_Dr" -->>Dr</option>
! 					<option value="Sir" <!-- TMPL_VAR name="title_Sir" -->>Sir</option>
! 				</SELECT>
! 				<!-- /TMPL_UNLESS -->
! 				</td>
! 				<td>
! 					<!-- TMPL_UNLESS name="institution" -->
! 						<input type=text name=initials size=5 value="<!-- TMPL_VAR NAME=initials -->">
! 					<!-- /TMPL_UNLESS -->
! 				</td>
! 				<td>
! 				<!-- TMPL_UNLESS name="institution" -->
! 					<input type=text name=firstname size=20 value="<!-- TMPL_VAR NAME=firstname -->">
! 					<!-- /TMPL_UNLESS -->
! 				</td>
! 				<td><input type=text name=surname size=20 value="<!-- TMPL_VAR NAME=surname -->"></td>
! 				<td>
! 					<!-- TMPL_UNLESS name="institution" -->
! 						<input type=text name=othernames size=20 value="<!-- TMPL_VAR NAME=othernames -->">
! 					<!-- /TMPL_UNLESS -->
! 				</td>
! 			</tr>
! 
! 			<tr>
! 				<td colspan=2>
! 				<!-- TMPL_UNLESS name="institution" -->
! 					<input type="radio" name="sex" value="F"<!-- TMPL_IF NAME=female --> checked<!-- /TMPL_IF -->>F
! 					<input type="radio" name="sex" value="M"<!-- TMPL_UNLESS NAME=female --> checked<!-- /TMPL_UNLESS -->> M
! 				<!-- /TMPL_UNLESS -->
! 
! 				</td>
! 				<td colspan=2>
! 					<!-- TMPL_UNLESS name="institution" -->
! 					Date of Birth (<!-- TMPL_VAR NAME=dateformat -->)
! 					<input type=text name=dateofbirth size=10 value="<!-- TMPL_VAR NAME=dateofbirth -->">
! 					<!-- /TMPL_UNLESS -->
! 				</td>
! 				<td>
! 					Category <!-- TMPL_VAR NAME=catcodepopup -->
! 				</td>
! 			</tr>
! 			<!-- TMPL_IF NAME=ethcatpopup -->
! 				<tr valign=top bgcolor=white>
! 					<!-- TMPL_VAR NAME=ethcatpopup -->
! 					<td colspan=2>Ethnicity</td>
! 					<td colspan=2>Ethnicity Notes</td>
! 				</tr>
! 			<!-- /TMPL_IF -->
  			<!-- TMPL_IF name="ethcatpopup" -->
! 				<tr valign=top bgcolor=white>
! 					<td colspan=2>
! 						<!-- TMPL_IF name="ethcatpopup" -->
! 							<select name="ethnicity" size=1>
! 								<!-- TMPL_LOOP NAME=ethnicityloop -->
! 								<option value=<!-- TMPL_VAR NAME=value --><!-- TMPL_VAR NAME=selected -->><!-- TMPL_VAR NAME=label -->
! 								<!-- /TMPL_LOOP -->
! 							</select>
! 						<!-- /TMPL_IF -->
! 						</td>
! 						<!-- TMPL_IF NAME=ethcatpopup --><!-- TMPL_VAR NAME=ethcatpopup -->
! 						<td colspan=2><input type=text name=ethnicnotes size=40 ></td>
! 						<!-- TMPL_ELSE -->
! 						<td colspan=2>&nbsp;</td>
! 						<!-- /TMPL_IF -->
! 				</tr>
! 			<!-- /tmpl_if -->
! 
! 			<tr>
! 				<th colspan=5>MEMBER ADDRESS</th>
! 			</tr>
! 
! 			<tr>
! 				<td  colspan=2><b>Postal Address*</b></td>
! 				<td><b>Zipcode</b></td>
! 				<td><b> Town*</b></td>
! 				<td>Joining Branch</td>
! 			</tr>
! 			<tr>
! 				<td colspan=2><input type="text" name="address" size="40" value="<!-- TMPL_VAR NAME=address -->"></td>
! 				<td>
! 					<input type=text name="zipcode" size=10 maxlength=20 value="<!-- TMPL_VAR NAME="zipcode" -->">
! 				</td>
! 				<td>
! 					<input type=text name="city" size=20 value="<!-- TMPL_VAR NAME=city -->">
! 				</td>
! 				<td>
! 					<!-- TMPL_VAR name="CGIbranch" -->
! 				</td>
! 			</tr>
! 
! 
! 			<tr>
! 				<td colspan=2>Street Address if different</td>
! 				<td></td>
! 				<td></td>
! 			</tr>
! 			<tr>
! 				<td colspan=2><input type=text name="streetaddress" size=40 value="<!-- TMPL_VAR NAME=streetaddress -->"></td>
! 				<td>
! 					<input type=text name="homezipcode" size=10 maxlength=20 value="<!-- TMPL_VAR NAME="homezipcode" -->">
! 				</td>
! 				<td>
! 					<input type=text name=streetcity size=20 value="<!-- TMPL_VAR NAME=streetcity -->"></td>
! 			</tr>
! 
! 			<tr>
! 				<td colspan=2 >Phone home</td>
! 				<td>Fax</td>
! 				<td>Email</td>
! 				<td>Text Messaging</td>
! 			</tr>
! 			<tr>
! 				<td colspan=2><input type=text name=phone size=20 value="<!-- TMPL_VAR NAME=phone -->"></td>
! 				<td><input type=text name=faxnumber size=20 value="<!-- TMPL_VAR NAME=faxnumber -->"></td>
! 				<td><input type=text name=emailaddress size=20 value="<!-- TMPL_VAR NAME=emailaddress -->"></td>
! 				<td><input type=text name=textmessaging size=20 value="<!-- TMPL_VAR NAME=textmessaging -->"></td>
! 			</tr>
! 
! 
! 			<tr>
! 				<td colspan=2 >Phone daytime</td>
! 				<td></td>
! 				<td></td>
! 				<td></td>
! 			</tr>
! 			<tr>
! 				<td colspan=2><input type=text name="phoneday" size="20" value="<!-- TMPL_VAR NAME=phoneday -->"></td>
! 				<td></td>
! 				<td></td>
! 				<td></td>
! 			</tr>
! 
! 			<!-- TMPL_UNLESS name="institution" -->
! 			<tr>
! 				<th colspan=5>ALTERNATE CONTACT DETAILS</th>
! 			</tr>
! 
! 			<tr>
! 				<td   colspan=3 ><b> Surname*</b></td>
! 				<td>Phone</td>
! 					<td>Relationship</td>
! 			</tr>
! 			<tr>
! 				<td colspan=3 ><input type=text name=contactname size=40 value="<!-- TMPL_VAR NAME=contactname -->"></td>
! 				<td><input type=text name=altphone size=20 value="<!-- TMPL_VAR NAME=altphone -->"></td>
! 					<td>
! 					<select name=altrelationship size=1>
! 					<!-- TMPL_LOOP NAME=relshiploop -->
! 						<OPTION <!-- TMPL_VAR NAME=selected -->><!-- TMPL_VAR NAME=relationship -->
  					<!-- /TMPL_LOOP -->
! 					</select>
! 					</td>
! 			</tr>
! 				<!-- /TMPL_UNLESS -->
! 
! 			<tr>
! 				<td> Notes</td>
! 				<td colspan=4><textarea name=altnotes wrap=physical cols=70 rows=3><!-- TMPL_VAR NAME=altnotes --></textarea></td>
! 			</tr>
! 
! 
! 			<tr>
! 				<th colspan=5 >LIBRARY USE</th>
! 			</tr>
! 
! 			<tr>
! 				<td> Notes</td>
! 				<td colspan=4><textarea name=borrowernotes wrap=physical cols=70 rows=3><!-- TMPL_VAR NAME=borrowernotes --></textarea></td>
! 			</tr>
! 
! 			<!-- TMPL_IF NAME=modify -->
! 				<tr><td colspan=5>FLAGS</td></tr>
! 				<!-- TMPL_LOOP NAME=flagloop -->
! 				<tr>
! 					<td colspan=2><!-- TMPL_VAR NAME=html --></td>
! 					<td colspan=3><input type=radio name="<!-- TMPL_VAR NAME=name -->" value="1" <!-- TMPL_VAR NAME=yes -->>Yes
! 					<input type=radio name="<!-- TMPL_VAR NAME=name -->" value="0" <!-- TMPL_VAR NAME=no -->>No
! 					</td>
! 				</tr>
! 				<!-- /TMPL_LOOP -->
  			<!-- /TMPL_IF -->
  
  
+ 			<tr>
+ 				<td></td>
+ 				<td>
+ 					<input type=hidden name=type value=<!-- TMPL_VAR NAME="type" -->>
+ 					<input type=reset value="Clear all Fields" class="button">
+ 					<input type="submit" value="save" class="button">
+ 				</td>
+ 			</tr>
+ 		</table>
+ 	</form>
+ </div>
  <!-- TMPL_INCLUDE NAME="members-bottom.inc" -->

Index: member-flags.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/member-flags.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** member-flags.tmpl	10 Mar 2004 15:15:15 -0000	1.1
--- member-flags.tmpl	24 Mar 2004 14:59:35 -0000	1.2
***************
*** 1,28 ****
  <!-- TMPL_INCLUDE NAME="members-top.inc" -->
! 
! <h2><!-- TMPL_VAR NAME=surname -->, <!-- TMPL_VAR NAME=firstname --></h2>
! <form method=post action="/cgi-bin/koha/members/member-flags.pl">
! 	<input type=hidden name=member value=<!-- TMPL_VAR NAME=member -->>
! 	<input type=hidden name=newflags value=1>
! 	<table border=1>
! 	<tr><th background=/koha/images/background-mem.gif colspan=3>FLAGS</th></tr>
! 	<!-- TMPL_LOOP NAME=loop -->
! 		<tr>
! 			<td>
! 				<input type=checkbox name="flag-<!-- TMPL_VAR NAME=bit -->" <!-- TMPL_VAR NAME=checked -->>
! 			</td>
! 			<td>
! 				<!-- TMPL_VAR NAME=flag -->
! 			</td>
! 			<td>
! 				<!-- TMPL_VAR NAME=flagdesc -->
! 			</td>
! 		</tr>
! 	<!-- /TMPL_LOOP -->
! 	</table>
! 
! 	<p>
! 	<input type=submit value="Set Flags" class="button">
! </form>
! 
  <!-- TMPL_INCLUDE NAME="members-bottom.inc" -->
--- 1,19 ----
  <!-- TMPL_INCLUDE NAME="members-top.inc" -->
! <div id="mainbloc">
! 	<div id="bloc25">
! 		<div id="bloctitle">FLAGS for <!-- TMPL_VAR NAME=surname -->, <!-- TMPL_VAR NAME=firstname --></div>
! 		<form method=post action="/cgi-bin/koha/members/member-flags.pl">
! 			<input type=hidden name=member value=<!-- TMPL_VAR NAME=member -->>
! 			<input type=hidden name=newflags value=1>
! 			<!-- TMPL_LOOP NAME=loop -->
! 				<p>
! 					<input type=checkbox name="flag-<!-- TMPL_VAR NAME=bit -->" <!-- TMPL_VAR NAME=checked -->>
! 					<!-- TMPL_VAR NAME=flag -->
! 					<!-- TMPL_VAR NAME=flagdesc -->
! 				</p>
! 			<!-- /TMPL_LOOP -->
! 			<input type=submit value="Set Flags" class="button">
! 		</form>
! 	</div>
! </div>
  <!-- TMPL_INCLUDE NAME="members-bottom.inc" -->

Index: member-password.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/member-password.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** member-password.tmpl	11 Feb 2004 09:02:55 -0000	1.6
--- member-password.tmpl	24 Mar 2004 14:59:35 -0000	1.7
***************
*** 1,23 ****
- <HTML>
- 
  <!-- TMPL_INCLUDE NAME="members-top.inc" -->
  
! <!-- TMPL_IF NAME=newpassword -->
! Click <a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR NAME=member -->">here</a> to continue to see Member Info.
! 
! <!-- TMPL_ELSE -->
! 	<h2><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="othernames" --> <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></h2>
! 	<form method=post>
! 	<input type=hidden name=member value=<!-- TMPL_VAR NAME=member -->>
! 	<!-- TMPL_IF NAME="warn" -->
! 		You have entered a UserID that already exists.  Please choose another one.<br>
! 	<!-- /TMPL_IF -->
! 	New UserID: <input name=newuserid size=20 value=<!-- TMPL_VAR NAME=userid -->> <br>
! 	New Password: <input name=newpassword size=20 value=<!-- TMPL_VAR NAME=defaultnewpassword -->>
! 	<p>
! 	<input type=submit value="Confirm Password" class="button">
! 	</form>
! <!-- /TMPL_IF -->
! 
  
  <!-- TMPL_INCLUDE NAME="members-bottom.inc" -->
--- 1,17 ----
  <!-- TMPL_INCLUDE NAME="members-top.inc" -->
  
! <div id="mainbloc">
! 		<div id="bloc25">
! 		<div id="bloctitle"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="othernames" --> <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></div>
! 		<form method=post>
! 			<input type=hidden name=member value=<!-- TMPL_VAR NAME=member -->>
! 			<!-- TMPL_IF NAME="warn" -->
! 				You have entered a UserID that already exists.  Please choose another one.<br/>
! 			<!-- /TMPL_IF -->
! 			New UserID: <input name=newuserid size=20 value=<!-- TMPL_VAR NAME=userid -->> <br/>
! 			New Password: <input name=newpassword size=20 value=<!-- TMPL_VAR NAME=defaultnewpassword -->><br/>
! 			<input type=submit value="Confirm Password" class="button">
! 		</form>
! </div>
  
  <!-- TMPL_INCLUDE NAME="members-bottom.inc" -->

Index: members-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** members-home.tmpl	10 Mar 2004 15:14:30 -0000	1.8
--- members-home.tmpl	24 Mar 2004 14:59:35 -0000	1.9
***************
*** 1,29 ****
  <!-- TMPL_INCLUDE NAME="members-top.inc" -->
  
! <h1>Members</h1><P>
! 
! 
! <table border=1 cellspacing=0 cellpadding=10 height="100" >
! <tr VALIGN=TOP  >
! <td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
! <FORM ACTION="/cgi-bin/koha/members/member.pl" method=post><FONT SIZE=4>
! <b>Member Search</B>
! </FONT>
! <INPUT TYPE="text" size=50 name=member >
! <p>Renew Items, view add, modify and delete records, all by starting with this search. Type a borrower name, part of a name, or number in the field above and hit the enter key to activate search</p>
! </td></form><tr>
! </table>
! 
! <P>
! 
! <table border=1 cellspacing=0 cellpadding=10 height="100" >
! 	<tr VALIGN=TOP  >
! 		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
! 			<FONT SIZE=4><b>Browse Members</B></FONT>
! 		</td>
! 	</tr>
! 	<TR VALIGN=TOP>
! 		<TD>
! 			<CENTER><B>
  			<A HREF="/cgi-bin/koha/members/member.pl?member=a">A</a> ||
  			<A HREF="/cgi-bin/koha/members/member.pl?member=b">B</a> ||
--- 1,17 ----
  <!-- TMPL_INCLUDE NAME="members-top.inc" -->
+ <div id="mainbloc">
+ <h1>Members</h1>
  
! <div id="bloc25">
! 	<div id="bloctitle">Member Search</div>
! 	<FORM ACTION="/cgi-bin/koha/members/member.pl" method=post>
! 		<input type="text" size=50 name=member >
! 		<input type="submit" class="button" value="OK">
! 		<p>Renew Items, view add, modify and delete records, all by starting with this search.</p>
! 		<p>Type a borrower name, part of a name, or number in the field above and hit the enter key to activate search</p>
! 	</form>
! </div>
! <div id="bloc25">
! 			<div id="bloctitle">Browse Members</div>
  			<A HREF="/cgi-bin/koha/members/member.pl?member=a">A</a> ||
  			<A HREF="/cgi-bin/koha/members/member.pl?member=b">B</a> ||
***************
*** 52,58 ****
  			<A HREF="/cgi-bin/koha/members/member.pl?member=y">Y</a> ||
  			<A HREF="/cgi-bin/koha/members/member.pl?member=z">Z</a>
! 			</B>
! 		</TD>
! 	</TR>
! </TABLE>
  <!-- TMPL_INCLUDE NAME="members-bottom.inc" -->
--- 40,44 ----
  			<A HREF="/cgi-bin/koha/members/member.pl?member=y">Y</a> ||
  			<A HREF="/cgi-bin/koha/members/member.pl?member=z">Z</a>
! </div>
! </div>
  <!-- TMPL_INCLUDE NAME="members-bottom.inc" -->

Index: member.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** member.tmpl	10 Mar 2004 15:14:30 -0000	1.10
--- member.tmpl	24 Mar 2004 14:59:35 -0000	1.11
***************
*** 1,48 ****
- <HTML>
- 
  <!-- TMPL_INCLUDE NAME="members-top.inc" -->
  
! <h1>Member Search</h1><br>
! 
! <form action="/cgi-bin/koha/members/member.pl" method=post>
!   <input type=text name="member" value="<!-- TMPL_VAR NAME=member -->">
!   <input type=reset name="reset" value="clr">
! </form>
! 
! You Searched for <!-- TMPL_VAR NAME=member --><p>
! <table>
!   <tr bgcolor="#99cc33">
!     <td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><b>Card</b></td>
!     <td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><b>Surname</b></td>
!     <td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><b>Firstname</b></td>
!     <td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><b>Category</b></td>
!     <td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><b>Address</b></td>
!     <td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><b>OD/Issues</b></td>
!     <td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><b>Charges</b></td>
!     <td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><b>Notes</b></td>
!   </tr>
!   
!   <!-- TMPL_LOOP NAME=resultsloop -->
!     <!-- TMPL_IF NAME="background" -->
!     <TR bgcolor="#ffffcc">
!     <!-- TMPL_ELSE -->
!     <TR bgcolor=white>
!     <!-- /TMPL_IF -->
!       <td><!-- TMPL_VAR NAME=cardnumber --></td>
!       <td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME=borrowernumber -->"><!-- TMPL_VAR NAME=surname --></td>
!       <td><!-- TMPL_VAR NAME=firstname --></a></td>
!       <td><!-- TMPL_VAR NAME=categorycode --></td>
!       <td><!-- TMPL_VAR NAME=streetaddress --> <!-- TMPL_VAR NAME=city --></td>
!       <td><!-- TMPL_VAR NAME=odissue --></td>
!       <td><!-- TMPL_VAR NAME=fines --></td>
!       <td><!-- TMPL_VAR NAME=borrowernotes --></td>
!     </tr>
!   <!-- /TMPL_LOOP -->
! </table>
  
! <form action=/cgi-bin/koha/members/simpleredirect.pl method=post>
! <input type=submit class="button" value="Add member" title="Add member" alt="Add member">
! <INPUT TYPE="radio" name="chooseform" value="adult" checked>Adult
! <INPUT TYPE="radio" name="chooseform" value="organisation" >Organisation
! </form>
  <!-- TMPL_INCLUDE NAME="members-bottom.inc" -->
--- 1,49 ----
  <!-- TMPL_INCLUDE NAME="members-top.inc" -->
+ <div id="mainbloc">
+ <h1>Member Search</h1>
  
! <div id="bloc100">
! 	<div id="bloctitle">Search on</div>
! 	<form action="/cgi-bin/koha/members/member.pl" method=post>
! 		<input type=text name="member" value="<!-- TMPL_VAR NAME=member -->">
! 		<input type="submit" class="button" value="OK">
! 	</form>
! </div>
  
! <div id="bloc100">
! 	<div id="bloctitle">You Searched for <!-- TMPL_VAR NAME=member --></div>
! 	<table>
! 		<tr>
! 			<th>Card</th>
! 			<th>Surname</th>
! 			<th>Firstname</th>
! 			<th>Category</th>
! 			<th>Address</th>
! 			<th>OD/Issues</th>
! 			<th>Charges</th>
! 			<th>Notes</th>
! 		</tr>
! 		<!-- TMPL_LOOP NAME=resultsloop -->
! 			<!-- TMPL_IF NAME="background" -->
! 				<TR bgcolor="#ffffcc">
! 			<!-- TMPL_ELSE -->
! 				<TR bgcolor=white>
! 			<!-- /TMPL_IF -->
! 				<td><!-- TMPL_VAR NAME=cardnumber --></td>
! 				<td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME=borrowernumber -->"><!-- TMPL_VAR NAME=surname --></td>
! 				<td><!-- TMPL_VAR NAME=firstname --></a></td>
! 				<td><!-- TMPL_VAR NAME=categorycode --></td>
! 				<td><!-- TMPL_VAR NAME=streetaddress --> <!-- TMPL_VAR NAME=city --></td>
! 				<td><!-- TMPL_VAR NAME=odissue --></td>
! 				<td><!-- TMPL_VAR NAME=fines --></td>
! 				<td><!-- TMPL_VAR NAME=borrowernotes --></td>
! 			</tr>
! 		<!-- /TMPL_LOOP -->
! 	</table>
! 	<form action=/cgi-bin/koha/members/simpleredirect.pl method=post>
! 	<input type=submit class="button" value="Add member" title="Add member" alt="Add member">
! 	<INPUT TYPE="radio" name="chooseform" value="adult" checked>Adult
! 	<INPUT TYPE="radio" name="chooseform" value="organisation" >Organisation
! 	</form>
! </div>
  <!-- TMPL_INCLUDE NAME="members-bottom.inc" -->

Index: moremember.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** moremember.tmpl	10 Mar 2004 15:14:30 -0000	1.27
--- moremember.tmpl	24 Mar 2004 14:59:35 -0000	1.28
***************
*** 1,43 ****
  <!-- TMPL_INCLUDE NAME="members-top.inc" -->
  
! <!-- main site -->
! 
! 
! <h1><!-- TMPL_VAR NAME=firstname --> <!-- TMPL_VAR NAME=surname --></h1><P>
! <p>
! 
! <TABLE  CELLSPACING=0  CELLPADDING=5 border=1 align=left width=270>
! 	<TR VALIGN=TOP>
! 		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>MEMBERSHIP RECORD</TD>
! 	</TR>
! 
! 	<tr VALIGN=TOP  >
! 	<TD>
! 		<FONT SIZE=2  face="arial, helvetica"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="othernames" --> <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_IF name="IS_ADULT" -->(<!-- TMPL_VAR NAME="firstname" -->, <!-- TMPL_VAR NAME="initials" -->)<!-- /TMPL_IF --><p>
! 		Card number: <!-- TMPL_VAR NAME="cardnumber" --><BR>
! 		Postal Address: <!-- TMPL_VAR NAME="streetaddress" -->, <!-- TMPL_VAR name="zipcode" --> <!-- TMPL_VAR NAME="city" --><BR>
! 		<!-- TMPL_UNLESS name="I" -->Home Address: <!-- TMPL_VAR NAME="physstreet" -->, <!-- TMPL_VAR name="homezipcode" --> <!-- TMPL_VAR NAME="streetcity" --><BR>
! 		Phone home: <!-- TMPL_VAR NAME="phone" --><BR><!-- /TMPL_UNLESS -->
! 		Phone daytime: <!-- TMPL_VAR NAME="phoneday" --><BR>
! 		Fax: <!-- TMPL_VAR NAME="faxnumber" --><BR>
  		E-mail: <a href="mailto:<!-- TMPL_VAR NAME="emailaddress" -->"><!-- TMPL_VAR NAME="emailaddress" --></a><br>
  		Text messaging: <!-- TMPL_VAR NAME="textmessaging" --><p>
! 		Membership Number: <!-- TMPL_VAR NAME="borrowernumber" --><BR>
! 		Membership Category: <!-- TMPL_VAR NAME="categorycode" --><BR>
! 		Fee:$30/year, Paid<BR>
! 		Joined: <!-- TMPL_VAR NAME="dateenrolled" -->,  Expires: <!-- TMPL_VAR NAME="expiry" --><BR>
! 		Joining Branch: <!-- TMPL_VAR NAME="branchcode" --><P>
  		<!-- TMPL_IF NAME="printethnicityline" -->
  			Ethnicity: <!-- TMPL_VAR NAME="ethnicity" -->, <!-- TMPL_VAR NAME="ethnotes" --><br>
  		<!-- /TMPL_IF -->
  		<!-- TMPL_UNLESS name="I" -->
! 			DoB: <!-- TMPL_VAR NAME="dateofbirth" --><BR>
! 			Sex: <!-- TMPL_VAR NAME="sex" --><P>
! 			Alternative<!-- /TMPL_UNLESS --> Contact: <!-- TMPL_VAR NAME="contactname" --><BR>
! 		Phone: <!-- TMPL_VAR NAME="altphone" --><BR>
  		<!-- TMPL_UNLESS name="I" -->
! 			Relationship: <!-- TMPL_VAR NAME="altrelationship" --><BR>
  		<!-- /TMPL_UNLESS -->
! 		Notes: <!-- TMPL_VAR NAME="altnotes" --><P>
  		<!-- TMPL_UNLESS name="I" -->
  			<!-- TMPL_IF NAME="isguarantee" -->
--- 1,40 ----
  <!-- TMPL_INCLUDE NAME="members-top.inc" -->
  
! <div id="mainbloc">
! 	<h1><!-- TMPL_VAR NAME=firstname --> <!-- TMPL_VAR NAME=surname --></h1>
! 	<div id="bloc25">
! 		<div id="bloctitle">MEMBERSHIP RECORD</div>
! 		<!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="othernames" --> <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_IF name="IS_ADULT" -->(<!-- TMPL_VAR NAME="firstname" -->, <!-- TMPL_VAR NAME="initials" -->)<!-- /TMPL_IF -->
! 		<p>Card number: <!-- TMPL_VAR NAME="cardnumber" --><br>
! 		Postal Address: <!-- TMPL_VAR NAME="streetaddress" -->, <!-- TMPL_VAR name="zipcode" --> <!-- TMPL_VAR NAME="city" --><br>
! 		<!-- TMPL_UNLESS name="I" -->Home Address: <!-- TMPL_VAR NAME="physstreet" -->, <!-- TMPL_VAR name="homezipcode" --> <!-- TMPL_VAR NAME="streetcity" --><br>
! 		Phone home: <!-- TMPL_VAR NAME="phone" --><br><!-- /TMPL_UNLESS -->
! 		Phone daytime: <!-- TMPL_VAR NAME="phoneday" --><br>
! 		Fax: <!-- TMPL_VAR NAME="faxnumber" --><br>
  		E-mail: <a href="mailto:<!-- TMPL_VAR NAME="emailaddress" -->"><!-- TMPL_VAR NAME="emailaddress" --></a><br>
  		Text messaging: <!-- TMPL_VAR NAME="textmessaging" --><p>
! 		Membership Number: <!-- TMPL_VAR NAME="borrowernumber" --><br>
! 		Membership Category: <!-- TMPL_VAR NAME="categorycode" --><br>
! 		Fee:$30/year, Paid<br>
! 		Joined: <!-- TMPL_VAR NAME="dateenrolled" -->,  Expires: <!-- TMPL_VAR NAME="expiry" --><br>
! 		Joining branch: <!-- TMPL_VAR NAME="branchcode" -->
! 		</p>
! 		<p>
  		<!-- TMPL_IF NAME="printethnicityline" -->
  			Ethnicity: <!-- TMPL_VAR NAME="ethnicity" -->, <!-- TMPL_VAR NAME="ethnotes" --><br>
  		<!-- /TMPL_IF -->
  		<!-- TMPL_UNLESS name="I" -->
! 			DoB: <!-- TMPL_VAR NAME="dateofbirth" --><br>
! 			Sex: <!-- TMPL_VAR NAME="sex" --><br>
! 			Alternative
! 		<!-- /TMPL_UNLESS -->
! 		Contact: <!-- TMPL_VAR NAME="contactname" --><br>
! 		Phone: <!-- TMPL_VAR NAME="altphone" --><br>
  		<!-- TMPL_UNLESS name="I" -->
! 			Relationship: <!-- TMPL_VAR NAME="altrelationship" --><br>
  		<!-- /TMPL_UNLESS -->
! 		Notes: <!-- TMPL_VAR NAME="altnotes" -->
! 		</p>
! 		<p>
  		<!-- TMPL_UNLESS name="I" -->
  			<!-- TMPL_IF NAME="isguarantee" -->
***************
*** 52,58 ****
  			<!-- /TMPL_IF -->
  		<!-- /TMPL_UNLESS -->
! 		<P>
! 		General Notes: <!--<A HREF="popbox.html" onclick="messenger(200,250,'Form that lets you add to and delete notes.'); return false">-->
! 		<!-- TMPL_VAR NAME="borrowernotes" --><!--</a>-->
  		<p align=right>
  		</font>
--- 49,57 ----
  			<!-- /TMPL_IF -->
  		<!-- /TMPL_UNLESS -->
! 		</p>
! 		<p>
! 			General Notes: <!--<A HREF="popbox.html" onclick="messenger(200,250,'Form that lets you add to and delete notes.'); return false">-->
! 			<!-- TMPL_VAR NAME="borrowernotes" --><!--</a>-->
! 		</p>
  		<p align=right>
  		</font>
***************
*** 79,83 ****
  		<!-- /TMPL_IF -->
  		<form action="javascript:confirm_deletion()">
!                         <input type=hidden name=member value="<!-- TMPL_VAR NAME="bornum" -->">
  			<INPUT TYPE=submit class="button" value="Delete">
  		</form>
--- 78,82 ----
  		<!-- /TMPL_IF -->
  		<form action="javascript:confirm_deletion()">
! 			<input type=hidden name=member value="<!-- TMPL_VAR NAME="bornum" -->">
  			<INPUT TYPE=submit class="button" value="Delete">
  		</form>
***************
*** 90,118 ****
  			<input type=submit class="button" value="Modify User Flags">
  		</form>
  
! 	</TD>
! 	</TR>
! </TABLE>
! 
! <img src="<!-- TMPL_VAR name="themelang" -->/images/holder.gif" width=16 height=800 align=left>
! 
! <TABLE  CELLSPACING=0  CELLPADDING=5 border=1 >
! 	<TR VALIGN=TOP>
! 		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif" colspan=2><B>FINES & CHARGES</TD>
! 	</TR>
! 	<TMPL_IF name="totaldue">
! 		<tr valign="top">
! 			<td>Total due</td>
! 			<td><!-- TMPL_VAR name="totaldue"--></td>
! 		</tr>
! 	<TMPL_ELSE>
! 		<tr valign="top">
! 			<td colspan=2>No debts</td>
! 		</tr>
! 	</TMPL_IF>
! 	<tr VALIGN=TOP  >
! 	<TD colspan=2 align=right>
  		<p>
- 			<br>
  			<a class="button" href="/cgi-bin/koha/boraccount.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">
  				View Account
--- 89,103 ----
  			<input type=submit class="button" value="Modify User Flags">
  		</form>
+ 	</div>
  
! 	<div id="bloc25">
! 		<div id="bloctitle">FINES & CHARGES</div>
! 		<!-- TMPL_IF name="totaldue" -->
! 			Total due <!-- TMPL_VAR name="totaldue"-->
! 			</tr>
! 		<TMPL_ELSE>
! 			No debts
! 		</TMPL_IF>
  		<p>
  			<a class="button" href="/cgi-bin/koha/boraccount.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">
  				View Account
***************
*** 121,230 ****
  				Pay Fines
  			</a>
- 			<br><br>
  		</p>
! 	</td>
! 	</tr>
! </table>
! 
! <p>
! <form action="renewscript.pl" method=post>
! 	<input type="hidden" name="bornum" value="<!-- TMPL_VAR name="bornum" -->">
! 	<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 >
! 
! 	<TR VALIGN=TOP>
! 		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif" colspan=6><B>ITEMS CURRENTLY ON ISSUE</b></TD>
! 	</TR>
! 
! 	<TR VALIGN=TOP>
! 		<td  bgcolor="#99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Title</b></TD>
! 		<td  bgcolor="#99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Due</b></TD>
! 		<td  bgcolor="#99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Itemtype</b></TD>
! 		<td  bgcolor="#99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Charge</b></TD>
! 		<td  bgcolor="#99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Renew</b></TD>
! 	</TR>
! 
! 	<!-- TMPL_LOOP NAME=issueloop -->
! 	<tr VALIGN=TOP>
! 		<td><!-- TMPL_IF NAME=red --><font color=red><!-- /TMPL_IF -->
! 		<!-- TMPL_VAR NAME="title" -->
! 		<a href="/cgi-bin/koha/moredetail.pl?item=<!-- TMPL_VAR NAME="itemnumber" -->&bib=<!-- TMPL_VAR NAME="biblionumber" -->&bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->">
! 			<!-- TMPL_VAR NAME="barcode" -->
! 		</a>
! 		</td>
! 		<td><!-- TMPL_VAR NAME="date_due" --></td>
! 		<td><!-- TMPL_VAR NAME="itemtype" --></td>
! 		<td><!-- TMPL_VAR NAME="charge" --></td>
! 		<td>
! 		<!-- TMPL_IF NAME=norenew -->
! 			<a href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">On Request - no renewals</a>
  		<!-- TMPL_ELSE -->
! 			<input type=radio name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value=y>Y
! 			<input type=radio name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value=n>N
  		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF NAME=red --></font><!-- /TMPL_IF -->
! 		</td>
! 	</tr>
! 	<!-- /TMPL_LOOP -->
! 
! 	<tr VALIGN=TOP  >
! 		<TD colspan=5 align=right>
! 		<INPUT TYPE=submit class="button" VALUE="Renew Items">
! 		</td>
! 	</tr>
! 
! 	</table>
! </form>
! 
! <P>
! 
! <TABLE  CELLSPACING=0  CELLPADDING=5 border=1 >
! 	<TR VALIGN=TOP>
! 		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif" colspan=5><B>ITEMS REQUESTED</b></TD>
! 	</TR>
! 
! 	<TR VALIGN=TOP>
! 		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Title</b></TD>
! 		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Requested</b></TD>
! 		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Remove</b></TD>
! 	</TR>
! 
! 	<form action=/cgi-bin/koha/modrequest.pl method=post>
! 	<input type=hidden name=from value=borrower>
! 
! 	<!-- TMPL_LOOP NAME=reserveloop -->
! 	<tr VALIGN=TOP>
! 		<td>
! 			<a href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="btitle" --></a>
! 			<!-- TMPL_IF NAME=volumeddesc -->
! 				<!-- TMPL_VAR NAME="volumeddesc" -->
! 				<!-- TMPL_VAR NAME="itemtype" -->
  			<!-- /TMPL_IF -->
! 		</td>
! 		<td><!-- TMPL_VAR NAME="reservedate2" --></td>
! 		<td>
! 			<select name="rank-request">
! 			<option value=n>No
! 			<option value=del>Yes
! 			</select>
! 		</td>
! 		<input type=hidden name=biblio value="<!-- TMPL_VAR NAME="biblionumber" -->">
! 		<input type=hidden name=borrowernumber value="<!-- TMPL_VAR NAME="bornum" -->">
! 	</tr>
! 	<!-- /TMPL_LOOP -->
! 
! 	<tr VALIGN=TOP  >
! 		<td colspan=5 align=right>
! 		<!-- TMPL_IF name="reserveloop" -->
! 			<INPUT TYPE="image" name="submit" VALUE="update" height=42 WIDTH=187 BORDER=0 src="<!-- TMPL_VAR name="themelang" -->/images/cancel-requests.gif">
! 		<!-- /TMPL_IF -->
! 		</td>
! 	</tr>
! 	</form>
! </table>
! <br />
! <br />
! <a class=button href="/cgi-bin/koha/readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">
! 	Reading Record
! </a>
  <script>
  function confirm_deletion() {
--- 106,205 ----
  				Pay Fines
  			</a>
  		</p>
! 	</div>
! 	<div id="bloc25">
! 		<div id="bloctitle">ITEMS CURRENTLY ON ISSUE</div>
! 		<!-- TMPL_IF name="issueloop" -->
! 			<form action="renewscript.pl" method=post>
! 			<input type="hidden" name="bornum" value="<!-- TMPL_VAR name="bornum" -->">
! 
! 			<table>
! 			<tr>
! 				<th>Title</th>
! 				<th>Due</th>
! 				<th>Itemtype</th>
! 				<th>Charge</th>
! 				<th>Renew</th>
! 			</tr>
! 
! 			<!-- TMPL_LOOP NAME=issueloop -->
! 			<tr>
! 				<td><!-- TMPL_IF NAME=red --><font color=red><!-- /TMPL_IF -->
! 				<!-- TMPL_VAR NAME="title" -->
! 				<a href="/cgi-bin/koha/moredetail.pl?item=<!-- TMPL_VAR NAME="itemnumber" -->&bib=<!-- TMPL_VAR NAME="biblionumber" -->&bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->">
! 					<!-- TMPL_VAR NAME="barcode" -->
! 				</a>
! 				</td>
! 				<td><!-- TMPL_VAR NAME="date_due" --></td>
! 				<td><!-- TMPL_VAR NAME="itemtype" --></td>
! 				<td><!-- TMPL_VAR NAME="charge" --></td>
! 				<td>
! 				<!-- TMPL_IF NAME=norenew -->
! 					<a href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">On Request - no renewals</a>
! 				<!-- TMPL_ELSE -->
! 					<input type=radio name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value=y>Y
! 					<input type=radio name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value=n>N
! 				<!-- /TMPL_IF -->
! 				<!-- TMPL_IF NAME=red --></font><!-- /TMPL_IF -->
! 				</td>
! 			</tr>
! 			<!-- /TMPL_LOOP -->
! 			</table>
! 			<input type=submit class="button" value="Renew Items">
! 		</form>
  		<!-- TMPL_ELSE -->
! 			None
  		<!-- /TMPL_IF -->
! 	</div>
! 	<div id="bloc25">
! 		<div id="bloctitle">ITEMS REQUESTED</div>
! 			<!-- TMPL_IF NAME=reserveloop -->
! 				<table>
! 					<tr>
! 						<th>Title</th>
! 						<th>Requested</th>
! 						<th>Remove</th>
! 					</tr>
! 					<form action=/cgi-bin/koha/modrequest.pl method=post>
! 						<input type=hidden name=from value=borrower>
! 						<!-- TMPL_LOOP NAME=reserveloop -->
! 						<tr>
! 							<td>
! 								<a href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="btitle" --></a>
! 								<!-- TMPL_IF NAME=volumeddesc -->
! 									<!-- TMPL_VAR NAME="volumeddesc" -->
! 									<!-- TMPL_VAR NAME="itemtype" -->
! 								<!-- /TMPL_IF -->
! 							</td>
! 							<td><!-- TMPL_VAR NAME="reservedate2" --></td>
! 							<td>
! 								<select name="rank-request">
! 								<option value=n>No
! 								<option value=del>Yes
! 								</select>
! 							</td>
! 							<input type=hidden name=biblio value="<!-- TMPL_VAR NAME="biblionumber" -->">
! 							<input type=hidden name=borrowernumber value="<!-- TMPL_VAR NAME="bornum" -->">
! 						</tr>
! 						<!-- /TMPL_LOOP -->
! 						<tr>
! 							<td colspan=5 align=right>
! 							<!-- TMPL_IF name="reserveloop" -->
! 								<INPUT TYPE="image" name="submit" VALUE="update" height=42 WIDTH=187 BORDER=0 src="<!-- TMPL_VAR name="themelang" -->/images/cancel-requests.gif">
! 							<!-- /TMPL_IF -->
! 							</td>
! 						</tr>
! 					</form>
! 				</table>
! 			<!-- TMPL_ELSE -->
! 				None
  			<!-- /TMPL_IF -->
! 	</div>
! 	<div id="bloc25">
! 		<a class=button href="/cgi-bin/koha/readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">
! 			Reading Record
! 		</a>
! 	</div>
! </div>
  <script>
  function confirm_deletion() {





More information about the Koha-cvs mailing list