diff --git a/src/Umbraco.Web.UI.Client/src/views/member/create.html b/src/Umbraco.Web.UI.Client/src/views/members/create.html similarity index 100% rename from src/Umbraco.Web.UI.Client/src/views/member/create.html rename to src/Umbraco.Web.UI.Client/src/views/members/create.html diff --git a/src/Umbraco.Web.UI.Client/src/views/member/delete.html b/src/Umbraco.Web.UI.Client/src/views/members/delete.html similarity index 100% rename from src/Umbraco.Web.UI.Client/src/views/member/delete.html rename to src/Umbraco.Web.UI.Client/src/views/members/delete.html diff --git a/src/Umbraco.Web.UI.Client/src/views/member/edit.html b/src/Umbraco.Web.UI.Client/src/views/members/edit.html similarity index 100% rename from src/Umbraco.Web.UI.Client/src/views/member/edit.html rename to src/Umbraco.Web.UI.Client/src/views/members/edit.html diff --git a/src/Umbraco.Web.UI.Client/src/views/member/list.html b/src/Umbraco.Web.UI.Client/src/views/members/list.html similarity index 100% rename from src/Umbraco.Web.UI.Client/src/views/member/list.html rename to src/Umbraco.Web.UI.Client/src/views/members/list.html diff --git a/src/Umbraco.Web.UI.Client/src/views/member/member.create.controller.js b/src/Umbraco.Web.UI.Client/src/views/members/member.create.controller.js similarity index 100% rename from src/Umbraco.Web.UI.Client/src/views/member/member.create.controller.js rename to src/Umbraco.Web.UI.Client/src/views/members/member.create.controller.js diff --git a/src/Umbraco.Web.UI.Client/src/views/member/member.delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/members/member.delete.controller.js similarity index 85% rename from src/Umbraco.Web.UI.Client/src/views/member/member.delete.controller.js rename to src/Umbraco.Web.UI.Client/src/views/members/member.delete.controller.js index f0ca71f762..f82fad5c9a 100644 --- a/src/Umbraco.Web.UI.Client/src/views/member/member.delete.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/members/member.delete.controller.js @@ -2,7 +2,7 @@ * @ngdoc controller * @name Umbraco.Editors.Member.DeleteController * @function - * + * * @description * The controller for deleting content */ @@ -17,10 +17,10 @@ function MemberDeleteController($scope, memberResource, treeService, navigationS $scope.currentNode.loading = false; treeService.removeNode($scope.currentNode); - + //if the current edited item is the same one as we're deleting, we need to navigate elsewhere if (editorState.current && editorState.current.key == $scope.currentNode.id) { - $location.path("/member/member/list/" + ($routeParams.listName ? $routeParams.listName : 'all-members')); + $location.path("/member/members/list/" + ($routeParams.listName ? $routeParams.listName : 'all-members')); } navigationService.hideMenu(); diff --git a/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/members/member.edit.controller.js similarity index 89% rename from src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js rename to src/Umbraco.Web.UI.Client/src/views/members/member.edit.controller.js index 4b8fa8b142..9e5db32983 100644 --- a/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/members/member.edit.controller.js @@ -2,12 +2,12 @@ * @ngdoc controller * @name Umbraco.Editors.Member.EditController * @function - * + * * @description * The controller for the member editor */ function MemberEditController($scope, $routeParams, $location, $q, $window, appState, memberResource, entityResource, navigationService, notificationsService, angularHelper, serverValidationManager, contentEditingHelper, fileManager, formHelper, umbModelMapper, editorState, umbRequestHelper, $http) { - + //setup scope vars $scope.page = {}; $scope.page.loading = false; @@ -19,7 +19,7 @@ function MemberEditController($scope, $routeParams, $location, $q, $window, appS $scope.page.saveButtonState = "init"; $scope.page.listViewPath = ($routeParams.page && $routeParams.listName) - ? "/member/member/list/" + $routeParams.listName + "?page=" + $routeParams.page + ? "/member/members/list/" + $routeParams.listName + "?page=" + $routeParams.page : null; //build a path to sync the tree with @@ -28,8 +28,8 @@ function MemberEditController($scope, $routeParams, $location, $q, $window, appS } if ($routeParams.create) { - - //if there is no doc type specified then we are going to assume that + + //if there is no doc type specified then we are going to assume that // we are not using the umbraco membership provider if ($routeParams.doctype) { @@ -69,14 +69,14 @@ function MemberEditController($scope, $routeParams, $location, $q, $window, appS } else { //so, we usually refernce all editors with the Int ID, but with members we have - //a different pattern, adding a route-redirect here to handle this: + //a different pattern, adding a route-redirect here to handle this: //isNumber doesnt work here since its seen as a string //TODO: Why is this here - I don't understand why this would ever be an integer? This will not work when we support non-umbraco membership providers. if ($routeParams.id && $routeParams.id.length < 9) { entityResource.getById($routeParams.id, "Member").then(function(entity) { - $location.path("/member/member/edit/" + entity.key); + $location.path("/member/members/edit/" + entity.key); }); } else { @@ -92,13 +92,13 @@ function MemberEditController($scope, $routeParams, $location, $q, $window, appS setHeaderNameState($scope.content); editorState.set($scope.content); - + var path = buildTreePath(data); //sync the tree (only for ui purposes) - navigationService.syncTree({ tree: "member", path: path.split(",") }); + navigationService.syncTree({ tree: "members", path: path.split(",") }); - //it's the initial load of the editor, we need to get the tree node + //it's the initial load of the editor, we need to get the tree node // from the server so that we can load in the actions menu. umbRequestHelper.resourcePromise( $http.get(data.treeNodeUrl), @@ -130,7 +130,7 @@ function MemberEditController($scope, $routeParams, $location, $q, $window, appS $scope.save = function() { if (!$scope.busy && formHelper.submitForm({ scope: $scope, statusMessage: "Saving..." })) { - + $scope.busy = true; $scope.page.saveButtonState = "busy"; @@ -146,7 +146,7 @@ function MemberEditController($scope, $routeParams, $location, $q, $window, appS redirectId: data.key, rebindCallback: contentEditingHelper.reBindChangedProperties($scope.content, data) }); - + editorState.set($scope.content); $scope.busy = false; $scope.page.saveButtonState = "success"; @@ -154,16 +154,16 @@ function MemberEditController($scope, $routeParams, $location, $q, $window, appS var path = buildTreePath(data); //sync the tree (only for ui purposes) - navigationService.syncTree({ tree: "member", path: path.split(","), forceReload: true }); + navigationService.syncTree({ tree: "members", path: path.split(","), forceReload: true }); }, function (err) { - + contentEditingHelper.handleSaveError({ redirectOnFailure: false, err: err, rebindCallback: contentEditingHelper.reBindChangedProperties($scope.content, err.data) }); - + editorState.set($scope.content); $scope.busy = false; $scope.page.saveButtonState = "error"; @@ -172,7 +172,7 @@ function MemberEditController($scope, $routeParams, $location, $q, $window, appS }else{ $scope.busy = false; } - + }; } diff --git a/src/Umbraco.Web.UI.Client/src/views/member/member.list.controller.js b/src/Umbraco.Web.UI.Client/src/views/members/member.list.controller.js similarity index 94% rename from src/Umbraco.Web.UI.Client/src/views/member/member.list.controller.js rename to src/Umbraco.Web.UI.Client/src/views/members/member.list.controller.js index 7555addc14..5d3b5dddce 100644 --- a/src/Umbraco.Web.UI.Client/src/views/member/member.list.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/members/member.list.controller.js @@ -2,12 +2,12 @@ * @ngdoc controller * @name Umbraco.Editors.Member.ListController * @function - * + * * @description * The controller for the member list view */ function MemberListController($scope, $routeParams, $location, $q, $window, appState, memberResource, entityResource, navigationService, notificationsService, angularHelper, serverValidationManager, contentEditingHelper, fileManager, formHelper, umbModelMapper, editorState, localizationService) { - + //setup scope vars $scope.currentSection = appState.getSectionState("currentSection"); $scope.currentNode = null; //the editors affiliated node @@ -31,7 +31,7 @@ function MemberListController($scope, $routeParams, $location, $q, $window, appS editorState.set($scope.content); - navigationService.syncTree({ tree: "member", path: data.path.split(",") }).then(function (syncArgs) { + navigationService.syncTree({ tree: "members", path: data.path.split(",") }).then(function (syncArgs) { $scope.currentNode = syncArgs.node; });