From 7353591f4c6b738fa3b4e44e370d6b5c63e6d99e Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 15 Jun 2017 11:06:10 +0200 Subject: [PATCH 1/2] in sections panel: show avatar initials if no avatar --- src/Umbraco.Web.UI.Client/src/less/sections.less | 4 ++++ .../src/views/components/application/umb-sections.html | 2 ++ 2 files changed, 6 insertions(+) diff --git a/src/Umbraco.Web.UI.Client/src/less/sections.less b/src/Umbraco.Web.UI.Client/src/less/sections.less index 51ec5c7436..ba158bc710 100644 --- a/src/Umbraco.Web.UI.Client/src/less/sections.less +++ b/src/Umbraco.Web.UI.Client/src/less/sections.less @@ -89,6 +89,10 @@ ul.sections li.avatar a img { width: 30px; } +ul.sections li.avatar a span { + opacity: 1; +} + .faded ul.sections li { opacity: 0.4 } diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-sections.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-sections.html index e4fde787da..e9d50939f2 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-sections.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-sections.html @@ -5,6 +5,8 @@ From 9f234f1669bb8a44fad7cabf2046f7e3e81d870f Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 15 Jun 2017 11:07:57 +0200 Subject: [PATCH 2/2] start on create user group --- .../src/views/users/group.controller.js | 15 ++++++++++----- .../views/users/views/groups/groups.controller.js | 8 ++++++++ 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/users/group.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/group.controller.js index 2f30857edb..a912c16cfe 100644 --- a/src/Umbraco.Web.UI.Client/src/views/users/group.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/users/group.controller.js @@ -26,13 +26,18 @@ vm.labels.cancel = name; }); - // get user - usersResource.getUserGroup($routeParams.id).then(function (userGroup) { - vm.userGroup = userGroup; - setSectionIcon(vm.userGroup.sections); + if ($routeParams.create) { makeBreadcrumbs(); vm.loading = false; - }); + } else { + // get user group + usersResource.getUserGroup($routeParams.id).then(function (userGroup) { + vm.userGroup = userGroup; + setSectionIcon(vm.userGroup.sections); + makeBreadcrumbs(); + vm.loading = false; + }); + } } diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.controller.js index df882835a0..520bc8c0a1 100644 --- a/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.controller.js @@ -8,6 +8,7 @@ vm.userGroups = []; vm.selection = []; + vm.createUserGroup = createUserGroup; vm.goToUserGroup = goToUserGroup; vm.clearSelection = clearSelection; vm.selectUserGroup = selectUserGroup; @@ -24,6 +25,13 @@ } + function createUserGroup() { + // clear all query params + $location.search({}); + // go to create user group + $location.path('users/users/group/-1').search("create", "true");; + } + function selectUserGroup(userGroup, selection) { if(userGroup.selected) { var index = selection.indexOf(userGroup.id);