summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxime Quandalle <maxime@quandalle.com>2015-08-31 16:01:42 +0200
committerMaxime Quandalle <maxime@quandalle.com>2015-08-31 16:34:51 +0200
commit72fe5fd47e92c7286e9adbb133de02f347eb4bd7 (patch)
tree6b732f966b4a7acb4d0def9d93e71bb9d805e25c
parentd644cba38ff06369cc43c1ebd08d344fd1d248ea (diff)
downloadwekan-72fe5fd47e92c7286e9adbb133de02f347eb4bd7.tar.gz
wekan-72fe5fd47e92c7286e9adbb133de02f347eb4bd7.tar.bz2
wekan-72fe5fd47e92c7286e9adbb133de02f347eb4bd7.zip
Fixes some UI bugs on sandstorm
-rw-r--r--History.md3
-rw-r--r--client/components/boards/boardHeader.jade12
-rw-r--r--client/components/boards/boardHeader.js2
-rw-r--r--client/components/main/header.jade12
-rw-r--r--meta/description.md4
5 files changed, 21 insertions, 12 deletions
diff --git a/History.md b/History.md
index a7ce98b9..8e60fb07 100644
--- a/History.md
+++ b/History.md
@@ -19,7 +19,8 @@ Starting from this release we will also distribute official docker images on
both the
[GitHub release page](https://github.com/wekan/wekan/releases)
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.
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
diff --git a/meta/description.md b/meta/description.md
index 6e990de7..f56aa82b 100644
--- a/meta/description.md
+++ b/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
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.
Wekan implements all the goodness of kanban board in an open-source software