From 44d14c41001d0bb5d1ebd3142aabccc60e511483 Mon Sep 17 00:00:00 2001
From: jvelilla <javier.hector@gmail.com>
Date: Wed, 13 May 2015 12:27:02 -0300
Subject: [PATCH] delete with tabs

---
 .../handler/cms_node_type_webform_manager.e   | 11 ++++++++++
 modules/node/handler/node_form_response.e     | 20 +++++++++----------
 modules/node/node_module.e                    |  3 +++
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/modules/node/handler/cms_node_type_webform_manager.e b/modules/node/handler/cms_node_type_webform_manager.e
index 88161a4..5c99396 100644
--- a/modules/node/handler/cms_node_type_webform_manager.e
+++ b/modules/node/handler/cms_node_type_webform_manager.e
@@ -167,6 +167,17 @@ feature -- Output
 			lnk.set_weight (2)
 			a_response.add_to_primary_tabs (lnk)
 
+			if
+				a_node /= Void and then
+				a_node.id > 0 and then
+				attached node_api.node_type_for (a_node) as l_type and then
+				a_response.has_permission ("delete " + node_api.permission_scope (a_response.current_user (a_response.request), a_node) + " " + l_type.name)
+			then
+				create lnk.make ("Delete", node_api.node_path (a_node) + "/delete")
+				lnk.set_weight (3)
+				a_response.add_to_primary_tabs (lnk)
+			end
+
 			create s.make_empty
 			s.append ("<div class=%"info%"> ")
 			if attached a_node.author as l_author then
diff --git a/modules/node/handler/node_form_response.e b/modules/node/handler/node_form_response.e
index 8ade0b6..c39c5c0 100644
--- a/modules/node/handler/node_form_response.e
+++ b/modules/node/handler/node_form_response.e
@@ -61,13 +61,13 @@ feature -- Execution
 								-- FIXME: Hack for now
 							set_title (l_node.title)
 							add_to_menu (create {CMS_LOCAL_LINK}.make ("View", node_url (l_node)), primary_tabs)
+							add_to_menu (create {CMS_LOCAL_LINK}.make ("Delete", "/node/" + l_node.id.out + "/delete"), primary_tabs)
 							add_to_menu (create {CMS_LOCAL_LINK}.make ("Edit", "/node/" + l_node.id.out + "/edit"), primary_tabs)
-
 							b.append (html_encoded (l_type.title) + " saved")
 						else
 							set_title ("Edit " + html_encoded (l_type.title) + " #" + l_node.id.out)
-
 							add_to_menu (create {CMS_LOCAL_LINK}.make ("View", node_url (l_node)), primary_tabs)
+							add_to_menu (create {CMS_LOCAL_LINK}.make ("Delete", "/node/" + l_node.id.out + "/delete"), primary_tabs)
 							add_to_menu (create {CMS_LOCAL_LINK}.make ("Edit", "/node/" + l_node.id.out + "/edit"), primary_tabs)
 
 							f.append_to_html (wsf_theme, b)
@@ -228,14 +228,14 @@ feature -- Form
 			ts.set_default_value ("Preview")
 			f.extend (ts)
 
-			if a_node /= Void and then a_node.id > 0 and then has_permission ("delete " + a_name) then
-				create ts.make ("op")
-				ts.set_default_value ("Delete")
-				fixme ("[
-					ts.set_default_value (i18n ("Delete"))i18n or other name such as "translated" or "translation
-					]")
-				f.extend (ts)
-			end
+--			if a_node /= Void and then a_node.id > 0 and then has_permission ("delete " + a_name) then
+--				create ts.make ("op")
+--				ts.set_default_value ("Delete")
+--				fixme ("[
+--					ts.set_default_value (i18n ("Delete"))i18n or other name such as "translated" or "translation
+--					]")
+--				f.extend (ts)
+--			end
 
 			Result := f
 		end
diff --git a/modules/node/node_module.e b/modules/node/node_module.e
index ba6ca2d..2a5272b 100644
--- a/modules/node/node_module.e
+++ b/modules/node/node_module.e
@@ -177,6 +177,9 @@ feature -- Hooks
 			create lnk.make ("List of nodes", a_response.url ("/nodes", Void))
 			a_menu_system.primary_menu.extend (lnk)
 
+			create lnk.make ("Trash nodes", a_response.url ("/trash", Void))
+			a_menu_system.primary_menu.extend (lnk)
+
 			create lnk.make ("Create ..", a_response.url ("/node/", Void))
 			a_menu_system.primary_menu.extend (lnk)
 		end