From a0c6f5e755674a4b4184f3b7c7c0bcb78f878048 Mon Sep 17 00:00:00 2001
From: Len Kranendonk <len@webgui-svn>
Date: Mon, 8 Nov 2004 15:35:50 +0000
Subject: [PATCH] Added a javascript confirmation popup for delete icon

---
 lib/WebGUI/Operation/Page.pm | 24 ------------------------
 lib/WebGUI/Page.pm           |  4 ++--
 2 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/lib/WebGUI/Operation/Page.pm b/lib/WebGUI/Operation/Page.pm
index 8b62db815..7640bc08b 100644
--- a/lib/WebGUI/Operation/Page.pm
+++ b/lib/WebGUI/Operation/Page.pm
@@ -239,30 +239,6 @@ sub www_cutPage {
         }
 }
 
-#-------------------------------------------------------------------
-=head2 www_deletePage
-
-This function returns an 'Are you sure' page for moving the page to the trash.
-
-=cut
-sub www_deletePage {
-	my ($output);
-        if ($session{page}{isSystem}) {
-		return WebGUI::Privilege::vitalComponent();
-	} elsif (WebGUI::Page::canEdit()) {
-		$output .= helpIcon("page delete");
-		$output .= '<h1>'.WebGUI::International::get(42).'</h1>';
-		$output .= WebGUI::International::get(101).'<p>';
-		$output .= '<div align="center"><a href="'.WebGUI::URL::page('op=deletePageConfirm').
-			'">'.WebGUI::International::get(44).'</a>';
-		$output .= '&nbsp;&nbsp;&nbsp;&nbsp;<a href="'.WebGUI::URL::page().'">'.
-			WebGUI::International::get(45).'</a></div>';
-		return $output;
-	} else {
-		return WebGUI::Privilege::insufficient();
-	}
-}
-
 #-------------------------------------------------------------------
 =head2 www_deletePageConfirm
 
diff --git a/lib/WebGUI/Page.pm b/lib/WebGUI/Page.pm
index de123bf98..6014a09a0 100644
--- a/lib/WebGUI/Page.pm
+++ b/lib/WebGUI/Page.pm
@@ -543,7 +543,7 @@ sub generate {
 	}
 	$var{'page.canEdit'} = canEdit();
         $var{'page.controls'} = pageIcon()
-       		.deleteIcon('op=deletePage')
+       		.deleteIcon('op=deletePageConfirm','',WebGUI::International::get(101))
 		.editIcon('op=editPage')
 		.moveUpIcon('op=movePageUp')
 		.moveDownIcon('op=movePageDown')
@@ -552,7 +552,7 @@ sub generate {
 	my $sth = WebGUI::SQL->read("select * from wobject where pageId=".quote($session{page}{pageId})." order by sequenceNumber, wobjectId",WebGUI::SQL->getSlave);
         while (my $wobject = $sth->hashRef) {
 		my $wobjectToolbar = wobjectIcon()
-         		.deleteIcon('func=delete&wid='.${$wobject}{wobjectId})
+         		.deleteIcon('func=deleteConfirm&wid='.${$wobject}{wobjectId},'',WebGUI::International::get(43))
               		.editIcon('func=edit&wid='.${$wobject}{wobjectId})
              		.moveUpIcon('func=moveUp&wid='.${$wobject}{wobjectId})
              		.moveDownIcon('func=moveDown&wid='.${$wobject}{wobjectId})