diff options
Diffstat (limited to 'client/components/boards')
-rw-r--r-- | client/components/boards/boardHeader.jade | 8 | ||||
-rw-r--r-- | client/components/boards/router.js | 7 |
2 files changed, 5 insertions, 10 deletions
diff --git a/client/components/boards/boardHeader.jade b/client/components/boards/boardHeader.jade index 86fbe255..258fe843 100644 --- a/client/components/boards/boardHeader.jade +++ b/client/components/boards/boardHeader.jade @@ -1,7 +1,7 @@ template(name="headerBoard") - h1.header-board-menu( - class="{{#if currentUser.isBoardMember}}is-clickable js-edit-board-title{{/if}}") - = title + h1.header-board-menu + a(class="{{#if currentUser.isBoardAdmin}}js-edit-board-title{{else}}is-disabled{{/if}}") + = title .board-header-btns.left unless isSandstorm @@ -12,7 +12,7 @@ template(name="headerBoard") if showStarCounter span {{_ 'board-nb-stars' stars}} - a.board-header-btn.js-change-visibility(class="{{#unless currentUser.isBoardAdmin}}no-edit{{/unless}}") + a.board-header-btn(class="{{#if currentUser.isBoardAdmin}}js-change-visibility{{else}}is-disabled{{/if}}") i.fa(class="{{#if isPublic}}fa-globe{{else}}fa-lock{{/if}}") span {{_ permission}} diff --git a/client/components/boards/router.js b/client/components/boards/router.js index e5ccecdb..1c485225 100644 --- a/client/components/boards/router.js +++ b/client/components/boards/router.js @@ -43,6 +43,7 @@ Router.route('/boards/:boardId/:slug/:cardId', { Sidebar.hide(); } }); + EscapeActions.executeUpTo('popup'); var params = this.params; Session.set('currentBoard', params.boardId); Session.set('currentCard', params.cardId); @@ -55,9 +56,3 @@ Router.route('/boards/:boardId/:slug/:cardId', { return Boards.findOne(this.params.boardId); } }); - -// Close the card details pane by pressing escape -EscapeActions.register('detailsPane', - function() { Utils.goBoardId(Session.get('currentBoard')); }, - function() { return ! Session.equals('currentCard', null); } -); |