Merge branch 'user-group-permissions' of https://github.com/umbraco/Umbraco-CMS into user-group-permissions

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
 }

src/Umbraco.Web.UI.Client/src/views/components/application/umb-sections.html

@@ -5,6 +5,8 @@
                 <a href="#" ng-click="avatarClick()" hotkey="ctrl+shift+u" title="{{user.name}}" prevent-default>
                     <umb-avatar
                         size="xs"
+                        color="secondary"
+                        name="{{user.name}}"
                         img-src="{{avatar[0].value}}"
                         img-srcset="{{avatar[1].value}} 2x, {{avatar[2].value}} 3x">
                     </umb-avatar>

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;
+                });
+            }
             
         }
 

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);