diff options
| author | Lauri Ojansivu <x@xet7.org> | 2017-11-29 11:29:43 +0200 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2017-11-29 11:29:43 +0200 |
| commit | 5d8462ca11abcbfd19bef6c1a46d9eb6266990df (patch) | |
| tree | 3b4aa2354e46c2a15dacabffc39769511b69ef00 /client/components/users/userHeader.jade | |
| parent | 7e4b42e9b3482460cac77a603809a8b5d4016477 (diff) | |
| parent | c31d7455f7b7de4198ee46c59fe0886c54bf457c (diff) | |
| download | wekan-5d8462ca11abcbfd19bef6c1a46d9eb6266990df.tar.gz wekan-5d8462ca11abcbfd19bef6c1a46d9eb6266990df.tar.bz2 wekan-5d8462ca11abcbfd19bef6c1a46d9eb6266990df.zip | |
Merge branch 'conflict-resolution-458' of https://github.com/nztqa/wekan into nztqa-conflict-resolution-458
Diffstat (limited to 'client/components/users/userHeader.jade')
| -rw-r--r-- | client/components/users/userHeader.jade | 9 |
1 files changed, 5 insertions, 4 deletions
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 |