Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8

src/Umbraco.Web.UI.Client/src/common/resources/macro.resource.js

@@ -115,6 +115,12 @@ function macroResource($q, $http, umbRequestHelper) {
             return umbRequestHelper.resourcePromise(
                 $http.post(umbRequestHelper.getApiUrl("macroApiBaseUrl", "Save"), macro)
             );
+        },
+
+        deleteById: function(id) {
+            return umbRequestHelper.resourcePromise(
+                $http.post(umbRequestHelper.getApiUrl("macroApiBaseUrl", "deleteById", { "id": id }))
+            );
         }
 };
 }

src/Umbraco.Web.UI.Client/src/views/macros/delete.html

@@ -0,0 +1,10 @@
+<div class="umb-dialog umb-pane" ng-controller="Umbraco.Editors.Macros.DeleteController as vm">
+    <div class="umb-dialog-body" auto-scale="90">
+
+        <p class="umb-abstract">
+            <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{vm.name}}</strong> ?
+        </p>
+
+        <umb-confirm on-confirm="vm.performDelete" on-cancel="cancel"></umb-confirm>
+    </div>
+</div>

src/Umbraco.Web.UI.Client/src/views/macros/macros.delete.controller.js

@@ -0,0 +1,32 @@
+/**
+ * @ngdoc controller
+ * @name Umbraco.Editors.Macros.DeleteController
+ * @function
+ * 
+ * @description
+ * The controller for deleting macro items
+ */
+function MacrosDeleteController($scope, $location, macroResource, navigationService, treeService) {
+    var vm = this;
+    
+    vm.name = $scope.currentNode.name;
+    function performDelete() {
+        $scope.currentNode.loading = true;
+        macroResource.deleteById($scope.currentNode.id).then(function () {
+            $scope.currentNode.loading = false;
+
+            treeService.removeNode($scope.currentNode);
+            
+            navigationService.hideMenu();
+        });
+    }
+
+    function cancel() {
+        navigationService.hideDialog();
+    }
+    
+    vm.performDelete = performDelete;
+    vm.cancel = cancel;
+}
+
+angular.module("umbraco").controller("Umbraco.Editors.Macros.DeleteController", MacrosDeleteController);