Index: openacs-4/packages/acs-templating/resources/forms/wizard.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/resources/forms/wizard.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-templating/resources/forms/wizard.adp	5 Jul 2002 15:56:53 -0000	1.2
+++ openacs-4/packages/acs-templating/resources/forms/wizard.adp	2 Jan 2003 17:10:39 -0000	1.3
@@ -53,7 +53,7 @@
 
 		  <if \@formgroup.rownum@ le \@formgroup:rowcount@>
 		    <td align=right>&nbsp;\@formgroup.widget@</td>      
-		    <td align=left>\@formgroup.label@</td> 
+		    <td align=left><label for="@elements.form_id@:elements:@elements.id@:\@formgroup.option@">\@formgroup.label@</label></td> 
 		  </if><else><td>&nbsp;</td><td>&nbsp;</td></else>
 
 		<if \@formgroup.col@ eq 4></tr></if>
@@ -102,7 +102,21 @@
 
 <noparse><if \@form_properties.has_submit\@ nil></noparse>
   <tr>
-    <td align=right><br><input type=submit value=Submit></td>
+    <td align=right>
+      <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>
 <noparse></if></noparse>
 <noparse><else></noparse>