浏览代码

Fixes some UI bugs on sandstorm

Maxime Quandalle 9 年之前
父节点
当前提交
72fe5fd47e

+ 2 - 1
History.md

@@ -19,7 +19,8 @@ Starting from this release we will also distribute official docker images on
 both the
 both the
 [GitHub release page](https://github.com/wekan/wekan/releases)
 [GitHub release page](https://github.com/wekan/wekan/releases)
 and on the
 and on the
-[DockerHub](https://hub.docker.com/r/mquandalle/wekan).
+[DockerHub](https://hub.docker.com/r/mquandalle/wekan). We also improved
+Sandstorm integration with the support of its build-in sharing model.
 
 
 New languages supported: Chinese, Finnish, Spanish, Korean, and Russian.
 New languages supported: Chinese, Finnish, Spanish, Korean, and Russian.
 
 

+ 6 - 6
client/components/boards/boardHeader.jade

@@ -46,12 +46,12 @@ template(name="boardMenuPopup")
     li: a.js-open-archives Archived elements
     li: a.js-open-archives Archived elements
     if currentUser.isBoardAdmin
     if currentUser.isBoardAdmin
       li: a.js-change-board-color Change color
       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
   unless isSandstorm
     if currentUser.isBoardAdmin
     if currentUser.isBoardAdmin
       hr
       hr

+ 1 - 1
client/components/boards/boardHeader.js

@@ -5,7 +5,7 @@ Template.boardMenuPopup.events({
     Popup.close();
     Popup.close();
   },
   },
   'click .js-change-board-color': Popup.open('boardChangeColor'),
   '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() {
   'click .js-archive-board ': Popup.afterConfirm('archiveBoard', function() {
     var boardId = Session.get('currentBoard');
     var boardId = Session.get('currentBoard');
     Boards.update(boardId, { $set: { archived: true }});
     Boards.update(boardId, { $set: { archived: true }});

+ 10 - 2
client/components/main/header.jade

@@ -37,8 +37,16 @@ template(name="header")
       else if($eq currentRouteName 'home')
       else if($eq currentRouteName 'home')
         +headerTitle
         +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")
 template(name="headerTitle")
   h1 My Boards
   h1 My Boards

+ 2 - 2
meta/description.md

@@ -2,8 +2,8 @@ Wekan is an open-source and collaborative kanban board application.
 
 
 Whether you’re maintaining a personal todo list, planning your holidays with
 Whether you’re maintaining a personal todo list, planning your holidays with
 some friends, or working in a team on your next revolutionary idea, Kanban
 some friends, or working in a team on your next revolutionary idea, Kanban
-boards are an unbeatable tool keep your things organized. They give you a visual
-overview of the current state of your project, and make you productive by
+boards are an unbeatable tool to keep your things organized. They give you a
+visual overview of the current state of your project, and make you productive by
 allowing you to focus on the few items that matter the most.
 allowing you to focus on the few items that matter the most.
 
 
 Wekan implements all the goodness of kanban board in an open-source software
 Wekan implements all the goodness of kanban board in an open-source software