diff options
| author | Lauri Ojansivu <x@xet7.org> | 2019-02-27 16:26:48 +0200 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2019-02-27 16:26:48 +0200 |
| commit | 4a77bc930fdf8e9d951a8d1aa8395f79dc014655 (patch) | |
| tree | b4219c1ac395ea9838ca18d39f34d279639a14d4 /client/components/users | |
| parent | 8d512451610677ab668de596f4b13d0473b47cdc (diff) | |
| parent | 29c3080eb6b925e0fe8308b721dca25cbeb34e73 (diff) | |
| download | wekan-4a77bc930fdf8e9d951a8d1aa8395f79dc014655.tar.gz wekan-4a77bc930fdf8e9d951a8d1aa8395f79dc014655.tar.bz2 wekan-4a77bc930fdf8e9d951a8d1aa8395f79dc014655.zip | |
Merge branch 'devel' into edge
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 a4704933..c55b65c2 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,16 +16,18 @@ 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(href="{{pathFor 'board' id=templatesBoardId slug=templatesBoardSlug}}") {{_ 'templates'}} - 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 |