diff options
| author | Lauri Ojansivu <x@xet7.org> | 2019-02-27 16:27:15 +0200 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2019-02-27 16:27:15 +0200 |
| commit | 2489cc5b91b04c008a5f91592c8f042f255ea154 (patch) | |
| tree | 861a8e99fca5a84ec025123df81de36127277fab /client/components/users | |
| parent | 1c832a24b7ca532f3e0b1a0e0c221a4631601e46 (diff) | |
| parent | 29c3080eb6b925e0fe8308b721dca25cbeb34e73 (diff) | |
| download | wekan-2489cc5b91b04c008a5f91592c8f042f255ea154.tar.gz wekan-2489cc5b91b04c008a5f91592c8f042f255ea154.tar.bz2 wekan-2489cc5b91b04c008a5f91592c8f042f255ea154.zip | |
Merge branch 'devel' into meteor-1.8
Diffstat (limited to 'client/components/users')
| -rw-r--r-- | client/components/users/userHeader.jade | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/client/components/users/userHeader.jade b/client/components/users/userHeader.jade index b6e10d8a..af120045 100644 --- a/client/components/users/userHeader.jade +++ b/client/components/users/userHeader.jade @@ -4,10 +4,11 @@ template(name="headerUserBar") .header-user-bar-avatar +userAvatar(userId=currentUser._id) unless isMiniScreen - if currentUser.profile.fullname - = currentUser.profile.fullname - else - = currentUser.username + unless isSandstorm + if currentUser.profile.fullname + = currentUser.profile.fullname + else + = currentUser.username template(name="memberMenuPopup") ul.pop-over-list @@ -15,13 +16,15 @@ template(name="memberMenuPopup") li: a.js-edit-profile {{_ 'edit-profile'}} li: a.js-change-settings {{_ 'change-settings'}} li: a.js-change-avatar {{_ 'edit-avatar'}} - li: a.js-change-password {{_ 'changePasswordPopup-title'}} - li: a.js-change-language {{_ 'changeLanguagePopup-title'}} + unless isSandstorm + li: a.js-change-password {{_ 'changePasswordPopup-title'}} + li: a.js-change-language {{_ 'changeLanguagePopup-title'}} if currentUser.isAdmin li: a.js-go-setting(href="{{pathFor 'setting'}}") {{_ 'admin-panel'}} - hr - ul.pop-over-list - li: a.js-logout {{_ 'log-out'}} + unless isSandstorm + hr + ul.pop-over-list + li: a.js-logout {{_ 'log-out'}} template(name="editProfilePopup") form |