summaryrefslogtreecommitdiffstats
path: root/client/components/users
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2019-11-02 16:12:40 +0200
committerLauri Ojansivu <x@xet7.org>2019-11-02 16:12:40 +0200
commit3e8f9ef1a5275a5e9b691c7e74dc73b97a43689a (patch)
treee035c173de03a19ba61e718035609d1881edfd0c /client/components/users
parent92efb8bec4744d7eacb134109a325a2c960790cb (diff)
downloadwekan-3e8f9ef1a5275a5e9b691c7e74dc73b97a43689a.tar.gz
wekan-3e8f9ef1a5275a5e9b691c7e74dc73b97a43689a.tar.bz2
wekan-3e8f9ef1a5275a5e9b691c7e74dc73b97a43689a.zip
Assignee field like Jira #2452 , in progress.
Added features: - Assignee can now be added and removed. - Avatar icon is at card and assignee details TODO: - When selecting new assignee (+) icon, list does not yet show avatars and names who to add. There is empty avatar without name. Thanks to xet7 !
Diffstat (limited to 'client/components/users')
-rw-r--r--client/components/users/userAvatar.jade32
-rw-r--r--client/components/users/userAvatar.js30
-rw-r--r--client/components/users/userAvatar.styl12
3 files changed, 4 insertions, 70 deletions
diff --git a/client/components/users/userAvatar.jade b/client/components/users/userAvatar.jade
index e551cab5..ebfa48ba 100644
--- a/client/components/users/userAvatar.jade
+++ b/client/components/users/userAvatar.jade
@@ -15,23 +15,6 @@ template(name="userAvatar")
a.edit-avatar.js-change-avatar
i.fa.fa-pencil
-template(name="userAvatarAssignee")
- a.assignee.js-assignee(title="{{userData.profile.fullname}} ({{userData.username}})")
- if userData.profile.avatarUrl
- img.avatar.avatar-image(src="{{userData.profile.avatarUrl}}")
- else
- +userAvatarInitials(userId=userData._id)
-
- if showStatus
- span.assignee-presence-status(class=presenceStatusClassName)
- span.assignee-type(class=assigneeType)
-
- unless isSandstorm
- if showEdit
- if $eq currentUser._id userData._id
- a.edit-avatar.js-change-avatar
- i.fa.fa-pencil
-
template(name="userAvatarInitials")
svg.avatar.avatar-initials(viewBox="0 0 {{viewPortWidth}} 15")
text(x="50%" y="13" text-anchor="middle")= initials
@@ -95,18 +78,3 @@ template(name="cardMemberPopup")
if $eq currentUser._id user._id
with currentUser
li: a.js-edit-profile {{_ 'edit-profile'}}
-
-template(name="cardAssigneePopup")
- .board-assignee-menu
- .mini-profile-info
- +userAvatar(userId=user._id showEdit=true)
- .info
- h3= user.profile.fullname
- p.quiet @{{ user.username }}
- ul.pop-over-list
- if currentUser.isNotCommentOnly
- li: a.js-remove-assignee {{_ 'remove-member-from-card'}}
-
- if $eq currentUser._id user._id
- with currentUser
- li: a.js-edit-profile {{_ 'edit-profile'}}
diff --git a/client/components/users/userAvatar.js b/client/components/users/userAvatar.js
index 7a2831b2..262a63af 100644
--- a/client/components/users/userAvatar.js
+++ b/client/components/users/userAvatar.js
@@ -139,13 +139,6 @@ Template.cardMembersPopup.helpers({
return _.contains(cardMembers, this.userId);
},
- isCardAssignee() {
- const card = Template.parentData();
- const cardAssignees = card.getAssignees();
-
- return _.contains(cardAssignees, this.userId);
- },
-
user() {
return Users.findOne(this.userId);
},
@@ -173,26 +166,3 @@ Template.cardMemberPopup.events({
},
'click .js-edit-profile': Popup.open('editProfile'),
});
-
-Template.cardAssigneesPopup.events({
- 'click .js-select-assignee'(event) {
- const card = Cards.findOne(Session.get('currentCard'));
- const assigneeId = this.userId;
- card.toggleAssignee(assigneeId);
- event.preventDefault();
- },
-});
-
-Template.cardAssigneePopup.helpers({
- user() {
- return Users.findOne(this.userId);
- },
-});
-
-Template.cardAssigneePopup.events({
- 'click .js-remove-assignee'() {
- Cards.findOne(this.cardId).unassignAssignee(this.userId);
- Popup.close();
- },
- 'click .js-edit-profile': Popup.open('editProfile'),
-});
diff --git a/client/components/users/userAvatar.styl b/client/components/users/userAvatar.styl
index 5fcd9f6c..b962b01c 100644
--- a/client/components/users/userAvatar.styl
+++ b/client/components/users/userAvatar.styl
@@ -2,8 +2,7 @@
avatar-radius = 50%
-.member,
-.assignee
+.member
border-radius: 3px
display: block
position: relative
@@ -33,8 +32,7 @@ avatar-radius = 50%
height: 100%
width: @height
- .member-presence-status,
- .assignee-presence-status
+ .member-presence-status
background-color: #b3b3b3
border: 1px solid #fff
border-radius: 50%
@@ -81,8 +79,7 @@ avatar-radius = 50%
color: white
- &.add-member,
- &.add-assignee
+ &.add-member
display: flex
align-items: center
justify-content: center
@@ -114,8 +111,7 @@ avatar-radius = 50%
p
padding-top: 0
- .member,
- .assignee
+ .member
width: 50px
height: @width
margin-right: 10px