diff options
author | Lauri Ojansivu <x@xet7.org> | 2017-11-29 14:19:49 +0200 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2017-11-29 14:19:49 +0200 |
commit | ed95542b675aa34dee1c6eaafb1fb3a157215039 (patch) | |
tree | 4daa8de28d5b7604630b793f0043550eaa2476a7 /client/components/users | |
parent | 9c283112edce9e7dd4bc1bd3b99a64b297082256 (diff) | |
parent | 54036fd7a3ac9bf25b6c601890491af66571d5ff (diff) | |
download | wekan-ed95542b675aa34dee1c6eaafb1fb3a157215039.tar.gz wekan-ed95542b675aa34dee1c6eaafb1fb3a157215039.tar.bz2 wekan-ed95542b675aa34dee1c6eaafb1fb3a157215039.zip |
Merge branch 'devel'
Diffstat (limited to 'client/components/users')
-rw-r--r-- | client/components/users/userAvatar.jade | 12 | ||||
-rw-r--r-- | client/components/users/userHeader.jade | 9 |
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 |