summaryrefslogtreecommitdiffstats
path: root/client/components/boards
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2018-02-23 20:40:48 +0200
committerLauri Ojansivu <x@xet7.org>2018-02-23 20:40:48 +0200
commita48630ffcfa5a5d96afad5960875da6e856ac079 (patch)
tree7fd0b4cbb66c3b09b4fe50e33dd6f9c38a0a8b9c /client/components/boards
parenta9166d877ff8ffae382ce98b481e205cb465d832 (diff)
parentfe1941008cbe2ad08576e9aad78fe15f68dd50d3 (diff)
downloadwekan-a48630ffcfa5a5d96afad5960875da6e856ac079.tar.gz
wekan-a48630ffcfa5a5d96afad5960875da6e856ac079.tar.bz2
wekan-a48630ffcfa5a5d96afad5960875da6e856ac079.zip
Merge branch 'GhassenRjab-feature/search' into devel
Diffstat (limited to 'client/components/boards')
-rw-r--r--client/components/boards/boardHeader.jade4
-rw-r--r--client/components/boards/boardHeader.js3
2 files changed, 7 insertions, 0 deletions
diff --git a/client/components/boards/boardHeader.jade b/client/components/boards/boardHeader.jade
index 1a65ce27..9fa9c8a4 100644
--- a/client/components/boards/boardHeader.jade
+++ b/client/components/boards/boardHeader.jade
@@ -87,6 +87,10 @@ template(name="boardHeaderBar")
a.board-header-btn-close.js-filter-reset(title="{{_ 'filter-clear'}}")
i.fa.fa-times-thin
+ a.board-header-btn.js-open-search-view(title="{{_ 'search'}}")
+ i.fa.fa-search
+ span {{_ 'search'}}
+
a.board-header-btn.js-toggle-board-view(
title="{{_ 'board-view'}}")
i.fa.fa-th-large
diff --git a/client/components/boards/boardHeader.js b/client/components/boards/boardHeader.js
index 67b05446..64cb0a54 100644
--- a/client/components/boards/boardHeader.js
+++ b/client/components/boards/boardHeader.js
@@ -100,6 +100,9 @@ BlazeComponent.extendComponent({
Sidebar.setView();
Filter.reset();
},
+ 'click .js-open-search-view'() {
+ Sidebar.setView('search');
+ },
'click .js-multiselection-activate'() {
const currentCard = Session.get('currentCard');
MultiSelection.activate();