diff options
| author | Lauri Ojansivu <x@xet7.org> | 2017-02-10 09:54:23 +0200 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2017-02-10 09:54:23 +0200 |
| commit | 0065ca3ad6a3a627cde557b6c80f87c8c6267492 (patch) | |
| tree | f832fde75ee9fba0310a51196c2e7ce90dedcfec /client/components/sidebar/sidebar.jade | |
| parent | 89959753cd10321fc21cf290bdd06f26b19874b9 (diff) | |
| parent | 1f7d1f023ff4a6ec2e8923e54fe26c68fa7d9380 (diff) | |
| download | wekan-0065ca3ad6a3a627cde557b6c80f87c8c6267492.tar.gz wekan-0065ca3ad6a3a627cde557b6c80f87c8c6267492.tar.bz2 wekan-0065ca3ad6a3a627cde557b6c80f87c8c6267492.zip | |
Merge branch 'devel' into greenkeeper-xss-0.3.3
Diffstat (limited to 'client/components/sidebar/sidebar.jade')
| -rw-r--r-- | client/components/sidebar/sidebar.jade | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/client/components/sidebar/sidebar.jade b/client/components/sidebar/sidebar.jade index 4f5586cb..cb0845af 100644 --- a/client/components/sidebar/sidebar.jade +++ b/client/components/sidebar/sidebar.jade @@ -3,14 +3,19 @@ template(name="sidebar") a.sidebar-tongue.js-toggle-sidebar( class="{{#if isTongueHidden}}is-hidden{{/if}}") i.fa.fa-angle-left - .sidebar-content.js-board-sidebar-content.js-perfect-scrollbar - a.hide-btn.js-hide-sidebar - i.fa.fa-angle-right - unless isDefaultView - h2 - a.fa.fa-chevron-left.js-back-home - = getViewTitle - +Template.dynamic(template=getViewTemplate) + .sidebar-shadow + .sidebar-content.sidebar-shortcuts + a.board-header-btn.js-shortcuts + i.fa.fa-keyboard-o + span {{_ 'keyboard-shortcuts' }} + .sidebar-content.js-board-sidebar-content.js-perfect-scrollbar + a.hide-btn.js-hide-sidebar + i.fa.fa-angle-right + unless isDefaultView + h2 + a.fa.fa-chevron-left.js-back-home + = getViewTitle + +Template.dynamic(template=getViewTemplate) template(name='homeSidebar') +membersWidget @@ -30,10 +35,13 @@ template(name="membersWidget") .board-widget-content each currentBoard.activeMembers +userAvatar(userId=this.userId showStatus=true) - unless isSandstorm - if currentUser.isBoardAdmin - a.member.add-member.js-manage-board-members + if isSandstorm + if currentUser.isBoardMember + a.member.add-member.sandstorm-powerbox-request-identity i.fa.fa-plus + else if currentUser.isBoardAdmin + a.member.add-member.js-manage-board-members + i.fa.fa-plus .clearfix if isInvited hr |