summaryrefslogtreecommitdiffstats
path: root/client/components/users/userHeader.jade
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2019-02-27 16:14:14 +0200
committerLauri Ojansivu <x@xet7.org>2019-02-27 16:14:14 +0200
commit34d8235551cdef37f42d378c348031fc6848797c (patch)
treefb4f88909ed51b918a9262e6083f38c0a86dd81b /client/components/users/userHeader.jade
parent55ad98ecc4e834a0bbdcb55453596a813e9bcc43 (diff)
downloadwekan-34d8235551cdef37f42d378c348031fc6848797c.tar.gz
wekan-34d8235551cdef37f42d378c348031fc6848797c.tar.bz2
wekan-34d8235551cdef37f42d378c348031fc6848797c.zip
Add the following new Sandstorm features and fixes:
- All Boards page [so it's possible to go back from subtask board](https://github.com/wekan/wekan/issues/2082) - Board favorites - New Sandstorm board first user is Admin and [has IFTTT Rules](https://github.com/wekan/wekan/issues/2125) and Standalone Wekan Admin Panel. Probably some Admin Panel features do not work yet. Please keep backup of your grains before testig Admin Panel. - Linked Cards and Linked Boards. - Some not needed options like Logout etc have been hidden from top bar right menu. - [Import board now works. "Board not found" is not problem anymore](https://github.com/wekan/wekan/issues/1430), because you can go to All Boards page to change to imported board. and removes the following features: - Remove Welcome Board from Standalone Wekan, [to fix Welcome board not translated](https://github.com/wekan/wekan/issues/1601). Sandstorm Wekan does not have Welcome Board. Thanks to xet7 ! Closes #2125, closes #2082, closes #1430, closes #1601, related #2205, related #2070, related #1695, related #1192.
Diffstat (limited to 'client/components/users/userHeader.jade')
-rw-r--r--client/components/users/userHeader.jade21
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