diff options
| author | Lauri Ojansivu <x@xet7.org> | 2016-11-07 23:34:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-07 23:34:36 +0200 |
| commit | 4d41e70e12d3e638028a3137fd958e841099763d (patch) | |
| tree | 2aed5026ed3e91832623ee1055a9591aa05ebe55 /client/components | |
| parent | 91f9cf12b7dfbdf7a7d2cfa53821964e3fbb9a04 (diff) | |
| parent | 43c180c247a82ed20b2bc9e2de493305f7f5a43b (diff) | |
| download | wekan-4d41e70e12d3e638028a3137fd958e841099763d.tar.gz wekan-4d41e70e12d3e638028a3137fd958e841099763d.tar.bz2 wekan-4d41e70e12d3e638028a3137fd958e841099763d.zip | |
Merge pull request #1 from dwrensha/wefork-sandstorm-update
Wefork sandstorm update
Diffstat (limited to 'client/components')
| -rw-r--r-- | client/components/sidebar/sidebar.jade | 9 | ||||
| -rw-r--r-- | client/components/sidebar/sidebar.js | 3 |
2 files changed, 9 insertions, 3 deletions
diff --git a/client/components/sidebar/sidebar.jade b/client/components/sidebar/sidebar.jade index 4f5586cb..f3fdd1bc 100644 --- a/client/components/sidebar/sidebar.jade +++ b/client/components/sidebar/sidebar.jade @@ -30,10 +30,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 diff --git a/client/components/sidebar/sidebar.js b/client/components/sidebar/sidebar.js index 0af32f8f..f32a27c5 100644 --- a/client/components/sidebar/sidebar.js +++ b/client/components/sidebar/sidebar.js @@ -163,6 +163,9 @@ Template.membersWidget.helpers({ Template.membersWidget.events({ 'click .js-member': Popup.open('member'), 'click .js-manage-board-members': Popup.open('addMember'), + 'click .sandstorm-powerbox-request-identity'() { + window.sandstormRequestIdentity(); + }, 'click .js-member-invite-accept'() { const boardId = Session.get('currentBoard'); Meteor.user().removeInvite(boardId); |