Index: openacs-4/packages/acs-templating/resources/forms/plainest.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/resources/forms/plainest.adp,v
diff -u -r1.1 -r1.1.2.1
--- openacs-4/packages/acs-templating/resources/forms/plainest.adp	19 Jul 2002 23:17:15 -0000	1.1
+++ openacs-4/packages/acs-templating/resources/forms/plainest.adp	5 Mar 2003 14:57:23 -0000	1.1.2.1
@@ -39,7 +39,7 @@
             <table cellpadding="4" cellspacing="0" border="0">
 	      <formgroup id=@elements.id@>
 		<tr><td>\@formgroup.widget@</td>
-                    <td>\@formgroup.label@</td></tr>
+                    <td><label for="@elements.form_id@:elements:@elements.id@:\@formgroup.option@">\@formgroup.label@</label></td></tr>
 	      </formgroup>
 	      </table>
 	      <formerror id=@elements.id@><br>
@@ -77,9 +77,14 @@
 
 </td></tr>
 
+<if @buttons:rowcount@ gt 0>
 <if @form_properties.has_submit@ nil>
   <tr>
-    <td align="center"><br /><input type="submit" value="Submit" /></td>
+    <td align="center">
+      <multiple name="buttons">
+        <input type="submit" name="@buttons.name@" value="@buttons.label@">
+      </multiple>
+    </td>
   </tr>
 </if>