3 files changed, 17 insertions, 9 deletions
diff --git a/client/components/boards/boardHeader.jade b/client/components/boards/boardHeader.jade
index 9e807b90..e3ca8074 100644
--- a/client/components/boards/boardHeader.jade
+++ b/client/components/boards/boardHeader.jade
@@ -46,12 +46,12 @@ template(name="boardMenuPopup")
     li: a.js-open-archives Archived elements
     if currentUser.isBoardAdmin
       li: a.js-change-board-color Change color
-  //-
-    XXX Language should be handled by sandstorm, but for now display a
-    language selection link in the board menu. This link is normally present
-    in the header bar that is not displayed on sandstorm.
-  if isSandstorm
-    li: a.js-change-language {{_ 'language'}}
+    //-
+      XXX Language should be handled by sandstorm, but for now display a
+      language selection link in the board menu. This link is normally present
+      in the header bar that is not displayed on sandstorm.
+    if isSandstorm
+      li: a.js-change-language {{_ 'language'}}
   unless isSandstorm
     if currentUser.isBoardAdmin
       hr
diff --git a/client/components/boards/boardHeader.js b/client/components/boards/boardHeader.js
index 19103f98..d23dd5f2 100644
--- a/client/components/boards/boardHeader.js
+++ b/client/components/boards/boardHeader.js
@@ -5,7 +5,7 @@ Template.boardMenuPopup.events({
     Popup.close();
   },
   'click .js-change-board-color': Popup.open('boardChangeColor'),
-  'click .js-change-language': Popup.open('setLanguage'),
+  'click .js-change-language': Popup.open('changeLanguage'),
   'click .js-archive-board ': Popup.afterConfirm('archiveBoard', function() {
     var boardId = Session.get('currentBoard');
     Boards.update(boardId, { $set: { archived: true }});
diff --git a/client/components/main/header.jade b/client/components/main/header.jade
index 9eeb843b..71250aae 100644
--- a/client/components/main/header.jade
+++ b/client/components/main/header.jade
@@ -37,8 +37,16 @@ template(name="header")
       else if($eq currentRouteName 'home')
         +headerTitle
 
-      a.wekan-logo(href="{{pathFor 'home'}}")
-        img(src="/wekan-logo-header.png" alt="Wekan")
+      //-
+        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
+        the list of all boards.
+      if isSandstorm
+        .wekan-logo
+          img(src="/wekan-logo-header.png" alt="Wekan")
+      else
+        a.wekan-logo(href="{{pathFor 'home'}}")
+          img(src="/wekan-logo-header.png" alt="Wekan")
 
 template(name="headerTitle")
   h1 My Boards