[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/members imemberentry.tmpl,1.1,1.2 memberentry.tmpl,1.9,1.10 member-password.tmpl,1.2,1.3 moremember.tmpl,1.8,1.9

Paul POULAIN tipaul at users.sourceforge.net
Tue Apr 8 11:39:56 CEST 2003


Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members
In directory sc8-pr-cvs1:/tmp/cvs-serv8735/koha-tmpl/intranet-tmpl/default/en/members

Modified Files:
	imemberentry.tmpl memberentry.tmpl member-password.tmpl 
	moremember.tmpl 
Log Message:
fixes for #207, 208, 211

Index: imemberentry.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/imemberentry.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** imemberentry.tmpl	28 Oct 2002 17:59:05 -0000	1.1
--- imemberentry.tmpl	8 Apr 2003 09:39:54 -0000	1.2
***************
*** 1,13 ****
! <HTML>
! 
! <!-- startmenu (member)
!      this  includes the head-container and <body>
!      including this via var contradicts the separation of code and design
!      a solution via tmpl_include would be better -->
! 
! <TMPL_VAR NAME=startmenumember>
! 
! <!-- here comes the main table -->
! 
  <BLOCKQUOTE>
  
--- 1,3 ----
! <TMPL_INCLUDE name="members-top.inc">
  <BLOCKQUOTE>
  
***************
*** 28,32 ****
      <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=" "><br></td>
--- 18,22 ----
      <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=" "><br></td>
***************
*** 36,58 ****
  
      <tr valign=top bgcolor="99cc33" >
!       <td  COLSPAN=5 background="/images/background-mem.gif">
          <B>INSTITUTION DETAILS</b>
        </td>
!       <td  COLSPAN=2  ALIGN=RIGHT background="/images/background-mem.gif">
        </td>
      </tr>
  
      <tr valign=top bgcolor=white>
!       <td colspan=3><input type=text name=institution_name size=50 value=""></td>
      </tr>
- 
      <tr valign=top bgcolor=white>
!       <td><FONT SIZE=2>Institution Name</FONT></td>
      </tr>
- 
      <tr><td>&nbsp;</TD></TR>
  
      <tr valign=top bgcolor="99cc33" >
!       <td  COLSPAN=5 background="/images/background-mem.gif">
  	  <B>INSTITUTION ADDRESS</b>
        </td>
--- 26,46 ----
  
      <tr valign=top bgcolor="99cc33" >
!       <td  COLSPAN=5 background="<TMPL_VAR name="themelang">/images/background-mem.gif">
          <B>INSTITUTION DETAILS</b>
        </td>
!       <td  COLSPAN=2  ALIGN=RIGHT background="<TMPL_VAR name="themelang">/images/background-mem.gif">
        </td>
      </tr>
  
      <tr valign=top bgcolor=white>
!       <td><FONT SIZE=2>Institution Name</FONT></td>
      </tr>
      <tr valign=top bgcolor=white>
!       <td colspan=3><input type=text name=institution_name size=50 value=""></td>
      </tr>
      <tr><td>&nbsp;</TD></TR>
  
      <tr valign=top bgcolor="99cc33" >
!       <td  COLSPAN=5 background="<TMPL_VAR name="themelang">/images/background-mem.gif">
  	  <B>INSTITUTION ADDRESS</b>
        </td>
***************
*** 60,91 ****
  
      <tr valign=top bgcolor=white>
- 	<td><input type=text name=address size=40 value=""></td>
- 	<td><input type=text name=city size=20 value=""></td>
- 	<td>
- 	  <SELECT NAME="area" SIZE="1">
-           <!-- this truely shouldn't be hardcoded -->
- 	    <OPTION value=L>L - Levin
- 	    <OPTION value=F>F - Foxton
- 	    <OPTION value=S>S - Shannon
- 	    <OPTION value=H>H - Horowhenua
- 	    <OPTION value=K>K - Kapiti
- 	    <OPTION value=O>O - Out of District
- 	    <OPTION value=X>X - Temporary Visitor
- 	    <OPTION value=Z>Z - Interloan Libraries
- 	    <OPTION value=V>V - Villlage
-         </SELECT>
-       </td>
-     </tr>
- 	
-     <tr valign=top bgcolor=white>
  	<td ><FONT SIZE=2>Postal Address*</FONT></td>
  	<td><FONT SIZE=2>Town*</FONT></td>
  	<td><FONT SIZE=2>Area</FONT></td>
      </tr>
! 
      <tr><td>&nbsp;</TD></TR>
  
      <tr valign=top bgcolor="99cc33">
!       <td COLSPAN=5 background="/images/background-mem.gif">
  	  <B>CONTACT DETAILS</b>
        </td>
--- 48,66 ----
  
      <tr valign=top bgcolor=white>
  	<td ><FONT SIZE=2>Postal Address*</FONT></td>
  	<td><FONT SIZE=2>Town*</FONT></td>
  	<td><FONT SIZE=2>Area</FONT></td>
      </tr>
!     <tr valign=top bgcolor=white>
! 	<td><input type=text name=address size=40 value=""></td>
! 	<td><input type=text name=city size=20 value=""></td>
! 	<td>
!       	<TMPL_VAR name="CGIbranch">
! 	 </td>
!     </tr>
      <tr><td>&nbsp;</TD></TR>
  
      <tr valign=top bgcolor="99cc33">
!       <td COLSPAN=5 background="<TMPL_VAR name="themelang">/images/background-mem.gif">
  	  <B>CONTACT DETAILS</b>
        </td>
***************
*** 93,109 ****
  
      <tr valign=top bgcolor=white>
- 	<td COLSPAN=3><input type=text name=contactname size=40 value=""></td>
-     </tr>
- 	
-     <tr valign=top bgcolor=white>
  	<td COLSPAN=3><FONT SIZE=2>Contact Name*</td>
      </tr>
- 	
      <tr valign=top bgcolor=white>
! 	<td ><input type=text name=phoneday size=20 value=""></td>
! 	<td><input type=text name=faxnumber size=20 value=""></td>
! 	<td ><input type=text name=emailaddress size=20 value=""></td>
      </tr>
! 	
      <tr valign=top bgcolor=white>
  	<td><FONT SIZE=2>Phone (day)</td>
--- 68,78 ----
  
      <tr valign=top bgcolor=white>
  	<td COLSPAN=3><FONT SIZE=2>Contact Name*</td>
      </tr>
      <tr valign=top bgcolor=white>
! 	<td COLSPAN=3><input type=text name=contactname size=40 value=""></td>
      </tr>
! 
! 
      <tr valign=top bgcolor=white>
  	<td><FONT SIZE=2>Phone (day)</td>
***************
*** 111,131 ****
  	<td><FONT SIZE=2>Email</td>
      </tr>
- 
-     <tr><td>&nbsp;</TD></TR>
- 	
      <tr valign=top bgcolor=white>
! 	<td COLSPAN=4><textarea name=altnotes wrap=physical cols=70 rows=3></textarea></td>
      </tr>
  
      <tr valign=top bgcolor=white>
  	<td><FONT SIZE=2>Notes</font></td>
      </tr>
  
      <tr><td>&nbsp;</TD></TR>
! 	
      <tr valign=top bgcolor="99cc33"  >
! 	<td  COLSPAN=5  background="/images/background-mem.gif"><B>LIBRARY USE</B></td>
      </tr>
- 	
      <tr valign=top >
  	<td  COLSPAN=5><textarea name=borrowernotes wrap=physical cols=70 rows=3></textarea></td>
--- 80,107 ----
  	<td><FONT SIZE=2>Email</td>
      </tr>
      <tr valign=top bgcolor=white>
! 	<td ><input type=text name=phoneday size=20 value=""></td>
! 	<td><input type=text name=faxnumber size=20 value=""></td>
! 	<td ><input type=text name=emailaddress size=20 value=""></td>
      </tr>
  
+     <tr><td>&nbsp;</TD></TR>
+ 
      <tr valign=top bgcolor=white>
  	<td><FONT SIZE=2>Notes</font></td>
      </tr>
+     <tr valign=top bgcolor=white>
+ 	<td COLSPAN=4><textarea name=altnotes wrap=physical cols=70 rows=3></textarea></td>
+     </tr>
  
      <tr><td>&nbsp;</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 bgcolor=white>
! 	<td ><FONT SIZE=2>Notes</font></td>
      </tr>
      <tr valign=top >
  	<td  COLSPAN=5><textarea name=borrowernotes wrap=physical cols=70 rows=3></textarea></td>
***************
*** 135,144 ****
  
      <tr valign=top bgcolor=white>
- 	<td ><FONT SIZE=2>Notes</font></td>
-     </tr>
- 
-     <tr valign=top bgcolor=white>
  	<td  COLSPAN=5 align=right >
! 	  <input type=image src="/images/save-changes.gif" WIDTH=188 HEIGHT=44 ALT="Add New Member" border=0 >
        </td>
      </tr>
--- 111,116 ----
  
      <tr valign=top bgcolor=white>
  	<td  COLSPAN=5 align=right >
! 	  <input type=image src="<TMPL_VAR name="themelang">/images/save-changes.gif" WIDTH=188 HEIGHT=44 ALT="Add New Member" border=0 >
        </td>
      </tr>
***************
*** 154,156 ****
  
  </body>
! </HTML>
\ No newline at end of file
--- 126,128 ----
  
  </body>
! </HTML>

Index: memberentry.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** memberentry.tmpl	7 Apr 2003 14:05:28 -0000	1.9
--- memberentry.tmpl	8 Apr 2003 09:39:54 -0000	1.10
***************
*** 30,33 ****
--- 30,40 ----
  
      <tr valign=top bgcolor=white>
+       <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>
        <td>
          <SELECT NAME="title" SIZE="1">
***************
*** 44,55 ****
      </tr>
  
      <tr valign=top bgcolor=white>
!       <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>
        <td colspan=2>
--- 51,64 ----
      </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>
***************
*** 68,80 ****
      </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="99cc33" >
--- 77,80 ----
***************
*** 83,103 ****
  
      <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=city size=20 value="<TMPL_VAR NAME=city>"></td>
        <td>
!         <SELECT NAME="area" SIZE="1">
!           <TMPL_LOOP NAME=arealoop>
!             <OPTION value="<TMPL_VAR NAME=shortcut>"<TMPL_VAR NAME=selected>><TMPL_VAR NAME=shortcut> - <TMPL_VAR NAME=area>
!           </TMPL_LOOP>
!         </SELECT>
!       </td>
      </tr>
  
      <tr valign=top bgcolor=white>
!       <td  COLSPAN=3><FONT SIZE=2><b>Postal Address*</b></FONT></td>
!       <td><FONT SIZE=2><b>Town*</b></FONT></td>
!       <td><FONT SIZE=2>Area</FONT></td>
      </tr>
- 
      <tr valign=top bgcolor=white>
        <td COLSPAN=3><input type=text name=streetaddress size=40 value="<TMPL_VAR NAME=streetaddress>"></td>
--- 83,103 ----
  
      <tr valign=top bgcolor=white>
+       <td  COLSPAN=3><FONT SIZE=2><b>Postal Address*</b></FONT></td>
+       <td><FONT SIZE=2><b>Town*</b></FONT></td>
+       <td><FONT SIZE=2>Area</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=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>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>
***************
*** 105,112 ****
      </tr>
  
-     <tr valign=top bgcolor=white>
-       <td COLSPAN=3><FONT SIZE=2>Street Address if different</FONT></td>
-       <td><FONT SIZE=2>Town</FONT></td>
-     </tr>
  
      <tr valign=top bgcolor="99cc33">
--- 105,108 ----
***************
*** 115,118 ****
--- 111,120 ----
  
      <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>
***************
*** 121,140 ****
      </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=phoneday>"></td>
        <td></td>
        <td></td>
        <td></td>
      </tr>
-       
      <tr valign=top bgcolor=white>
!       <td COLSPAN=2 ><FONT SIZE=2>Phone (Day)</td>
        <td></td>
        <td></td>
--- 123,135 ----
      </tr>
  
  
      <tr valign=top bgcolor=white>
!       <td COLSPAN=2 ><FONT SIZE=2>Phone (Day)</td>
        <td></td>
        <td></td>
        <td></td>
      </tr>
      <tr valign=top bgcolor=white>
!       <td COLSPAN=2><input type=text name=phone size=20 value="<TMPL_VAR NAME=phoneday>"></td>
        <td></td>
        <td></td>
***************
*** 142,145 ****
--- 137,141 ----
      </tr>
  
+ 
      <tr valign=top bgcolor="99cc33">
        <td  COLSPAN=5  background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>ALTERNATE CONTACT DETAILS</b></td>
***************
*** 147,150 ****
--- 143,151 ----
  
      <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>
+     </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>
***************
*** 158,167 ****
      </tr>
  
-     <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>
-     </tr>
  
      <tr valign=top bgcolor=white>
        <td><FONT SIZE=2>Notes</font></td>
--- 159,166 ----
      </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 bgcolor=white>
        <td><FONT SIZE=2>Notes</font></td>
***************
*** 169,177 ****
      </tr>
  
-     <tr><td>&nbsp; </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 >
--- 168,171 ----

Index: member-password.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/member-password.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** member-password.tmpl	18 Mar 2003 15:22:19 -0000	1.2
--- member-password.tmpl	8 Apr 2003 09:39:54 -0000	1.3
***************
*** 7,11 ****
  
  <TMPL_ELSE>
! 	<h2><TMPL_VAR NAME=surname>, <TMPL_VAR NAME=firstname></h2>
  	<form method=post>
  	<input type=hidden name=member value=<TMPL_VAR NAME=member>>
--- 7,11 ----
  
  <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>>

Index: moremember.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** moremember.tmpl	7 Apr 2003 14:05:28 -0000	1.8
--- moremember.tmpl	8 Apr 2003 09:39:54 -0000	1.9
***************
*** 1,5 ****
  <TMPL_INCLUDE NAME="members-top.inc">
  
- 
  <!-- main site -->
  
--- 1,4 ----
***************
*** 14,25 ****
  	<tr VALIGN=TOP  >
  	<TD>
! 		<p align=right>
! 		<form action=/cgi-bin/koha/jmemberentry.pl method=post>
! 			<INPUT TYPE="image" name="submit"  VALUE="add-child" height=42  WIDTH=120 BORDER=0 src="<TMPL_VAR name="themelang">/images/add-child.gif">
! 			<input type=hidden name=type value=Add>
! 			<input type=hidden name=bornum value="<TMPL_VAR NAME=borrowernumber>">
! 		</form>
! 		</P><br>
! 		<FONT SIZE=2  face="arial, helvetica"><TMPL_VAR NAME="title"> <TMPL_VAR NAME="othernames"> <TMPL_VAR NAME="surname"> (<TMPL_VAR NAME="firstname">, <TMPL_VAR NAME="initials">)<p>
  		Card Number: <TMPL_VAR NAME="cardnumber"><BR>
  		Postal Address: <TMPL_VAR NAME="streetaddress">, <TMPL_VAR NAME="city"><BR>
--- 13,27 ----
  	<tr VALIGN=TOP  >
  	<TD>
! 		<TMPL_IF name="IS_ADULT">
! 			<p align=right>
! 			<form action=/cgi-bin/koha/jmemberentry.pl method=post>
! 				<INPUT TYPE="image" name="submit"  VALUE="add-child" height=42  WIDTH=120 BORDER=0 src="<TMPL_VAR name="themelang">/images/add-child.gif">
! 				<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="city"><BR>





More information about the Koha-cvs mailing list