Index: openacs-4/contrib/packages/classified-ads/www/admin/ad-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/classified-ads/www/admin/ad-delete.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/classified-ads/www/admin/ad-delete.tcl	21 Jul 2003 05:23:56 -0000	1.2
+++ openacs-4/contrib/packages/classified-ads/www/admin/ad-delete.tcl	23 Jul 2003 21:08:19 -0000	1.3
@@ -9,25 +9,40 @@
 } {
     ad_id:integer,notnull
     title:notnull
+    description:notnull
     {return_url "categories"}
+    context:notnull
 }
 
+set actions [list [list "Yes, Delete this Ad" delete] [list "   Cancel   " cancel]]
+set action [form get_action ad_delete]
+
+switch $action {
+	"delete" {
+		if {[catch {classified-ads::ads::delete -ad_id $ad_id} errmsg]} {
+    			ad_return_error "Problems deleting ad" "<li> The following error occured during deletion: $errmsg"
+    			ad_script_abort
+		}
+		ad_returnredirect $return_url
+		ad_script_abort
+	}
+	"cancel" {
+		ad_returnredirect "ad-one?ad_id=$ad_id&return_url=[export_vars -url $return_url]"
+		ad_script_abort
+	}
+}
+
 ad_form -name ad_delete -export ad_id \
 	-mode display \
-	-cancel_label "No" \
-	-cancel_url "ad-one?ad_id=$ad_id" \
+	-actions $actions \
 	-form {
 
-	{title:text(text)	{label "Title"}
-				{value $title} }
-	{you_sure:text(inform)	{label "Are you sure you want to delete this ad?"} }
+	{title:text(text)		{label "Title"}
+					{value $title}
+					{section "Are you sure you want to delete this ad?"}}
+	{description:text(textarea)	{label "Short Description"}
+					{value $description}
+					{html {cols 60 rows 3 wrap soft}} } 
+	{context:text(hidden)		{value $context}}
 	
-} -edit_data {
-	if {[catch {classified-ads::ads::delete -ad_id $ad_id} errmsg]} {
-    		ad_return_complaint 1 "<li> The following error occured during deletion: $errmsg"
-    		ad_script_abort
-	}
-
-	ad_returnredirect $return_url
-	ad_script_abort
-}
+}