summaryrefslogtreecommitdiffstats
path: root/client/components/users
diff options
context:
space:
mode:
Diffstat (limited to 'client/components/users')
-rw-r--r--client/components/users/userAvatar.jade12
-rw-r--r--client/components/users/userHeader.jade9
2 files changed, 11 insertions, 10 deletions
diff --git a/client/components/users/userAvatar.jade b/client/components/users/userAvatar.jade
index c61f2365..83e2c8d0 100644
--- a/client/components/users/userAvatar.jade
+++ b/client/components/users/userAvatar.jade
@@ -71,10 +71,10 @@ template(name="cardMemberPopup")
.info
h3= user.profile.fullname
p.quiet @{{ user.username }}
- if currentUser.isBoardMember
- ul.pop-over-list
- li: a.js-remove-member {{_ 'remove-member-from-card'}}
+ ul.pop-over-list
+ if currentUser.isNotCommentOnly
+ li: a.js-remove-member {{_ 'remove-member-from-card'}}
- if $eq currentUser._id user._id
- with currentUser
- li: a.js-edit-profile {{_ 'edit-profile'}}
+ if $eq currentUser._id user._id
+ with currentUser
+ li: a.js-edit-profile {{_ 'edit-profile'}}
diff --git a/client/components/users/userHeader.jade b/client/components/users/userHeader.jade
index f67f82ee..096745ad 100644
--- a/client/components/users/userHeader.jade
+++ b/client/components/users/userHeader.jade
@@ -3,10 +3,11 @@ template(name="headerUserBar")
a.header-user-bar-name.js-open-header-member-menu
.header-user-bar-avatar
+userAvatar(userId=currentUser._id)
- if currentUser.profile.fullname
- = currentUser.profile.fullname
- else
- = currentUser.username
+ unless isMiniScreen
+ if currentUser.profile.fullname
+ = currentUser.profile.fullname
+ else
+ = currentUser.username
template(name="memberMenuPopup")
ul.pop-over-list