From bea074c96498fc4c97d9d52b05f81f548e2e7548 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 14 Nov 2018 11:17:44 +0100 Subject: [PATCH] fix up "Do something else"-buttons --- .../content/content.create.controller.js | 4 + .../src/views/content/create.html | 92 ++++----- .../contentblueprints/create.controller.js | 6 + .../src/views/contentblueprints/create.html | 2 +- .../src/views/datatypes/create.controller.js | 8 +- .../src/views/datatypes/create.html | 79 ++++---- .../views/documenttypes/create.controller.js | 5 + .../src/views/documenttypes/create.html | 182 +++++++++--------- .../src/views/media/create.html | 62 +++--- .../views/media/media.create.controller.js | 5 + .../src/views/mediatypes/create.controller.js | 7 +- .../src/views/mediatypes/create.html | 78 ++++---- .../src/views/member/create.html | 41 ++-- .../views/member/member.create.controller.js | 7 +- .../partialviewmacros/create.controller.js | 8 +- .../src/views/partialviewmacros/create.html | 2 +- .../views/partialviews/create.controller.js | 8 +- .../src/views/partialviews/create.html | 2 +- .../src/views/scripts/create.controller.js | 6 + .../src/views/scripts/create.html | 82 ++++---- .../views/stylesheets/create.controller.js | 7 + .../src/views/stylesheets/create.html | 50 ++--- 22 files changed, 416 insertions(+), 327 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.create.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.create.controller.js index fe9ae4ebf9..6b1021b663 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/content.create.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/content/content.create.controller.js @@ -65,6 +65,10 @@ function contentCreateController($scope, close(); } + $scope.closeDialog = function(showMenu) { + navigationService.hideDialog(showMenu); + }; + $scope.createBlank = createBlank; $scope.createOrSelectBlueprintIfAny = createOrSelectBlueprintIfAny; $scope.createFromBlueprint = createFromBlueprint; diff --git a/src/Umbraco.Web.UI.Client/src/views/content/create.html b/src/Umbraco.Web.UI.Client/src/views/content/create.html index a2ca17e799..e76d17caa8 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/create.html +++ b/src/Umbraco.Web.UI.Client/src/views/content/create.html @@ -1,55 +1,59 @@ -
+
+ +
-
-
Create a page under {{currentNode.name}}
-
Select a blueprint
+
+
Create a page under {{currentNode.name}}
+
Select a blueprint
-

- -

+

+ +

- +
+
+ +
+
-
-
-
\ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/contentblueprints/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/contentblueprints/create.controller.js index 76ddb0d599..85e0dfe976 100644 --- a/src/Umbraco.Web.UI.Client/src/views/contentblueprints/create.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/contentblueprints/create.controller.js @@ -13,6 +13,7 @@ function ContentBlueprintCreateController($scope, $location, contentTypeResource var section = appState.getSectionState("currentSection"); vm.createBlueprint = createBlueprint; + vm.close = close; function onInit() { @@ -30,6 +31,11 @@ function ContentBlueprintCreateController($scope, $location, contentTypeResource navigationService.hideMenu(); } + function close() { + const showMenu = true; + navigationService.hideDialog(showMenu); + } + onInit(); } diff --git a/src/Umbraco.Web.UI.Client/src/views/contentblueprints/create.html b/src/Umbraco.Web.UI.Client/src/views/contentblueprints/create.html index ab14eac784..24cfe5d0d1 100644 --- a/src/Umbraco.Web.UI.Client/src/views/contentblueprints/create.html +++ b/src/Umbraco.Web.UI.Client/src/views/contentblueprints/create.html @@ -31,7 +31,7 @@ diff --git a/src/Umbraco.Web.UI.Client/src/views/datatypes/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/datatypes/create.controller.js index 777702168f..6cce37943e 100644 --- a/src/Umbraco.Web.UI.Client/src/views/datatypes/create.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/datatypes/create.controller.js @@ -41,7 +41,13 @@ function DataTypeCreateController($scope, $location, navigationService, dataType $location.search('create', null); $location.path("/" + section + "/datatypes/edit/" + node.id).search("create", "true"); navigationService.hideMenu(); - } + }; + + $scope.close = function() { + const showMenu = true; + navigationService.hideDialog(showMenu); + }; + } angular.module('umbraco').controller("Umbraco.Editors.DataType.CreateController", DataTypeCreateController); diff --git a/src/Umbraco.Web.UI.Client/src/views/datatypes/create.html b/src/Umbraco.Web.UI.Client/src/views/datatypes/create.html index 7d1c2a7e07..c359e7bfd1 100644 --- a/src/Umbraco.Web.UI.Client/src/views/datatypes/create.html +++ b/src/Umbraco.Web.UI.Client/src/views/datatypes/create.html @@ -1,45 +1,48 @@ -
+
+
-
-
Create an item under {{currentNode.name}}
+
+
Create an item under {{currentNode.name}}
+ + +
+ +
+
+ + + + + + +
+
-
-
-
- - - - - - -
+
+
- -
- -
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.controller.js index 4315b17978..384c3e3a35 100644 --- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.controller.js @@ -123,6 +123,11 @@ function DocumentTypesCreateController($scope, $location, navigationService, con $location.path("/settings/documenttypes/edit/" + node.id).search("create", "true").search("notemplate", "true"); navigationService.hideMenu(); }; + + $scope.close = function() { + const showMenu = true; + navigationService.hideDialog(showMenu); + }; } angular.module('umbraco').controller("Umbraco.Editors.DocumentTypes.CreateController", DocumentTypesCreateController); diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html index c9f62cd870..0329111488 100644 --- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html +++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html @@ -1,105 +1,109 @@ -
+
-
-
Create an item under {{currentNode.name}}
+
- -
+
+
Create an item under {{currentNode.name}}
-
-
+ +
-
-
-
{{error.errorMsg}}
-
{{error.data.message}}
+
+ + +
+
+
{{error.errorMsg}}
+
{{error.data.message}}
+
-
- - - + + + - - -
+ + +
-
- - A Document Type collection is a fast way to create two Document Types in one task. - The Item Document Type will automatically be - allowed under the Parent Document Type. - -

 

-
+
+ + A Document Type collection is a fast way to create two Document Types in one task. + The Item Document Type will automatically be + allowed under the Parent Document Type. + +

 

+ -
-
-
{{error.errorMsg}}
-
{{error.data.message}}
+
+
+
{{error.errorMsg}}
+
{{error.data.message}}
+
-
- - - - - - - + + + + + + + - - - - - - - + + + + + + + - - + + +
+
+ +
+
-
-
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/create.html b/src/Umbraco.Web.UI.Client/src/views/media/create.html index 08809e226f..5d3528bb1c 100644 --- a/src/Umbraco.Web.UI.Client/src/views/media/create.html +++ b/src/Umbraco.Web.UI.Client/src/views/media/create.html @@ -1,44 +1,46 @@ -
-
+
+
+
-
Create under {{currentNode.name}}
+
Create under {{currentNode.name}}
-

- -

+

+ +

- +
-
- -
- +
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/media.create.controller.js b/src/Umbraco.Web.UI.Client/src/views/media/media.create.controller.js index a037df9ab7..0f409d35c3 100644 --- a/src/Umbraco.Web.UI.Client/src/views/media/media.create.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/media/media.create.controller.js @@ -16,6 +16,11 @@ function mediaCreateController($scope, $routeParams, $location, mediaTypeResourc $location.path("/media/media/edit/" + $scope.currentNode.id).search("doctype", docType.alias).search("create", "true"); navigationService.hideMenu(); }; + + $scope.close = function() { + const showMenu = true; + navigationService.hideDialog(showMenu); + }; } diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.controller.js index 910f398e34..be91b66ab5 100644 --- a/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.controller.js @@ -45,7 +45,12 @@ function MediaTypesCreateController($scope, $location, navigationService, mediaT $location.search('create', null); $location.path("/settings/mediatypes/edit/" + node.id).search("create", "true"); navigationService.hideMenu(); - } + }; + + $scope.close = function() { + const showMenu = true; + navigationService.hideDialog(showMenu); + }; } angular.module('umbraco').controller("Umbraco.Editors.MediaTypes.CreateController", MediaTypesCreateController); diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.html b/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.html index 795fd0ba7b..35556f035a 100644 --- a/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.html +++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.html @@ -1,44 +1,48 @@ -
+
-
-
Create an item under {{currentNode.name}}
+
+ +
+
Create an item under {{currentNode.name}}
+ + +
+ +
+
+ + + + + + +
+
-
-
-
- - - - - - -
+
+
- -
- -
diff --git a/src/Umbraco.Web.UI.Client/src/views/member/create.html b/src/Umbraco.Web.UI.Client/src/views/member/create.html index e448583cdb..a0140d0834 100644 --- a/src/Umbraco.Web.UI.Client/src/views/member/create.html +++ b/src/Umbraco.Web.UI.Client/src/views/member/create.html @@ -1,25 +1,28 @@ -
-
+
+
+
-
Create a new member
- +
+
+ +
+
-
-
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/member/member.create.controller.js b/src/Umbraco.Web.UI.Client/src/views/member/member.create.controller.js index adbf4dfd7f..c407b855eb 100644 --- a/src/Umbraco.Web.UI.Client/src/views/member/member.create.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/member/member.create.controller.js @@ -6,11 +6,16 @@ * @description * The controller for the member creation dialog */ -function memberCreateController($scope, $routeParams, memberTypeResource, iconHelper) { +function memberCreateController($scope, memberTypeResource, iconHelper, navigationService) { memberTypeResource.getTypes($scope.currentNode.id).then(function (data) { $scope.allowedTypes = iconHelper.formatContentTypeIcons(data); }); + + $scope.close = function() { + const showMenu = true; + navigationService.hideDialog(showMenu); + }; } diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.controller.js index 6094a0f696..bbf62bca8c 100644 --- a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.controller.js @@ -1,7 +1,7 @@ (function () { "use strict"; - function PartialViewMacrosCreateController($scope, codefileResource, macroResource, $location, navigationService, formHelper, localizationService, appState) { + function PartialViewMacrosCreateController($scope, codefileResource, $location, navigationService, formHelper, appState) { var vm = this; var node = $scope.currentNode; @@ -19,6 +19,7 @@ vm.createFileWithoutMacro = createFileWithoutMacro; vm.showCreateFromSnippet = showCreateFromSnippet; vm.createFileFromSnippet = createFileFromSnippet; + vm.close = close; function onInit() { codefileResource.getSnippets('partialViewMacros') @@ -76,6 +77,11 @@ vm.showSnippets = true; } + function close() { + const showMenu = true; + navigationService.hideDialog(showMenu); + } + onInit(); } diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html index 74a611b3d9..5c34040a8d 100644 --- a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html +++ b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html @@ -79,7 +79,7 @@
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviews/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/partialviews/create.controller.js index 79fd844f42..fbde1d5a07 100644 --- a/src/Umbraco.Web.UI.Client/src/views/partialviews/create.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/partialviews/create.controller.js @@ -1,7 +1,7 @@ (function () { "use strict"; - function PartialViewsCreateController($scope, codefileResource, $location, navigationService, formHelper, localizationService, appState) { + function PartialViewsCreateController($scope, codefileResource, $location, navigationService, formHelper, appState) { var vm = this; var node = $scope.currentNode; @@ -16,6 +16,7 @@ vm.showCreateFolder = showCreateFolder; vm.createFolder = createFolder; vm.showCreateFromSnippet = showCreateFromSnippet; + vm.close = close; function onInit() { codefileResource.getSnippets('partialViews') @@ -69,6 +70,11 @@ function showCreateFromSnippet() { vm.showSnippets = true; } + + function close() { + const showMenu = true; + navigationService.hideDialog(showMenu); + } onInit(); diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html b/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html index cfeb2396a7..1165776be6 100644 --- a/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html +++ b/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html @@ -69,7 +69,7 @@
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/scripts/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/scripts/create.controller.js index 6370b7fc57..096ae72e61 100644 --- a/src/Umbraco.Web.UI.Client/src/views/scripts/create.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/scripts/create.controller.js @@ -14,6 +14,7 @@ vm.createFile = createFile; vm.showCreateFolder = showCreateFolder; vm.createFolder = createFolder; + vm.close = close; function createFile() { $location.path("/settings/scripts/edit/" + node.id).search("create", "true"); @@ -52,6 +53,11 @@ } + function close() { + const showMenu = true; + navigationService.hideDialog(showMenu); + } + } angular.module("umbraco").controller("Umbraco.Editors.Scripts.CreateController", ScriptsCreateController); diff --git a/src/Umbraco.Web.UI.Client/src/views/scripts/create.html b/src/Umbraco.Web.UI.Client/src/views/scripts/create.html index 8b5e0732d2..89a6ce1f7d 100644 --- a/src/Umbraco.Web.UI.Client/src/views/scripts/create.html +++ b/src/Umbraco.Web.UI.Client/src/views/scripts/create.html @@ -1,49 +1,53 @@ -
+
-
-
Create an item under {{currentNode.name}}
+
- +
+
Create an item under {{currentNode.name}}
-
+ -
-
- -
-
-
{{vm.createFolderError.errorMsg}}
-
{{vm.createFolderError.data.message}}
+
+ +
+ + +
+
+
{{vm.createFolderError.errorMsg}}
+
{{vm.createFolderError.data.message}}
+
-
- - - + + + + + + +
- -
-
+
+ +
-
- -
+
\ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.controller.js index 96cd3ca71a..b37b16d4d6 100644 --- a/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.controller.js @@ -8,6 +8,7 @@ vm.createFile = createFile; vm.createRichtextStyle = createRichtextStyle; + vm.close = close; function createFile() { $location.path("/settings/stylesheets/edit/" + node.id).search("create", "true"); @@ -18,6 +19,12 @@ $location.path("/settings/stylesheets/edit/" + node.id).search("create", "true").search("rtestyle", "true"); navigationService.hideMenu(); } + + function close() { + const showMenu = true; + navigationService.hideDialog(showMenu); + } + } angular.module("umbraco").controller("Umbraco.Editors.StyleSheets.CreateController", StyleSheetsCreateController); diff --git a/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.html b/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.html index c735d2fe3c..71811d2b07 100644 --- a/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.html +++ b/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.html @@ -1,29 +1,33 @@ -
+
-
-
Create an item under {{currentNode.name}}
+
- +
+
Create an item under {{currentNode.name}}
+ + + +
-
+
+ +
-
- -
+
\ No newline at end of file