Merge branch 'master' of https://github.com/NicoP-S/wekan

4 files changed, 20 insertions, 7 deletions

diff --git a/client/components/boards/boardsList.jade b/client/components/boards/boardsList.jade
index 79bae502..f1118aa8 100644
--- a/client/components/boards/boardsList.jade
+++ b/client/components/boards/boardsList.jade
@@ -55,7 +55,7 @@ template(name="boardList")
                         title="{{_ 'archive-board'}}")
 
 template(name="boardListHeaderBar")
-  h1 {{_ 'my-boards'}}
+  h1 {{_ title }}
   .board-header-btns.right
     a.board-header-btn.js-open-archived-board
       i.fa.fa-archive
diff --git a/client/components/boards/boardsList.js b/client/components/boards/boardsList.js
index 3918af82..0ff1c4fb 100644
--- a/client/components/boards/boardsList.js
+++ b/client/components/boards/boardsList.js
@@ -7,6 +7,9 @@ Template.boardListHeaderBar.events({
 });
 
 Template.boardListHeaderBar.helpers({
+  title(){
+    return FlowRouter.getRouteName() == 'home' ? 'my-boards' :'public';
+  },
   templatesBoardId() {
     return Meteor.user() && Meteor.user().getTemplatesBoardId();
   },
@@ -21,12 +24,17 @@ BlazeComponent.extendComponent({
   },
 
   boards() {
+    let query = {
+      archived: false,
+      type: 'board',
+    }
+    if (FlowRouter.getRouteName() == 'home')
+      query['members.userId'] = Meteor.userId()
+    else
+      query.permission = 'public'
+
     return Boards.find(
-      {
-        archived: false,
-        'members.userId': Meteor.userId(),
-        type: 'board',
-      },
+      query,
       { sort: ['title'] },
     );
   },
diff --git a/client/components/main/header.jade b/client/components/main/header.jade
index 9a5a6b9b..de7ead93 100644
--- a/client/components/main/header.jade
+++ b/client/components/main/header.jade
@@ -24,6 +24,11 @@ template(name="header")
             a(href="{{pathFor 'home'}}")
               span.fa.fa-home
               | {{_ 'all-boards'}}
+          li.separator -
+          li
+            a(href="{{pathFor 'public'}}")
+              span.fa.fa-globe
+              | {{_ 'public'}}
           each currentUser.starredBoards
             li.separator -
             li(class="{{#if $.Session.equals 'currentBoard' _id}}current{{/if}}")
diff --git a/client/components/main/header.styl b/client/components/main/header.styl
index 632d1535..38ff0560 100644
--- a/client/components/main/header.styl
+++ b/client/components/main/header.styl
@@ -127,7 +127,7 @@
       &.current
         color: darken(white, 5%)
 
-      &:first-child .fa-home
+      &:first-child .fa-home,&:nth-child(3) .fa-globe
         margin-right: 5px
 
       a.js-create-board