[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/members imemberentry.tmpl,1.6,1.7 jmemberentry.tmpl,1.7,1.8 memberentry.tmpl,1.21,1.22 member-password.tmpl,1.5,1.6 members-home.tmpl,1.6,1.7 member.tmpl,1.8,1.9 moremember.tmpl,1.24,1.25 readingrec.tmpl,1.8,1.9

Paul POULAIN tipaul at users.sourceforge.net
Wed Feb 11 10:02:58 CET 2004


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

Modified Files:
	imemberentry.tmpl jmemberentry.tmpl memberentry.tmpl 
	member-password.tmpl members-home.tmpl member.tmpl 
	moremember.tmpl readingrec.tmpl 
Log Message:
synch'ing 2.0.0 branch (RC4 tag) and head

Index: imemberentry.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/imemberentry.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** imemberentry.tmpl	9 Dec 2003 10:29:02 -0000	1.6
--- imemberentry.tmpl	11 Feb 2004 09:02:55 -0000	1.7
***************
*** 22,26 ****
      <tr align=right>
        <td COLSPAN=2 ALIGN=RIGHT><font size=3 face='arial,helvetica'>
!         <STRONG>Member# <!-- TMPL_VAR NAME="member" -->, Card Number*</STRONG>
        </TD>
        <TD align=right><input type=text name=cardnumber_institution size=20 value=<!-- TMPL_VAR NAME=cardnumber_institution -->><br></td>
--- 22,26 ----
      <tr align=right>
        <td COLSPAN=2 ALIGN=RIGHT><font size=3 face='arial,helvetica'>
!         <STRONG>Member# <!-- TMPL_VAR NAME="member" -->, Card number*</STRONG>
        </TD>
        <TD align=right><input type=text name=cardnumber_institution size=20 value=<!-- TMPL_VAR NAME=cardnumber_institution -->><br></td>

Index: jmemberentry.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/jmemberentry.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** jmemberentry.tmpl	9 Dec 2003 10:29:02 -0000	1.7
--- jmemberentry.tmpl	11 Feb 2004 09:02:55 -0000	1.8
***************
*** 53,57 ****
  	<TR>
  		<td  COLSPAN=4   ALIGN=RIGHT ><font size=3 face='arial,helvetica'>
! 			<STRONG>Member# <!-- TMPL_VAR NAME=cmember --></STRONG>, <b>Card Number*</b></STRONG>
  		</TD>
  		<TD>
--- 53,57 ----
  	<TR>
  		<td  COLSPAN=4   ALIGN=RIGHT ><font size=3 face='arial,helvetica'>
! 			<STRONG>Member# <!-- TMPL_VAR NAME=cmember --></STRONG>, <b>Card number*</b></STRONG>
  		</TD>
  		<TD>

Index: memberentry.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** memberentry.tmpl	9 Dec 2003 10:29:02 -0000	1.21
--- memberentry.tmpl	11 Feb 2004 09:02:55 -0000	1.22
***************
*** 1,5 ****
  <!-- TMPL_INCLUDE NAME="members-top.inc" -->
  
! <h1><!-- TMPL_VAR NAME=header --></h1><br>
  
  <form action=/cgi-bin/koha/newmember.pl method=post>
--- 1,14 ----
  <!-- 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/newmember.pl method=post>
***************
*** 14,18 ****
  	<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>
  
--- 23,27 ----
  	<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>
  
***************
*** 30,36 ****
  		<td><FONT SIZE=2>Title</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>
--- 39,45 ----
  		<td><FONT SIZE=2>Title</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>
***************
*** 113,123 ****
  	</tr>
  
- 
- 	<tr valign=top bgcolor="99cc33">
- 		<td COLSPAN=5 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>MEMBER CONTACT DETAILS</b></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>
--- 122,127 ----
  	</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>
***************
*** 133,137 ****
  
  	<tr valign=top bgcolor=white>
! 		<td COLSPAN=2 ><FONT SIZE=2>Phone (Daytime)</td>
  		<td></td>
  		<td></td>
--- 137,141 ----
  
  	<tr valign=top bgcolor=white>
! 		<td COLSPAN=2 ><FONT SIZE=2>Phone daytime</td>
  		<td></td>
  		<td></td>
***************
*** 151,155 ****
  
  	<tr valign=top bgcolor=white>
! 		<td   COLSPAN=3 ><FONT SIZE=2><b>Name*</b></td>
  		<td><FONT SIZE=2>Phone</td>
  		<td><FONT SIZE=2><b>Relationship*</b></td>
--- 155,159 ----
  
  	<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>
***************
*** 168,172 ****
  
  	<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>
--- 172,176 ----
  
  	<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>
***************
*** 178,182 ****
  
  	<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>
--- 182,186 ----
  
  	<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>
***************
*** 199,203 ****
  		<td>
  			<input type=hidden name=type value=<!-- TMPL_VAR NAME="type" -->>
! 			<input type=image src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/2rightarrow.png" ALT="Add New Member" border=0 >
  		</td>
  	</tr>
--- 203,207 ----
  		<td>
  			<input type=hidden name=type value=<!-- TMPL_VAR NAME="type" -->>
! 			<input type="submit" value="save" class="button">
  		</td>
  	</tr>

Index: member-password.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/member-password.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** member-password.tmpl	9 Dec 2003 10:29:03 -0000	1.5
--- member-password.tmpl	11 Feb 2004 09:02:55 -0000	1.6
***************
*** 16,20 ****
  	New Password: <input name=newpassword size=20 value=<!-- TMPL_VAR NAME=defaultnewpassword -->>
  	<p>
! 	<input type=submit value="Confirm Password">
  	</form>
  <!-- /TMPL_IF -->
--- 16,20 ----
  	New Password: <input name=newpassword size=20 value=<!-- TMPL_VAR NAME=defaultnewpassword -->>
  	<p>
! 	<input type=submit value="Confirm Password" class="button">
  	</form>
  <!-- /TMPL_IF -->

Index: members-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** members-home.tmpl	9 Dec 2003 10:29:03 -0000	1.6
--- members-home.tmpl	11 Feb 2004 09:02:55 -0000	1.7
***************
*** 4,28 ****
  
  
- <img src="<!-- TMPL_VAR name="themelang" -->/images/numbers-mem-1.gif"   WIDTH=45  HEIGHT=44   ALT="1"
- hspace=5 align=left BORDER=0>
- 
  <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/member.pl" method=post><FONT SIZE=4>
! <b>Member Search</B> 
  </FONT>
  <INPUT TYPE="text" size=50 name=member >
! <BR>
! Renew Items, view add, modify and delete records, all by starting with this search.<BR>
! Type a borrower name, part of a name,  or number in the field above and hit the <BR>
! enter key to activate search
  </td></form><tr>
  </table>
-  
- <P>
- 
- <img src="<!-- TMPL_VAR name="themelang" -->/images/numbers-mem-2.gif"   WIDTH=45  HEIGHT=44   ALT="2" 
- hspace=5 align=left BORDER=0>
  
  
  <table border=1 cellspacing=0 cellpadding=10 height="100" >
--- 4,18 ----
  
  
  <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/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" >

Index: member.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** member.tmpl	9 Dec 2003 10:29:03 -0000	1.8
--- member.tmpl	11 Feb 2004 09:02:55 -0000	1.9
***************
*** 42,46 ****
  
  <form action=/cgi-bin/koha/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
--- 42,46 ----
  
  <form action=/cgi-bin/koha/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

Index: moremember.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** moremember.tmpl	22 Dec 2003 10:41:22 -0000	1.24
--- moremember.tmpl	11 Feb 2004 09:02:55 -0000	1.25
***************
*** 14,33 ****
  	<tr VALIGN=TOP  >
  	<TD>
- 		<!-- TMPL_IF name="IS_ADULT" -->
- 			<p align=right>
- 			<form action=/cgi-bin/koha/jmemberentry.pl method=post>
- 				<INPUT TYPE="submit" name="submit" VALUE="Add Child" class="button" alt="Add Child">
- 				<input type=hidden name=type value=Add>
- 				<input type=hidden name=bornum value="<!-- TMPL_VAR NAME=borrowernumber -->">
- 			</form>
- 			</P>
- 		<!-- /TMPL_IF -->
- 		<br>
  		<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>
--- 14,23 ----
  	<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>
***************
*** 67,70 ****
--- 57,70 ----
  		<p align=right>
  		</font>
+ 		<!-- TMPL_IF name="IS_ADULT" -->
+ 			<p align=right>
+ 			<form action=/cgi-bin/koha/jmemberentry.pl method=post>
+ 				<INPUT TYPE="submit" name="submit" VALUE="Add Child" class="button" alt="Add Child">
+ 				<input type=hidden name=type value=Add>
+ 				<input type=hidden name=bornum value="<!-- TMPL_VAR NAME=borrowernumber -->">
+ 			</form>
+ 			</P>
+ 		<!-- /TMPL_IF -->
+ 		<br>
  		<!-- TMPL_IF name="I" -->
  			<form action=/cgi-bin/koha/imemberentry.pl method=post>
***************
*** 115,120 ****
  		<p>
  			<br>
! 			<a class="button" href=/cgi-bin/koha/boraccount.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->>View Account</a>
! 			<a class="button" href=/cgi-bin/koha/pay.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->>Pay Fines</a>
  			<br><br>
  		</p>
--- 115,124 ----
  		<p>
  			<br>
! 			<a class="button" href="/cgi-bin/koha/boraccount.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">
! 				View Account
! 			</a>
! 			<a class="button" href="/cgi-bin/koha/pay.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">
! 				Pay Fines
! 			</a>
  			<br><br>
  		</p>
***************
*** 220,224 ****
  <br />
  <br />
! <a class=button href="/cgi-bin/koha/readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Reading Record</a>
  <script>
  function confirm_deletion() {
--- 224,230 ----
  <br />
  <br />
! <a class=button href="/cgi-bin/koha/readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">
! 	Reading Record
! </a>
  <script>
  function confirm_deletion() {

Index: readingrec.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** readingrec.tmpl	22 Dec 2003 10:58:28 -0000	1.8
--- readingrec.tmpl	11 Feb 2004 09:02:55 -0000	1.9
***************
*** 3,7 ****
  <h1><!-- TMPL_VAR NAME=firstname --> <!-- TMPL_VAR NAME=surname --></h1>
  <br>Member Number: <!-- TMPL_VAR NAME=bornum -->
! <br>Card Number: <!-- TMPL_VAR NAME=cardnumber -->
  <P>
  <!-- TMPL_IF NAME=showfulllink -->
--- 3,7 ----
  <h1><!-- TMPL_VAR NAME=firstname --> <!-- TMPL_VAR NAME=surname --></h1>
  <br>Member Number: <!-- TMPL_VAR NAME=bornum -->
! <br>Card number: <!-- TMPL_VAR NAME=cardnumber -->
  <P>
  <!-- TMPL_IF NAME=showfulllink -->





More information about the Koha-cvs mailing list