Merge pull request #444 from floatinghotpot/patch-9

fix board header issue

client/components/boards/boardHeader.jade

@@ -5,20 +5,34 @@ template(name="boardHeaderBar")
         = title
 
   .board-header-btns.left
+    unless isMiniScreen
+      unless isSandstorm
+        if currentUser
+          a.board-header-btn.js-star-board(class="{{#if isStarred}}is-active{{/if}}"
+            title="{{#if isStarred}}{{_ 'click-to-unstar'}}{{else}}{{_ 'click-to-star'}}{{/if}} {{_ 'starred-boards-description'}}")
+            i.fa(class="fa-star{{#unless isStarred}}-o{{/unless}}")
+            if showStarCounter
+              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}}
 
   .board-header-btns.right
-    unless isSandstorm
-      if currentUser
-        a.board-header-btn.js-star-board(class="{{#if isStarred}}is-active{{/if}}"
-          title="{{#if isStarred}}{{_ 'click-to-unstar'}}{{else}}{{_ 'click-to-star'}}{{/if}} {{_ 'starred-boards-description'}}")
-          i.fa(class="fa-star{{#unless isStarred}}-o{{/unless}}")
-          if showStarCounter
-            span
-              = currentBoard.stars
+    if isMiniScreen
+      unless isSandstorm
+        if currentUser
+          a.board-header-btn.js-star-board(class="{{#if isStarred}}is-active{{/if}}"
+            title="{{#if isStarred}}{{_ 'click-to-unstar'}}{{else}}{{_ 'click-to-star'}}{{/if}} {{_ 'starred-boards-description'}}")
+            i.fa(class="fa-star{{#unless isStarred}}-o{{/unless}}")
+            if showStarCounter
+              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}}
 
     a.board-header-btn.js-open-filter-view(
         title="{{#if Filter.isActive}}{{_ 'filter-on-desc'}}{{/if}}"

client/components/boards/boardHeader.js

@@ -39,6 +39,10 @@ BlazeComponent.extendComponent({
     return user && user.hasStarred(boardId);
   },
 
+  isMiniScreen() {
+    return Utils.isMiniScreen();
+  },
+
   // Only show the star counter if the number of star is greater than 2
   showStarCounter() {
     const currentBoard = Boards.findOne(Session.get('currentBoard'));

client/components/main/header.jade

@@ -34,7 +34,7 @@ template(name="header")
     #header-main-bar(class="{{#if wrappedHeader}}wrapper{{/if}}")
       +Template.dynamic(template=headerBar)
 
-      if wrappedHeader
+      unless hideLogo
         //-
           On sandstorm, the logo shouldn't be clickable, because we only have one
           page/document on it, and we don't want to see the home page containing

client/components/main/header.js

@@ -2,6 +2,10 @@ Template.header.helpers({
   wrappedHeader() {
     return !Session.get('currentBoard');
   },
+
+  hideLogo() {
+    return Utils.isMiniScreen() && Session.get('currentBoard');
+  },
 });
 
 Template.header.events({

client/components/main/header.styl

@@ -165,9 +165,6 @@
     #header-main-bar
       height: 40px
 
-      h1
-        display: none
-
       .board-header-btns
         margin-top: 0px