Index: openacs-4/packages/file-storage/www/folder-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-delete.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/file-storage/www/folder-delete.tcl	17 May 2004 15:15:14 -0000	1.7
+++ openacs-4/packages/file-storage/www/folder-delete.tcl	25 Mar 2005 23:56:22 -0000	1.8
@@ -47,28 +47,31 @@
     
 set delete_message "[_ file-storage.delete_folder_and_children]"
 set delete_label "[_ file-storage.Yes_Delete]"
-ad_form -name folder-delete -export folder_id -form {
-    {delete_message:text(inform) {label ""} {value $delete_message}}
-    {submit:text(submit) {label $delete_label}}
-} -on_request {
 
-} -on_submit {
-    if {[string equal $blocked_p "f"] } {
-	# they have confirmed that they want to delete the folder
+set edit_buttons [list [list $delete_label ok]]
 
-	db_1row parent_id "
-    select parent_id from cr_items where item_id = :folder_id"
+ad_form -name "folder-delete" \
+    -edit_buttons $edit_buttons \
+    -cancel_url [export_vars -base "index" {folder_id}] \
+    -form {
+	{delete_message:text(inform) {label ""} {value $delete_message}}
+    } -on_request {
 
-	db_exec_plsql folder_delete ""
-
-    }
-
+    } -on_submit {
+	if {[string equal $blocked_p "f"] } {
+	    # they have confirmed that they want to delete the folder
+	    
+	    db_1row parent_id "select parent_id from cr_items where item_id = :folder_id"
+    	    
+	    db_exec_plsql folder_delete ""
+	}
+	
 	ad_returnredirect "index?folder_id=$parent_id"
-
 	ad_script_abort
+    } \
+    -export {folder_id}
+   
 
-}
-
 if { [string equal $confirmed_p "t"] && [string equal $blocked_p "f"] } {
     # they have confirmed that they want to delete the folder
 
@@ -78,7 +81,6 @@
     db_exec_plsql folder_delete ""
 
     ad_returnredirect "index?folder_id=$parent_id"
-
     ad_script_abort
 
 } else {