Merge remote-tracking branch 'origin/dev-v7-contenttypeeditor' into 7.4.0

src/Umbraco.Web.UI.Client/src/views/documenttypes/create.controller.js

@@ -30,7 +30,6 @@ function DocumentTypesCreateController($scope, $location, navigationService, con
                 formHelper.resetForm({ scope: $scope });
 
                 var section = appState.getSectionState("currentSection");
-
                 $location.path("/" + section + "/documenttypes/list/" + folderId);
 
             }, function(err) {
@@ -43,14 +42,14 @@ function DocumentTypesCreateController($scope, $location, navigationService, con
     $scope.createDocType = function() {
         $location.search('create', null);
         $location.search('notemplate', null);
-        $location.path("/settings/documenttypes/edit/" + node.id).search("create", true);
+        $location.path("/settings/documenttypes/edit/" + node.id).search("create", "true");
         navigationService.hideMenu();
     }
 
     $scope.createComponent = function() {
       $location.search('create', null);
       $location.search('notemplate', null);
-      $location.path("/settings/documenttypes/edit/" + node.id).search("create", true).search("notemplate", true);
+      $location.path("/settings/documenttypes/edit/" + node.id).search("create", "true").search("notemplate", "true");
       navigationService.hideMenu();
     }
 }

src/Umbraco.Web.UI.Client/src/views/mediatypes/create.controller.js

@@ -31,8 +31,6 @@ function MediaTypesCreateController($scope, $location, navigationService, mediaT
 
                 var section = appState.getSectionState("currentSection");
 
-                $location.path("/" + section + "/mediatypes/list/" + folderId);
-
             }, function(err) {
 
                //TODO: Handle errors
@@ -42,7 +40,7 @@ function MediaTypesCreateController($scope, $location, navigationService, mediaT
 
     $scope.createMediaType = function() {
         $location.search('create', null);
-        $location.path("/settings/mediatypes/edit/" + node.id).search("create", true);
+        $location.path("/settings/mediatypes/edit/" + node.id).search("create", "true");
         navigationService.hideMenu();
     }
 }

src/Umbraco.Web.UI.Client/src/views/membertypes/create.controller.js

@@ -0,0 +1,48 @@
+/**
+ * @ngdoc controller
+ * @name Umbraco.Editors.MemberType.CreateController
+ * @function
+ *
+ * @description
+ * The controller for the member type creation dialog
+ */
+function MemberTypesCreateController($scope, $location, navigationService, memberTypeResource, formHelper, appState) {
+
+    $scope.model = {
+        folderName: "",
+        creatingFolder: false
+    };
+
+    var node = $scope.dialogOptions.currentNode;
+
+    $scope.showCreateFolder = function() {
+        $scope.model.creatingFolder = true;
+    }
+
+    $scope.createFolder = function () {
+        if (formHelper.submitForm({ scope: $scope, formCtrl: this.createFolderForm, statusMessage: "Creating folder..." })) {
+            memberTypeResource.createFolder(node.id, $scope.model.folderName).then(function (folderId) {
+
+                navigationService.hideMenu();
+                var currPath = node.path ? node.path : "-1";
+                navigationService.syncTree({ tree: "membertypes", path: currPath + "," + folderId, forceReload: true, activate: true });
+
+                formHelper.resetForm({ scope: $scope });
+
+                var section = appState.getSectionState("currentSection");
+
+            }, function(err) {
+
+               //TODO: Handle errors
+            });
+        };
+    }
+
+    $scope.createMemberType = function() {
+        $location.search('create', null);
+        $location.path("/settings/membertypes/edit/" + node.id).search("create", "true");
+        navigationService.hideMenu();
+    }
+}
+
+angular.module('umbraco').controller("Umbraco.Editors.MemberTypes.CreateController", MemberTypesCreateController);

src/Umbraco.Web.UI.Client/src/views/membertypes/create.html

@@ -0,0 +1,51 @@
+<div class="umbracoDialog umb-dialog-body with-footer" ng-controller="Umbraco.Editors.MemberTypes.CreateController">
+
+    <div class="umb-pane" ng-if="!model.creatingFolder">
+        <h5><localize key="create_createUnder">Create a type under</localize> {{currentNode.name}}</h5>
+
+        <ul class="umb-actions umb-actions-child">
+            <li>
+                <a href="" ng-click="showCreateFolder()">
+
+                    <i class="large icon-folder"></i>
+
+                    <span class="menu-label">
+                        Folder
+                    </span>
+                </a>
+            </li>
+            <li>
+                <a href="" ng-click="createMemberType()">
+
+                    <i class="large icon-item-arrangement"></i>
+
+                    <span class="menu-label">
+                        <localize key="general_new">New</localize>&nbsp;
+                        <localize key="content_memberType">Member type</localize>
+                    </span>
+
+                </a>
+            </li>
+        </ul>
+    </div>
+
+    <div class="umb-pane" ng-if="model.creatingFolder">
+        <form novalidate name="createFolderForm"
+              ng-submit="createFolder()"
+              val-form-manager>
+
+            <umb-control-group label="Enter a folder name" hide-label="false">
+                <input type="text" name="folderName" ng-model="model.folderName" class="umb-textstring textstring input-block-level" required />
+            </umb-control-group>
+
+            <button type="submit" class="btn btn-primary"><localize key="general_create">Create</localize></button>
+        </form>
+    </div>
+
+</div>
+
+<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-if="!model.creatingFolder">
+    <button class="btn" ng-click="nav.hideDialog(true)">
+        <localize key="buttons_somethingElse">Do something else</localize>
+    </button>
+</div>