Index: openacs-4/packages/acs-templating/tcl/form-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/form-procs.tcl,v
diff -u -r1.20 -r1.21
--- openacs-4/packages/acs-templating/tcl/form-procs.tcl	24 Sep 2003 17:29:25 -0000	1.20
+++ openacs-4/packages/acs-templating/tcl/form-procs.tcl	3 Oct 2003 14:14:15 -0000	1.21
@@ -148,12 +148,6 @@
     ad_script_abort
   }
 
-  # If the user hit a button named "cancel", redirect and about
-  if { $submission && [string equal $formbutton "cancel"] && [exists_and_not_null opts(cancel_url)]} {
-    ad_returnredirect $opts(cancel_url)
-    ad_script_abort
-  }
-
   set formaction [get_action $id]
   # If we were in display mode, and a button was clicked, we should be in edit mode now
   if { $submission && [string equal [ns_queryget "form:mode"] "display"] } {
Index: openacs-4/packages/acs-templating/tcl/tag-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/tag-init.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/acs-templating/tcl/tag-init.tcl	3 Sep 2003 19:53:04 -0000	1.12
+++ openacs-4/packages/acs-templating/tcl/tag-init.tcl	3 Oct 2003 14:14:15 -0000	1.13
@@ -450,6 +450,16 @@
 
   } else {
 
+    template::adp_append_code "
+      set buttons \"\$form_properties(mode)_buttons\"
+      template::multirow create form_buttons label name
+
+      foreach button \$form_properties(\$buttons) {
+        template::multirow append form_buttons \
+          \[lindex \$button 0\] \
+          \"formbutton:\[lindex \$button 1\]\"
+      }"    
+
     # compile the static form layout specified in the template
     template::adp_compile_chunk $chunk