--- templates/contact.tpl	2001/02/05 14:54:21	1.1
+++ templates/contact.tpl	2001/03/05 12:11:07	1.5
@@ -1,11 +1,13 @@
 {$from}
 
 <table width=90% align="center" cellspacing="0" border="0" cellpadding="0">
-  <tbody> 
   <form>
     <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>
@@ -18,7 +20,7 @@
 	<div align="left">Email</div>
       </td>
       <td valign=center align=left>  
-	  <input size=22 name=email>
+	  <input size=22 name=mailfrom>
        </td>
     </tr>
     <tr> 
@@ -27,118 +29,10 @@
       </td>
       <td valign=center align=left>   
 	  <select size=1 name=country>
-	  <option value="" selected>-- Select Your Country 
-	  --</option>
-	  <option value=AG>Antigua</option>
-	  <option value=AR>Argentina</option>
-	  <option value=AU>Australia</option>
-	  <option value=AT>Austria</option>
-	  <option value=BS>Bahamas</option>
-	  <option value=BH>Bahrain</option>
-	  <option value=BD>Bangladesh</option>
-	  <option value=BB>Barbados</option>
-	  <option value=BY>Belarus</option>
-	  <option value=BE>Belgium</option>
-	  <option value=BM>Bermuda</option>
-	  <option value=BO>Bolivia</option>
-	  <option value=BA>Bosnia</option>
-	  <option value=BR>Brazil</option>
-	  <option value=IO>Britain (UK)</option>
-	  <option value=BG>Bulgaria</option>
-	  <option value=CA>Canada</option>
-	  <option value=KY>Cayman Islands</option>
-	  <option value=CL>Chile</option>
-	  <option value=CN>China</option>
-	  <option value=CO>Colombia</option>
-	  <option value=HR>Croatia</option>
-	  <option value=CU>Cuba</option>
-	  <option value=CY>Cyprus</option>
-	  <option value=CZ>Czech Republic</option>
-	  <option value=DK>Denmark</option>
-	  <option value=DO>Dominican Republic</option>
-	  <option value=EC>Ecuador</option>
-	  <option value=EG>Egypt</option>
-	  <option value=SV>El Salvador</option>
-	  <option value=EE>Estonia</option>
-	  <option value=FI>Finland</option>
-	  <option value=FR>France</option>
-	  <option value=DE>Germany</option>
-	  <option value=GI>Gibraltar</option>
-	  <option value=GR>Greece</option>
-	  <option value=GD>Grenada</option>
-	  <option value=GY>Guyana</option>
-	  <option value=HT>Haiti</option>
-	  <option value=HN>Honduras</option>
-	  <option value=HK>Hong Kong</option>
-	  <option value=HU>Hungary</option>
-	  <option value=IN>India</option>
-	  <option value=ID>Indonesia</option>
-	  <option value=IR>Iran</option>
-	  <option value=IQ>Iraq</option>
-	  <option value=IE>Ireland</option>
-	  <option value=IL>Israel</option>
-	  <option value=IT>Italy</option>
-	  <option value=JM>Jamaica</option>
-	  <option value=JP>Japan</option>
-	  <option value=JO>Jordan</option>
-	  <option value=KZ>Kazakhstan</option>
-	  <option value=KE>Kenya</option>
-	  <option value=KP>Korea (South)</option>
-	  <option value=KW>Kuwait</option>
-	  <option value=KG>Kyrgyzstan</option>
-	  <option value=LV>Latvia</option>
-	  <option value=LB>Lebanon</option>
-	  <option value=LY>Libya</option>
-	  <option value=LT>Lithuania</option>
-	  <option value=MK>Macedonia</option>
-	  <option value=MW>Malawi</option>
-	  <option value=MY>Malaysia</option>
-	  <option value=MT>Malta</option>
-	  <option value=MX>Mexico</option>
-	  <option value=MZ>Mozambique</option>
-	  <option value=NL>Netherlands</option>
-	  <option value=AN>Netherlands Antilles</option>
-	  <option value=NZ>New Zealand</option>
-	  <option value=NI>Nicaragua</option>
-	  <option value=NG>Nigeria</option>
-	  <option value=NO>Norway</option>
-	  <option value=OM>Oman</option>
-	  <option value=PK>Pakistan</option>
-	  <option value=PA>Panama</option>
-	  <option value=PY>Paraguay</option>
-	  <option value=PE>Peru</option>
-	  <option value=PH>Philippines</option>
-	  <option value=PL>Poland</option>
-	  <option value=PT>Portugal</option>
-	  <option value=QA>Qatar</option>
-	  <option value=RO>Romania</option>
-	  <option value=RU>Russian Federation</option>
-	  <option value=SA>Saudi Arabia</option>
-	  <option value=SG>Singapore</option>
-	  <option value=SK>Slovak Republic</option>
-	  <option value=SI>Slovenia</option>
-	  <option value=ZA>South Africa</option>
-	  <option value=ES>Spain</option>
-	  <option value=SD>Sudan</option>
-	  <option value=SE>Sweden</option>
-	  <option value=CH>Switzerland</option>
-	  <option value=XX>Switzerland (Basel)</option>
-	  <option value=SY>Syria</option>
-	  <option value=TW>Taiwan</option>
-	  <option value=TH>Thailand</option>
-	  <option value=TT>Trinidad and Tobago</option>
-	  <option value=TR>Turkey</option>
-	  <option value=UA>Ukraine</option>
-	  <option value=AE>United Arab Emirates</option>
-	  <option value=US>United States</option>
-	  <option value=UY>Uruguay</option>
-	  <option value=VE>Venezuela</option>
-	  <option value=VN>Viet Nam</option>
-	  <option value=YE>Yemen</option>
-	  <option value=YU>Yugoslavia</option>
-	  <option value=ZM>Zambia</option>
-	  <option value=ZW>Zimbabwe</option>
-	  <option value=ZZ>Other</option>
+	<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>
@@ -156,21 +50,9 @@
     <p>  
       <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">
+	     <input type=submit value=Submit name="submit">
     &nbsp; 
-    <input type=reset value=Reset name="reset">
+    <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>