--- templates/contact.tpl	2001/02/28 14:16:39	1.2
+++ templates/contact.tpl	2001/11/21 10:27:39	1.7
@@ -1,24 +1,26 @@
-{$from}
 
 <table width=90% align="center" cellspacing="0" border="0" cellpadding="0">
-  <tbody> 
   <form>
+  <input type="hidden" name="from" value="{$from}">
     <tr> 
       <td valign=center align=left>To:</td>
-      <td valign=center align=left>{$email_to}</td>
+      <td valign=center align=left><select name=mailto>
+      {html_options values=$email_val output=$email_val}
+      </select>
+      </td>
     </tr>
     <tr> 
-      <td valign=center align=left>Full Name</td>
+      <td valign=center align=left>{rinput name=fullname desc="Full Name"}</td>
       <td valign=center align=left>
-	  <input size=22 name=fullname>
+	  {input size=22 name=fullname}
       </td>
     </tr>
     <tr> 
       <td valign=center align=left> 
-	<div align="left">Email</div>
+	<div align="left">{rinput name=mailfrom desc="Email"}</div>
       </td>
       <td valign=center align=left>  
-	  <input size=22 name=email>
+	  {input size=22 name=mailfrom type=email}
        </td>
     </tr>
     <tr> 
@@ -27,42 +29,28 @@
       </td>
       <td valign=center align=left>   
 	  <select size=1 name=country>
-	  <option value="" selected>-- Select Your Country --</option>
-	  {section name=c loop=$countries}
-	  <option value="{$c/countries.iso}">{$c/countries.name}</option>
-	  {/section}
+	<option value="" selected>-- Select Your Country --</option>
+	{section name=c loop=$countries}
+	<option value="{$c/countries.iso}">{$c/countries.name}</option>
+	{/section}
 </select>
  </td>
 </tr>
 <tr> 
   <td valign=center align=left> 
-    <div align="left">Subject</div>
+    <div align="left">{rinput name=subject desc="Subject"}</div>
   </td>
   <td valign=center align=left>  
-      <input size=22 name=subject>
+      {input size=22 name=subject}
    </td>
 </tr>
 <tr> 
   <td valign=center align=left colspan=2> 
-    <p>Please leave your comments below:</p>
-    <p>  
+    <br>Please leave your comments below:<br>
       <textarea name=comment rows=5 cols=35></textarea>
-     </p>
-  </td>
-</tr>
-<tr> 
-  <td valign=center colspan=2> </td>
-</tr>
-<tr> 
-  <td valign=center align=middle colspan=2> 
-    <input type=submit value=Submit name="submit">
-    &nbsp; 
-    <input type=reset value=Reset name="reset">
+     <br><br>All fields in <b>bold</b> are required &nbsp;
+     <input type=submit value=Submit name="submit"> &nbsp; 
+    <input type=reset value=Reset name="reset"></form>
   </td>
 </tr>
-<tr> 
-  <td valign=center colspan=2 align="left"> <i> </i></td>
-</tr>
-</form>
-</tbody> 
 </table>