From 89dcb6a0e27be7cb426762e13f30200e2479343c Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 14 Jun 2017 12:51:41 +0200 Subject: [PATCH 1/4] fix start node pickers --- .../src/views/users/group.controller.js | 21 ++++++++++--- .../src/views/users/group.html | 22 +++++++------ .../src/views/users/user.controller.js | 31 +++++++++++++++++-- 3 files changed, 57 insertions(+), 17 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 f92352c036..2f30857edb 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 @@ -15,6 +15,7 @@ vm.openMediaPicker = openMediaPicker; vm.openUserPicker = openUserPicker; vm.removeSelectedItem = removeSelectedItem; + vm.clearStartNode = clearStartNode; vm.getUserStateType = getUserStateType; function init() { @@ -64,11 +65,11 @@ vm.contentPicker = { title: "Select content start node", view: "contentpicker", - multiPicker: true, + hideSubmitButton: true, show: true, submit: function(model) { if(model.selection) { - vm.userGroup.startNodesContent = model.selection; + vm.userGroup.startContentId = model.selection[0]; } vm.contentPicker.show = false; vm.contentPicker = null; @@ -87,11 +88,11 @@ section: "media", treeAlias: "media", entityType: "media", - multiPicker: true, + hideSubmitButton: true, show: true, submit: function(model) { if(model.selection) { - vm.userGroup.startNodesMedia = model.selection; + vm.userGroup.startMediaId = model.selection[0]; } vm.contentPicker.show = false; vm.contentPicker = null; @@ -126,7 +127,17 @@ } function removeSelectedItem(index, selection) { - selection.splice(index, 1); + if(selection && selection.length > 0) { + selection.splice(index, 1); + } + } + + function clearStartNode(type) { + if (type === "content") { + vm.userGroup.startContentId = null; + } else if (type === "media") { + vm.userGroup.startMediaId = null; + } } function getUserStateType(state) { diff --git a/src/Umbraco.Web.UI.Client/src/views/users/group.html b/src/Umbraco.Web.UI.Client/src/views/users/group.html index 2e740fe207..b12358a428 100644 --- a/src/Umbraco.Web.UI.Client/src/views/users/group.html +++ b/src/Umbraco.Web.UI.Client/src/views/users/group.html @@ -44,17 +44,18 @@ - + + on-remove="vm.clearStartNode('content')"> - + + on-remove="vm.clearStartNode('media')"> 0) { + angular.forEach(selection, function (selectedItem) { + if (selectedItem.udi === item.udi) { + found = true; + } + }); + } + // only add the selected item if it is not already selected + if (!found) { + selection.push(item); + } + } + function removeSelectedItem(index, selection) { selection.splice(index, 1); } From cd8418a8c099a66bb5035ab7d9a6f00782083c23 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 14 Jun 2017 12:52:12 +0200 Subject: [PATCH 2/4] remove fake loading of user groups --- .../src/views/users/views/groups/groups.controller.js | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) 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 99107ef516..df882835a0 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 @@ -12,19 +12,15 @@ vm.clearSelection = clearSelection; vm.selectUserGroup = selectUserGroup; - function init() { + function onInit() { vm.loading = true; // Get users usersResource.getUserGroups().then(function (userGroups) { vm.userGroups = userGroups; - }); - - // fake loading - $timeout(function () { vm.loading = false; - }, 500); + }); } @@ -50,7 +46,7 @@ $location.path('users/users/group/' + userGroup.id); } - init(); + onInit(); } From 12de575dfb6e28827276f8e2a0ebaa7ef6b34712 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 14 Jun 2017 13:12:49 +0200 Subject: [PATCH 3/4] update user picker to match new data model --- .../src/views/common/overlays/userpicker/userpicker.html | 2 +- .../src/views/components/umb-avatar.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/userpicker/userpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/userpicker/userpicker.html index 33c4dd41d8..8a3300a5a6 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/userpicker/userpicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/userpicker/userpicker.html @@ -38,7 +38,7 @@
{{ user.name }}
- {{ value }}, + {{ userGroup.name }},
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-avatar.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-avatar.html index c589eabcf7..0bd72ba7a4 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/umb-avatar.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-avatar.html @@ -1,6 +1,6 @@
- -
+ +
{{ initials }} ?
From 898f00cbf17c5d21dc7fead8be59e754356f33e6 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 14 Jun 2017 14:07:07 +0200 Subject: [PATCH 4/4] fix avatar sizes --- src/Umbraco.Core/Models/UserExtensions.cs | 10 +++++----- .../components/users/umbuserpreview.directive.js | 2 +- .../src/views/components/users/umb-user-preview.html | 3 ++- src/Umbraco.Web.UI.Client/src/views/users/group.html | 2 +- src/Umbraco.Web.UI.Client/src/views/users/user.html | 3 ++- .../src/views/users/views/users/users.html | 6 ++++-- 6 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/Umbraco.Core/Models/UserExtensions.cs b/src/Umbraco.Core/Models/UserExtensions.cs index 930d0fff04..a79aec5026 100644 --- a/src/Umbraco.Core/Models/UserExtensions.cs +++ b/src/Umbraco.Core/Models/UserExtensions.cs @@ -69,11 +69,11 @@ namespace Umbraco.Core.Models { return new[] { - gravatarUrl + "?s=30", - gravatarUrl + "?s=60", - gravatarUrl + "?s=90", - gravatarUrl + "?s=150", - gravatarUrl + "?s=300" + gravatarUrl + "&s=30", + gravatarUrl + "&s=60", + gravatarUrl + "&s=90", + gravatarUrl + "&s=150", + gravatarUrl + "&s=300" }; } diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/users/umbuserpreview.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/users/umbuserpreview.directive.js index 29db5f7238..634decfa3d 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/users/umbuserpreview.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/users/umbuserpreview.directive.js @@ -12,7 +12,7 @@ replace: true, templateUrl: 'views/components/users/umb-user-preview.html', scope: { - avatar: "=?", + avatars: "=?", name: "=", allowRemove: "=?", onRemove: "&?" diff --git a/src/Umbraco.Web.UI.Client/src/views/components/users/umb-user-preview.html b/src/Umbraco.Web.UI.Client/src/views/components/users/umb-user-preview.html index 7753376206..be2037209a 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/users/umb-user-preview.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/users/umb-user-preview.html @@ -5,7 +5,8 @@ size="xs" color="secondary" name="{{name}}" - img-src="{{avatar}}"> + img-src="{{avatars[0]}}" + img-srcset="{{avatars[1]}} 2x, {{avatars[2]}} 3x">
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/group.html b/src/Umbraco.Web.UI.Client/src/views/users/group.html index b12358a428..e1a870972d 100644 --- a/src/Umbraco.Web.UI.Client/src/views/users/group.html +++ b/src/Umbraco.Web.UI.Client/src/views/users/group.html @@ -108,7 +108,7 @@ 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 5c9f6c9587..c9e60a2965 100644 --- a/src/Umbraco.Web.UI.Client/src/views/users/user.html +++ b/src/Umbraco.Web.UI.Client/src/views/users/user.html @@ -126,7 +126,8 @@ color="secondary" size="xxl" name="{{vm.user.name}}" - img-src="{{vm.user.avatars[4]}}"> + img-src="{{vm.user.avatars[3]}}" + img-srcset="{{vm.user.avatars[4]}} 2x, {{vm.user.avatars[4]}} 3x"> + img-src="{{user.avatars[2]}}" + img-srcset="{{user.avatars[3]}} 2x, {{user.avatars[4]}} 3x">
@@ -232,7 +233,8 @@ size="xs" color="secondary" name="{{user.name}}" - img-src="{{user.avatars[0]}}"> + img-src="{{user.avatars[0]}}" + img-srcset="{{user.avatars[1]}} 2x, {{user.avatars[2]}} 3x"> {{user.name}}