diff options
author | Lauri Ojansivu <x@xet7.org> | 2018-02-23 21:01:44 +0200 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2018-02-23 21:01:44 +0200 |
commit | 57cf86a79fe56e89516e9e08746fce217f1c4c98 (patch) | |
tree | 0c8dda2fb4ffe2280c1fd48913fea4c4e869e8ff /client/components | |
parent | 1ef663531bb0c52ec37d4132a110c7b8d01561e8 (diff) | |
parent | 5bdb392258bd3d3863699e5bf05b64b70f222621 (diff) | |
download | wekan-57cf86a79fe56e89516e9e08746fce217f1c4c98.tar.gz wekan-57cf86a79fe56e89516e9e08746fce217f1c4c98.tar.bz2 wekan-57cf86a79fe56e89516e9e08746fce217f1c4c98.zip |
Merge branch 'devel'
Diffstat (limited to 'client/components')
-rw-r--r-- | client/components/boards/boardBody.styl | 9 | ||||
-rw-r--r-- | client/components/boards/boardHeader.jade | 4 | ||||
-rw-r--r-- | client/components/boards/boardHeader.js | 3 | ||||
-rw-r--r-- | client/components/main/header.styl | 2 | ||||
-rw-r--r-- | client/components/sidebar/sidebar.js | 1 | ||||
-rw-r--r-- | client/components/sidebar/sidebarSearches.jade | 8 | ||||
-rw-r--r-- | client/components/sidebar/sidebarSearches.js | 19 | ||||
-rw-r--r-- | client/components/sidebar/sidebarSearches.styl | 2 |
8 files changed, 45 insertions, 3 deletions
diff --git a/client/components/boards/boardBody.styl b/client/components/boards/boardBody.styl index f5ecc08e..359aaf96 100644 --- a/client/components/boards/boardBody.styl +++ b/client/components/boards/boardBody.styl @@ -1,8 +1,11 @@ @import 'nib' position() - if arguments[0] == cover - position: absolute + if arguments[0] == cover || arguments[0] == fixed-cover + if arguments[0] == cover + position: absolute + else + position: fixed left: 0 right: 0 top: 0 @@ -30,7 +33,7 @@ position() overflow-y: hidden .board-overlay - position: cover + position: fixed-cover top: -100px right: -400px background: black 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(); diff --git a/client/components/main/header.styl b/client/components/main/header.styl index 4abc1d55..7993ce6a 100644 --- a/client/components/main/header.styl +++ b/client/components/main/header.styl @@ -4,6 +4,7 @@ color: white transition: background-color 0.4s background: #2980B9 + z-index: 17 #header-main-bar height: 40px @@ -99,6 +100,7 @@ height: 28px font-size: 12px display: flex + z-index: 17 #header-user-bar, #header-new-board-icon, diff --git a/client/components/sidebar/sidebar.js b/client/components/sidebar/sidebar.js index f4f0c118..e4a7c409 100644 --- a/client/components/sidebar/sidebar.js +++ b/client/components/sidebar/sidebar.js @@ -4,6 +4,7 @@ const defaultView = 'home'; const viewTitles = { filter: 'filter-cards', + search: 'search-cards', multiselection: 'multi-selection', archives: 'archives', }; diff --git a/client/components/sidebar/sidebarSearches.jade b/client/components/sidebar/sidebarSearches.jade new file mode 100644 index 00000000..2ad5b00f --- /dev/null +++ b/client/components/sidebar/sidebarSearches.jade @@ -0,0 +1,8 @@ +template(name="searchSidebar") + form.js-search-term-form + input(type="text" name="searchTerm" placeholder="{{_ 'search-example'}}" autofocus) + .list-body.js-perfect-scrollbar + .minicards.clearfix.js-minicards + each (results) + a.minicard-wrapper.js-minicard(href=absoluteUrl) + +minicard(this) diff --git a/client/components/sidebar/sidebarSearches.js b/client/components/sidebar/sidebarSearches.js new file mode 100644 index 00000000..111a86b8 --- /dev/null +++ b/client/components/sidebar/sidebarSearches.js @@ -0,0 +1,19 @@ +BlazeComponent.extendComponent({ + onCreated() { + this.term = new ReactiveVar(''); + }, + + results() { + const currentBoard = Boards.findOne(Session.get('currentBoard')); + return currentBoard.searchCards(this.term.get()); + }, + + events() { + return [{ + 'submit .js-search-term-form'(evt) { + evt.preventDefault(); + this.term.set(evt.target.searchTerm.value); + }, + }]; + }, +}).register('searchSidebar'); diff --git a/client/components/sidebar/sidebarSearches.styl b/client/components/sidebar/sidebarSearches.styl new file mode 100644 index 00000000..6b8ad904 --- /dev/null +++ b/client/components/sidebar/sidebarSearches.styl @@ -0,0 +1,2 @@ +input + max-width: 100% |