From 48ef1aab1ca9ef4342e129628a41bae641e2cf66 Mon Sep 17 00:00:00 2001 From: perploug Date: Mon, 21 Oct 2013 14:26:51 +0200 Subject: [PATCH] adds cancel buttons to all dialogs --- .../views/common/dialogs/contentpicker.html | 15 ++++- .../src/views/common/dialogs/insertmacro.html | 12 ++-- .../src/views/common/dialogs/linkpicker.html | 10 +++- .../src/views/common/dialogs/macropicker.html | 4 +- .../src/views/common/dialogs/mediapicker.html | 24 +++++--- .../views/common/dialogs/memberpicker.html | 23 ++++++-- .../src/views/common/dialogs/rteembed.html | 5 +- .../common/dialogs/treepicker.controller.js | 55 +++++++++++++------ .../src/views/common/dialogs/treepicker.html | 15 ++++- 9 files changed, 121 insertions(+), 42 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/contentpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/contentpicker.html index e99fc2582e..946270c0f8 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/contentpicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/contentpicker.html @@ -46,10 +46,21 @@ -
+
- + + + Cancel + + + +
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/insertmacro.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/insertmacro.html index 5c6872d76e..41d4cd17c7 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/insertmacro.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/insertmacro.html @@ -3,8 +3,12 @@
- - + + + +
@@ -12,9 +16,9 @@ - Required + diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html index 5677b5feb0..3d0ccbae2c 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html @@ -33,7 +33,15 @@
- + + Cancel + + +
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/macropicker.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/macropicker.html index a369d15f63..87fa0e7fe8 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/macropicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/macropicker.html @@ -1,6 +1,6 @@
-
+
    @@ -14,7 +14,7 @@
    -
    woot {{dialogData.macro.name}}
    +
    {{dialogData.macro.name}}
    -
    -
    -
    - -
    +
    +
    +
    + + + Cancel + + + + +
    +
    -
    diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/memberpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/memberpicker.html index 5ba68a053a..cf8479c1e9 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/memberpicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/memberpicker.html @@ -47,11 +47,22 @@
-
-
-
- -
+
+
+
+ + + Cancel + + + + +
+
-
\ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/rteembed.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/rteembed.html index be7da559b9..2e6c827b78 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/rteembed.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/rteembed.html @@ -22,7 +22,10 @@
- Cancel + + + +
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.controller.js index 686830dc1a..f1c061eea3 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.controller.js @@ -12,32 +12,48 @@ angular.module("umbraco").controller("Umbraco.Dialogs.TreePickerController", $scope.entityType ="Document"; $scope.results = []; - if(dialogOptions.treeAlias === "member"){ + if(dialogOptions.section === "member"){ $scope.searcher = searchService.searchMembers; $scope.entityType = "Member"; - }else if(dialogOptions.treeAlias === "media"){ + }else if(dialogOptions.section === "media"){ $scope.searcher = searchService.searchMedia; $scope.entityType = "Media"; } - function select(id){ - entityResource.getById(id, $scope.entityType).then(function(ent){ - if($scope.multiPicker){ - - $scope.showSearch = false; - $scope.results = []; - $scope.term = ""; - $scope.oldTerm = undefined; + function select(text, id){ + + //if we get the root, we just return a constructed entity, no need for server data + if(id < 0){ + var node = { + alias: null, + icon: "icon-folder", + id: id, + name: text}; - $scope.select(ent); + if($scope.multiPicker){ + $scope.select(node); }else{ - $scope.submit(ent); + $scope.submit(node); } - }); + }else{ + entityResource.getById(id, $scope.entityType).then(function(ent){ + if($scope.multiPicker){ + + $scope.showSearch = false; + $scope.results = []; + $scope.term = ""; + $scope.oldTerm = undefined; + + $scope.select(ent); + }else{ + $scope.submit(ent); + } + }); + } } $scope.selectResult = function(result){ - select(result.id); + select(result.title, result.id); }; $scope.performSearch = function(){ @@ -63,14 +79,19 @@ angular.module("umbraco").controller("Umbraco.Dialogs.TreePickerController", eventsService.publish("Umbraco.Dialogs.TreePickerController.Select", args).then(function(args){ - select(args.node.id); + select(args.node.name, args.node.id); if($scope.multiPicker){ var c = $(args.event.target.parentElement); if(!args.node.selected){ args.node.selected = true; - c.find("i.umb-tree-icon").hide() - .after(""); + var temp = ""; + var icon = c.find("i.umb-tree-icon"); + if(icon.length > 0){ + icon.hide().after(temp); + }else{ + c.prepend(temp); + } }else{ args.node.selected = false; c.find(".temporary").remove(); diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.html index 125d929234..a4c3dbc63a 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.html @@ -49,10 +49,21 @@
-
+
- + + + Cancel + + + +