From aedd7d32683175fd48fe4241e157c86fe36823be Mon Sep 17 00:00:00 2001
From: Per Ploug <per@umbraco.dk>
Date: Mon, 12 Oct 2015 11:36:41 +0200
Subject: [PATCH] Update copy on delete dialogs for folders / non-folders

---
 .../views/documenttypes/delete.controller.js  | 17 ++++++++
 .../src/views/documenttypes/delete.html       | 40 +++++++++++++------
 2 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/documenttypes/delete.controller.js
index f20c4a379a..c920e05480 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/delete.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/delete.controller.js
@@ -25,6 +25,23 @@ function DocumentTypesDeleteController($scope, dataTypeResource, contentTypeReso
 
     };
 
+    $scope.performContainerDelete = function() {
+
+        //mark it for deletion (used in the UI)
+        $scope.currentNode.loading = true;
+        contentTypeResource.deleteContainerById($scope.currentNode.id).then(function () {
+            $scope.currentNode.loading = false;
+
+            //get the root node before we remove it
+            var rootNode = treeService.getTreeRoot($scope.currentNode);
+
+            //TODO: Need to sync tree, etc...
+            treeService.removeNode($scope.currentNode);
+            navigationService.hideMenu();
+        });
+
+    };
+
     $scope.cancel = function() {
         navigationService.hideDialog();
     };
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/delete.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/delete.html
index 6a33565ec8..5c522dcbec 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/delete.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/delete.html
@@ -1,23 +1,39 @@
 <div class="umb-dialog umb-pane" ng-controller="Umbraco.Editors.DocumentTypes.DeleteController">
+
     <div class="umb-dialog-body">
 
-    	<p class="umb-abstract">
-        	Are you absolutely sure you want to delete <strong>{{currentNode.name}}</strong> ?
+        <p class="umb-abstract">
+        	Are you sure you want to delete <strong>{{currentNode.name}}</strong> ?
         </p>
 
-        <p>
-        	<i class="icon-alert red"></i> <strong class="red">All Documents</strong>
-            using this document type will be deleted permanently, please confirm you want to delete these as well.
-        </p>
+        <ng-switch on="currentNode.nodeType">
+            <div ng-switch-when="container">
+                <p>This action cannot be undone, click ok to delete.</p>
 
-        <hr />
+                <umb-confirm
+                    on-confirm="performContainerDelete"
+                    on-cancel="cancel">
+                </umb-confirm>
+            </div>
 
-        <label class="checkbox">
-        		<input type="checkbox" ng-model="confirmed" /> Delete {{currentNode.name}} and all documents using this type
-        </label>
+            <div ng-switch-default>
+                <p>
+                	<i class="icon-alert red"></i> <strong class="red">All Documents</strong>
+                    using this document type will be deleted permanently, please confirm you want to delete these as well.
+                </p>
+
+                <hr />
+
+                <label class="checkbox">
+                	<input type="checkbox" ng-model="confirmed" />
+                    Yes, delete {{currentNode.name}} and all documents using this type
+                </label>
+
+                <umb-confirm ng-if="confirmed" on-confirm="performDelete" on-cancel="cancel">
+                </umb-confirm>
+            </div>
+        </ng-switch>
 
-        <umb-confirm ng-if="confirmed" on-confirm="performDelete" on-cancel="cancel">
-        </umb-confirm>
 
     </div>
 </div>