Index: openacs-4/packages/acs-templating/resources/forms/plain.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/resources/forms/plain.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-templating/resources/forms/plain.adp	19 Jul 2002 23:17:15 -0000	1.3
+++ openacs-4/packages/acs-templating/resources/forms/plain.adp	2 Jan 2003 17:10:39 -0000	1.4
@@ -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>
@@ -79,7 +79,21 @@
 
 <if @form_properties.has_submit@ nil>
   <tr>
-    <td align="center"><br /><input type="submit" value="Submit" /></td>
+    <td align="center">
+      <if @form_properties.mode@ not nil and @form_properties.mode@ ne "edit">
+        <input type=submit name="__edit" value="     Edit     ">
+      </if>
+      <else>
+        <multiple name="buttons">
+          <if @buttons.name@ eq "ok">
+            <input type="submit" name="@buttons.name@" value="      @buttons.label@      ">
+          </if>
+          <else>
+            <input type="submit" name="@buttons.name@" value="@buttons.label@">
+          </else>
+        </multiple>
+      </else>
+    </td>
   </tr>
 </if>