+
+
+
+
+
+
+
+
+
+
Remove
+
+
+
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/role.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/role.controller.js
index 12cb81e08d..12f23d3f7e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/role.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/users/role.controller.js
@@ -9,7 +9,12 @@
vm.page = {};
vm.userRole = {};
- vm.goBack = goBack;
+ vm.goToPage = goToPage;
+ vm.openSectionPicker = openSectionPicker;
+ vm.openContentPicker = openContentPicker;
+ vm.openMediaPicker = openMediaPicker;
+ vm.removeSelectedItem = removeSelectedItem;
+ vm.getUserStateType = getUserStateType;
function init() {
@@ -18,6 +23,7 @@
// get user
usersResource.getUserRole().then(function (userRole) {
vm.userRole = userRole;
+ makeBreadcrumbs();
});
// fake loading
@@ -27,8 +33,83 @@
}
- function goBack() {
- $location.path("/users/users/overview").search("subview", "roles");
+ function goToPage(ancestor) {
+ $location.path(ancestor.path).search("subview", ancestor.subView);
+ }
+
+ function openSectionPicker() {
+ alert("open section picker");
+ }
+
+ function openContentPicker() {
+ vm.contentPicker = {
+ title: "Select content start node",
+ view: "contentpicker",
+ multiPicker: true,
+ show: true,
+ submit: function(model) {
+ if(model.selection) {
+ vm.userRole.startNodesContent = model.selection;
+ }
+ vm.contentPicker.show = false;
+ vm.contentPicker = null;
+ },
+ close: function(oldModel) {
+ vm.contentPicker.show = false;
+ vm.contentPicker = null;
+ }
+ };
+ }
+
+ function openMediaPicker() {
+ vm.contentPicker = {
+ title: "Select media start node",
+ view: "treepicker",
+ section: "media",
+ treeAlias: "media",
+ entityType: "media",
+ multiPicker: true,
+ show: true,
+ submit: function(model) {
+ if(model.selection) {
+ vm.userRole.startNodesMedia = model.selection;
+ }
+ vm.contentPicker.show = false;
+ vm.contentPicker = null;
+ },
+ close: function(oldModel) {
+ vm.contentPicker.show = false;
+ vm.contentPicker = null;
+ }
+ };
+ }
+
+ function removeSelectedItem(index, selection) {
+ selection.splice(index, 1);
+ }
+
+ function getUserStateType(state) {
+ switch (state) {
+ case "disabled" || "umbracoDisabled":
+ return "danger";
+ case "pending":
+ return "warning";
+ default:
+ return "success";
+ }
+ }
+
+ function makeBreadcrumbs() {
+ vm.breadcrumbs = [
+ {
+ "name": "Groups",
+ "path": "/users/users/overview",
+ "subView": "roles"
+ },
+ {
+ "name": vm.userRole.name
+ }
+ ];
}
init();
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/role.html b/src/Umbraco.Web.UI.Client/src/views/users/role.html
index e51eda26b1..d8c79c881e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/role.html
+++ b/src/Umbraco.Web.UI.Client/src/views/users/role.html
@@ -8,25 +8,149 @@
-
-
- ← Back to roles
-
-
+
+
+
+
+
+
+
+
+
+
Default permissions
+
Some content here
+
+
+
+
Granular permissions
+
Some content here
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
index 1ac45d2971..f598224468 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
@@ -8,8 +8,17 @@
vm.loading = false;
vm.page = {};
vm.user = {};
+ vm.breadcrumbs = [];
- vm.goBack = goBack;
+ vm.goToPage = goToPage;
+ vm.openUserRolePicker = openUserRolePicker;
+ vm.openContentPicker = openContentPicker;
+ vm.openMediaPicker = openMediaPicker;
+ vm.removeSelectedItem = removeSelectedItem;
+ vm.disableUser = disableUser;
+ vm.resetPassword = resetPassword;
+ vm.getUserStateType = getUserStateType;
+ vm.changeAvatar = changeAvatar;
function init() {
@@ -18,6 +27,7 @@
// get user
usersResource.getUser($routeParams.id).then(function (user) {
vm.user = user;
+ makeBreadcrumbs(vm.user);
});
// fake loading
@@ -27,8 +37,117 @@
}
- function goBack() {
- $location.path("/users/users/overview").search("subview", "users");
+ function goToPage(ancestor) {
+ $location.path(ancestor.path).search("subview", ancestor.subView);
+ }
+
+ function openUserRolePicker() {
+ vm.userRolePicker = {
+ title: "Select user roles",
+ view: "userrolepicker",
+ selection: vm.user.userRoles,
+ closeButtonLabel: "Cancel",
+ show: true,
+ submit: function(model) {
+ // apply changes
+ if(model.selection) {
+ vm.user.userRoles = model.selection;
+ }
+ vm.userRolePicker.show = false;
+ vm.userRolePicker = null;
+ },
+ close: function(oldModel) {
+ // rollback on close
+ if(oldModel.selection) {
+ vm.user.userRoles = oldModel.selection;
+ }
+ vm.userRolePicker.show = false;
+ vm.userRolePicker = null;
+ }
+ };
+ }
+
+ function openContentPicker() {
+ vm.contentPicker = {
+ title: "Select content start node",
+ view: "contentpicker",
+ multiPicker: true,
+ show: true,
+ submit: function(model) {
+ if(model.selection) {
+ vm.user.startNodesContent = model.selection;
+ }
+ vm.contentPicker.show = false;
+ vm.contentPicker = null;
+ },
+ close: function(oldModel) {
+ vm.contentPicker.show = false;
+ vm.contentPicker = null;
+ }
+ };
+ }
+
+ function openMediaPicker() {
+ vm.contentPicker = {
+ title: "Select media start node",
+ view: "treepicker",
+ section: "media",
+ treeAlias: "media",
+ entityType: "media",
+ multiPicker: true,
+ show: true,
+ submit: function(model) {
+ if(model.selection) {
+ vm.user.startNodesMedia = model.selection;
+ }
+ vm.contentPicker.show = false;
+ vm.contentPicker = null;
+ },
+ close: function(oldModel) {
+ vm.contentPicker.show = false;
+ vm.contentPicker = null;
+ }
+ };
+ }
+
+ function removeSelectedItem(index, selection) {
+ selection.splice(index, 1);
+ }
+
+ function disableUser() {
+ alert("disable user");
+ }
+
+ function resetPassword() {
+ alert("reset password");
+ }
+
+ function getUserStateType(state) {
+ switch (state) {
+ case "disabled" || "umbracoDisabled":
+ return "danger";
+ case "pending":
+ return "warning";
+ default:
+ return "success";
+ }
+ }
+
+ function changeAvatar() {
+ alert("change avatar");
+ }
+
+ function makeBreadcrumbs() {
+ vm.breadcrumbs = [
+ {
+ "name": "Users",
+ "path": "/users/users/overview",
+ "subView": "users"
+ },
+ {
+ "name": vm.user.name
+ }
+ ];
}
init();
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/user.html b/src/Umbraco.Web.UI.Client/src/views/users/user.html
index 208a941200..2ed21bced8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/user.html
+++ b/src/Umbraco.Web.UI.Client/src/views/users/user.html
@@ -15,18 +15,220 @@
-
-
- ← Back to users
-
-
+
+
+
+
+
+
+
+
Meta
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+