From fad5150ada7981455bedccc479637e2cdc9a4935 Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian Date: Mon, 18 Apr 2016 20:26:10 +0200 Subject: UI: Add log-in button to public boards Even if a board is public and a user can view it, the user might want to log in to be able to edit the board. The button replaces the "public" permission indicator, because it is obvious (if the user is not logged in and can view the board, it has to be public). --- client/components/boards/boardHeader.jade | 30 ++++++++++++++++++++---------- client/components/boards/boardHeader.js | 3 +++ 2 files changed, 23 insertions(+), 10 deletions(-) (limited to 'client/components/boards') diff --git a/client/components/boards/boardHeader.jade b/client/components/boards/boardHeader.jade index 48d8b21d..18613a65 100644 --- a/client/components/boards/boardHeader.jade +++ b/client/components/boards/boardHeader.jade @@ -16,11 +16,10 @@ template(name="boardHeaderBar") span = currentBoard.stars - a.board-header-btn(class="{{#if currentUser.isBoardAdmin}}js-change-visibility{{else}}is-disabled{{/if}}") - i.fa(class="{{#if currentBoard.isPublic}}fa-globe{{else}}fa-lock{{/if}}") - span {{_ currentBoard.permission}} + a.board-header-btn(class="{{#if currentUser.isBoardAdmin}}js-change-visibility{{else}}is-disabled{{/if}}") + i.fa(class="{{#if currentBoard.isPublic}}fa-globe{{else}}fa-lock{{/if}}") + span {{_ currentBoard.permission}} - if currentUser a.board-header-btn.js-watch-board if $eq watchLevel "watching" i.fa.fa-eye @@ -32,6 +31,12 @@ template(name="boardHeaderBar") i.fa.fa-bell-slash span {{_ 'muted'}} + else + a.board-header-btn.js-log-in( + title="{{_ 'log-in'}}") + i.fa.fa-sign-in + span {{_ 'log-in'}} + .board-header-btns.right if currentBoard if isMiniScreen @@ -44,13 +49,12 @@ template(name="boardHeaderBar") span = currentBoard.stars - a.board-header-btn( - class="{{#if currentUser.isBoardAdmin}}js-change-visibility{{else}}is-disabled{{/if}}" - title="{{_ currentBoard.permission}}") - i.fa(class="{{#if currentBoard.isPublic}}fa-globe{{else}}fa-lock{{/if}}") - span {{_ currentBoard.permission}} + a.board-header-btn( + class="{{#if currentUser.isBoardAdmin}}js-change-visibility{{else}}is-disabled{{/if}}" + title="{{_ currentBoard.permission}}") + i.fa(class="{{#if currentBoard.isPublic}}fa-globe{{else}}fa-lock{{/if}}") + span {{_ currentBoard.permission}} - if currentUser a.board-header-btn.js-watch-board( title="{{_ watchLevel }}") if $eq watchLevel "watching" @@ -60,6 +64,12 @@ template(name="boardHeaderBar") if $eq watchLevel "muted" i.fa.fa-bell-slash span {{_ watchLevel}} + + else + a.board-header-btn.js-log-in( + title="{{_ 'log-in'}}") + i.fa.fa-sign-in + span {{_ 'log-in'}} a.board-header-btn.js-open-filter-view( title="{{#if Filter.isActive}}{{_ 'filter-on-desc'}}{{else}}{{_ 'filter'}}{{/if}}" diff --git a/client/components/boards/boardHeader.js b/client/components/boards/boardHeader.js index 9ed27406..b72bb162 100644 --- a/client/components/boards/boardHeader.js +++ b/client/components/boards/boardHeader.js @@ -90,6 +90,9 @@ BlazeComponent.extendComponent({ evt.stopPropagation(); MultiSelection.disable(); }, + 'click .js-log-in'() { + FlowRouter.go('atSignIn'); + }, }]; }, }).register('boardHeaderBar'); -- cgit v1.2.3-1-g7c22