diff options
| author | Maxime Quandalle <maxime@quandalle.com> | 2015-05-25 21:49:06 +0200 |
|---|---|---|
| committer | Maxime Quandalle <maxime@quandalle.com> | 2015-05-26 00:18:45 +0200 |
| commit | 1b4fcc67f4ec94ed53a2f86ad6889e551f00815e (patch) | |
| tree | 134083028cb512e67f864566130c30b44c1626ba /client/components | |
| parent | fc2435b042babd8a9b0f946a9cc5696b98cc837c (diff) | |
| download | wekan-1b4fcc67f4ec94ed53a2f86ad6889e551f00815e.tar.gz wekan-1b4fcc67f4ec94ed53a2f86ad6889e551f00815e.tar.bz2 wekan-1b4fcc67f4ec94ed53a2f86ad6889e551f00815e.zip | |
Upgrade sandstorm integration
Both sandstorm and LibreBoard have significantly evolved since the
last release of LibreBoard on sandstorm. This commit:
* adds some more attributes on the sandstorm manifest
* introduces support with the sandstorm sharing box
* uses a server redirection to point to the board document
* hides the top shortcut bar on sandstorm
Fixes #163.
Diffstat (limited to 'client/components')
| -rw-r--r-- | client/components/boards/body.js | 2 | ||||
| -rw-r--r-- | client/components/main/header.jade | 37 | ||||
| -rw-r--r-- | client/components/sidebar/sidebar.js | 2 |
3 files changed, 21 insertions, 20 deletions
diff --git a/client/components/boards/body.js b/client/components/boards/body.js index 612097e4..cf32f764 100644 --- a/client/components/boards/body.js +++ b/client/components/boards/body.js @@ -70,7 +70,7 @@ BlazeComponent.extendComponent({ } }; - if (! Meteor.user().isBoardMember()) + if (! Meteor.userId() || ! Meteor.user().isBoardMember()) return; self.$(lists).sortable({ diff --git a/client/components/main/header.jade b/client/components/main/header.jade index 588c9b6e..510ef484 100644 --- a/client/components/main/header.jade +++ b/client/components/main/header.jade @@ -5,26 +5,27 @@ template(name="header") list all starred boards with a link to go there. This is inspired by the Reddit "subreddit" bar. The first link goes to the boards page. - if currentUser - #header-quick-access - ul - li - +linkTo(route="Boards") - span.fa.fa-home - | All boards - each currentUser.starredBoards - li.separator - - li(class="{{#if $.Session.equals 'currentBoard' _id}}current{{/if}}") - +linkTo(route="Board" data=this) - = title - else - li.current Star a board to add a shortcut in this bar. + unless isSandstorm + if currentUser + #header-quick-access + ul + li + +linkTo(route="Boards") + span.fa.fa-home + | All boards + each currentUser.starredBoards + li.separator - + li(class="{{#if $.Session.equals 'currentBoard' _id}}current{{/if}}") + +linkTo(route="Board" data=this) + = title + else + li.current Star a board to add a shortcut in this bar. - li - a.js-create-board - i.fa.fa-plus(title="Create a new board") + li + a.js-create-board + i.fa.fa-plus(title="Create a new board") - +headerUserBar + +headerUserBar //- The main bar is a colorful bar that provide all the meta-data for the diff --git a/client/components/sidebar/sidebar.js b/client/components/sidebar/sidebar.js index 764f16eb..6e45b5cf 100644 --- a/client/components/sidebar/sidebar.js +++ b/client/components/sidebar/sidebar.js @@ -48,7 +48,7 @@ BlazeComponent.extendComponent({ onRendered: function() { var self = this; - if (! Meteor.user().isBoardMember()) + if (! Meteor.userId() || ! Meteor.user().isBoardMember()) return; $(document).on('mouseover', function() { |