diff options
| author | floatinghotpot <rjfun.mobile@gmail.com> | 2015-12-07 11:15:57 +0800 |
|---|---|---|
| committer | floatinghotpot <rjfun.mobile@gmail.com> | 2015-12-07 11:15:57 +0800 |
| commit | 011f53ad0828c0979d15e232abf501180c741288 (patch) | |
| tree | 41330fe4e47c443dd9fefd0493f30a186e4c4999 /client/components/users | |
| parent | d4c5310d65cbdfbd002288d33eba429ace33bc3c (diff) | |
| download | wekan-011f53ad0828c0979d15e232abf501180c741288.tar.gz wekan-011f53ad0828c0979d15e232abf501180c741288.tar.bz2 wekan-011f53ad0828c0979d15e232abf501180c741288.zip | |
add: invite user via email, invited user can accept or decline, allow member to quit
Diffstat (limited to 'client/components/users')
| -rw-r--r-- | client/components/users/userAvatar.js | 5 | ||||
| -rw-r--r-- | client/components/users/userAvatar.styl | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/client/components/users/userAvatar.js b/client/components/users/userAvatar.js index 1f1da251..1e531882 100644 --- a/client/components/users/userAvatar.js +++ b/client/components/users/userAvatar.js @@ -22,8 +22,11 @@ Template.userAvatar.helpers({ }, presenceStatusClassName() { + const user = Users.findOne(this.userId); const userPresence = presences.findOne({ userId: this.userId }); - if (!userPresence) + if (user && user.isInvitedTo(Session.get('currentBoard'))) + return 'pending'; + else if (!userPresence) return 'disconnected'; else if (Session.equals('currentBoard', userPresence.state.currentBoardId)) return 'active'; diff --git a/client/components/users/userAvatar.styl b/client/components/users/userAvatar.styl index 83257792..b962b01c 100644 --- a/client/components/users/userAvatar.styl +++ b/client/components/users/userAvatar.styl @@ -56,6 +56,10 @@ avatar-radius = 50% background: #bdbdbd border-color: #ededed + &.pending + background: #e44242 + border-color: #f1dada + .edit-avatar position: absolute top: 0 |