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 5a7859add9..46e70ccbf4 100644 --- a/src/Umbraco.Web.UI.Client/src/views/datatypes/create.html +++ b/src/Umbraco.Web.UI.Client/src/views/datatypes/create.html @@ -1,54 +1,66 @@
-
-
-
Create an item under {{currentNode.name}}
+
+
+
+
Create an item under {{currentNode.name}}
+ +
    +
  • + +
    • +
  • + +
    • +
+
-
    -
  • - -
    • -
  • - -
    • -
-
-
- - - - - - -
+
+
-
-
- +
+
+
+
+ + + +
+
+
+ + + + +
+
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/dictionary/create.html b/src/Umbraco.Web.UI.Client/src/views/dictionary/create.html index 9e628464b2..62546298f0 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dictionary/create.html +++ b/src/Umbraco.Web.UI.Client/src/views/dictionary/create.html @@ -1,21 +1,31 @@ -
- -
-
Create an item under {{currentNode.name}}
-
- -
-
+
- - - + +
+
+
Create an item under {{currentNode.name}}
+
- - -
+
+ + + +
+
+
+ + + + +
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.create.controller.js b/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.create.controller.js index d22738b676..74c1455aea 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.create.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.create.controller.js @@ -12,7 +12,13 @@ function DictionaryCreateController($scope, $location, dictionaryResource, navig vm.itemKey = ""; vm.createItem = createItem; + vm.close = close; $scope.$emit("$changeTitle", ""); + + function close() { + navigationService.hideDialog(); + } + function createItem() { if (formHelper.submitForm({ scope: $scope, formCtrl: $scope.createDictionaryForm })) { 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 143d9b9df1..0caba5f511 100644 --- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html +++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html @@ -1,7 +1,9 @@
-
-
-
Create an item under {{currentNode.name}}
+ +
+
+
+
Create an item under {{currentNode.name}}
  • @@ -54,38 +56,52 @@
-
-
+ +
-
-
-
{{error.errorMsg}}
-
{{error.data.message}}
-
-
+
+ - - - - - -
-
- +
+
+
+
+
+
+
{{error.errorMsg}}
+
{{error.data.message}}
+
+
+ + + +
+
+
+ + + + +
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/import.controller.js b/src/Umbraco.Web.UI.Client/src/views/documenttypes/import.controller.js index 7ca85352ba..6170348243 100644 --- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/import.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/import.controller.js @@ -1,12 +1,14 @@ angular.module("umbraco") .controller("Umbraco.Editors.DocumentTypes.ImportController", - function ($scope, contentTypeResource, navigationService, Upload, umbRequestHelper) { + function ($scope, contentTypeResource, navigationService, Upload, umbRequestHelper) { var vm = this; vm.serverErrorMessage = ""; vm.state = "upload"; vm.model = {}; vm.uploadStatus = ""; + vm.cancelButtonLabel = "cancel"; + $scope.handleFiles = function (files, event) { if (files && files.length > 0) { $scope.upload(files[0]); @@ -67,10 +69,12 @@ angular.module("umbraco") $scope.import = function () { contentTypeResource.import(vm.model.tempFileName); vm.state = "done"; + + vm.cancelButtonLabel = "general_close"; } - $scope.close = function() { + $scope.close = function () { navigationService.hideDialog(); }; - + }); diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/importdocumenttype.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/importdocumenttype.html index 9ddc0b7c93..75919d8c74 100644 --- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/importdocumenttype.html +++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/importdocumenttype.html @@ -1,51 +1,58 @@ -
-
-

- - To import a document type, find the '.udt' file on your computer by clicking the 'Browse' button and click 'Import' (you'll be asked for confirmation on the next screen) - -

+
-
+
+
+
+

+ + To import a document type, find the '.udt' file on your computer by clicking the 'Browse' button and click 'Import' (you'll be asked for confirmation on the next screen) + +

- - + - or + + + - - +
Please choose a .udt file to import
-
Please choose a .udt file to import
- +
+
+ + Name: + + {{vm.model.name}} +
+ + Alias: + + {{vm.model.alias}} +
+
+ +
+
+ {{vm.model.name}} has been imported! +
+
-
- - Name: - - {{vm.model.name}} -
- - Alias: - - {{vm.model.alias}} -
-
- -
-
- {{vm.model.name}} has been imported! + +
+ +
diff --git a/src/Umbraco.Web.UI.Client/src/views/macros/create.html b/src/Umbraco.Web.UI.Client/src/views/macros/create.html index bed989f571..8cf4424247 100644 --- a/src/Umbraco.Web.UI.Client/src/views/macros/create.html +++ b/src/Umbraco.Web.UI.Client/src/views/macros/create.html @@ -1,16 +1,15 @@ 
-
- -
-
Create an item under {{currentNode.name}}
-
- -
-
+ +
+
+
Create an item under {{currentNode.name}}
+
+ +
{{error.errorMsg}}
@@ -22,10 +21,19 @@ +
- -
- -
+
+ + + + +
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/macros/macros.create.controller.js b/src/Umbraco.Web.UI.Client/src/views/macros/macros.create.controller.js index baae8e085a..06fe48f3b1 100644 --- a/src/Umbraco.Web.UI.Client/src/views/macros/macros.create.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/macros/macros.create.controller.js @@ -42,6 +42,10 @@ function MacrosCreateController($scope, $location, macroResource, navigationServ } } + $scope.close = function () { + navigationService.hideDialog(true); + }; + vm.createItem = createItem; } 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 cb7bd74424..afa987f0af 100644 --- a/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.html +++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.html @@ -1,61 +1,72 @@
-
+
+
-
-
Create an item under {{currentNode.name}}
+
+
Create an item under {{currentNode.name}}
-
    -
  • - -
    • -
  • - -
    • -
+
    +
  • + +
    • +
  • + +
    • +
+
-
-
+
+ +
+
-
-
-
{{error.errorMsg}}
-
{{error.data.message}}
+
+ +
+
+
+
+
{{error.errorMsg}}
+
{{error.data.message}}
+
+
+ + + +
- - - - - - - -
- +
+ + + + +
+
- -
- -
-
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 9afd3447ea..e4670174e0 100644 --- a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html +++ b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html @@ -1,86 +1,97 @@
-
+
+
-
+
+ +
- -
+
Create an item under {{currentNode.name}}
-
Create an item under {{currentNode.name}}
- -
    -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • - -
    • -
-
- - -
- -
Select snippet
- -
    -
  • - -
    • -
-
- -
- - -
-
- -
-
-
{{vm.createFolderError.data.message}}
-
+
    +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
- - - + +
- - +
Select snippet
+ +
    +
  • + +
    • +
+
+
+ +
+ +
- -
- -
+
+
+
+ +
+
+
+
{{vm.createFolderError.data.message}}
+
+
+ + + + +
+
+
+ + + + +
+
+
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 3203ed1b25..17ee8b0190 100644 --- a/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html +++ b/src/Umbraco.Web.UI.Client/src/views/partialviews/create.html @@ -1,76 +1,87 @@
-
+
+
-
- -
Create an item under {{currentNode.name}}
+
- -
-
    -
  • - -
    • -
  • - -
    • -
  • - -
    • -
-
+
Create an item under {{currentNode.name}}
- -
-
    -
  • - -
    • -
-
- -
- - -
-
- -
-
-
{{vm.createFolderError.data.message}}
-
+ +
+
    +
  • + +
    • +
  • + +
    • +
  • + +
    • +
- - - - - - + +
+
    +
  • + +
    • +
+
+
+ +
+ +
- -
- -
+
+
+
+ +
+
+
+
{{vm.createFolderError.data.message}}
+
+
+ + + +
+
+
+ + + + +
+
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/relationtypes/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/relationtypes/create.controller.js index bd990961bf..1ebf5dea45 100644 --- a/src/Umbraco.Web.UI.Client/src/views/relationtypes/create.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/relationtypes/create.controller.js @@ -49,6 +49,10 @@ function RelationTypeCreateController($scope, $location, relationTypeResource, n }); } } + + $scope.close = function () { + navigationService.hideDialog(true); + }; } angular.module("umbraco").controller("Umbraco.Editors.RelationTypes.CreateController", RelationTypeCreateController); diff --git a/src/Umbraco.Web.UI.Client/src/views/relationtypes/create.html b/src/Umbraco.Web.UI.Client/src/views/relationtypes/create.html index 93debb5507..72918c6414 100644 --- a/src/Umbraco.Web.UI.Client/src/views/relationtypes/create.html +++ b/src/Umbraco.Web.UI.Client/src/views/relationtypes/create.html @@ -1,60 +1,69 @@ -
-
-
+
- - - - + +
+
+ + + + - - -

-
    -
  • - -
    • -
  • - -
    • -
- + + +

+
    +
  • + +
    • +
  • + +
    • +
+ - - - - + + + + - - - - - - - -
+ + + + +
+
+
+ + + + +
+
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 e11c51068e..3107b508b2 100644 --- a/src/Umbraco.Web.UI.Client/src/views/scripts/create.html +++ b/src/Umbraco.Web.UI.Client/src/views/scripts/create.html @@ -1,52 +1,62 @@ -
+
-
+
+
-
-
Create an item under {{currentNode.name}}
- -
    -
  • - -
    • -
  • - -
    • -
+
+
Create an item under {{currentNode.name}}
+
    +
  • + +
    • +
  • + +
    • +
+
-
-
- -
-
-
{{vm.createFolderError.data.message}}
+
+ +
+
+
+ +
+
+
+
+
{{vm.createFolderError.data.message}}
+
+ + + +
- - - - - - - -
- +
+
+ + + + +
+
- -
- -
-
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 eb63612263..205a677bb6 100644 --- a/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.html +++ b/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.html @@ -1,58 +1,68 @@ -
+
-
+
+
-
-
Create an item under {{currentNode.name}}
- -
    -
  • - -
    • -
  • - -
    • -
  • - -
    • -
+
+
Create an item under {{currentNode.name}}
+
    +
  • + +
    • +
  • + +
    • +
  • + +
    • +
+
-
-
- -
-
-
{{vm.createFolderError.data.message}}
+
+ +
+
+
+ +
+
+
+
+
{{vm.createFolderError.data.message}}
+
+ + + +
- - - - - - - -
- +
+
+ + + + +
+
- -
- -
-