diff options
author | Lauri Ojansivu <x@xet7.org> | 2019-04-20 16:51:57 +0300 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2019-04-20 16:51:57 +0300 |
commit | 02819ca16969b103493ebdd9a66f058995421507 (patch) | |
tree | a3352b65083c79ab733db2b99e7c4f0a1276277e /client | |
parent | 53d42a17ffbc6466d2d422dfdcbd867ea31fe082 (diff) | |
parent | a5122cc0764b57a163c3e8ca3e00e703669a98db (diff) | |
download | wekan-02819ca16969b103493ebdd9a66f058995421507.tar.gz wekan-02819ca16969b103493ebdd9a66f058995421507.tar.bz2 wekan-02819ca16969b103493ebdd9a66f058995421507.zip |
Merge branch 'edge' into meteor-1.8
Diffstat (limited to 'client')
-rw-r--r-- | client/components/boards/boardBody.styl | 2 | ||||
-rw-r--r-- | client/components/lists/list.styl | 13 | ||||
-rw-r--r-- | client/components/main/layouts.jade | 3 | ||||
-rw-r--r-- | client/components/settings/peopleBody.jade | 11 | ||||
-rw-r--r-- | client/components/settings/peopleBody.js | 36 | ||||
-rw-r--r-- | client/components/settings/peopleBody.styl | 21 |
6 files changed, 76 insertions, 10 deletions
diff --git a/client/components/boards/boardBody.styl b/client/components/boards/boardBody.styl index 148c6ce1..dfaaa050 100644 --- a/client/components/boards/boardBody.styl +++ b/client/components/boards/boardBody.styl @@ -50,6 +50,6 @@ position() display: flex flex-direction: column margin: 0 - padding: 0 40px 0px 0 + padding: 0 0px 0px 0 overflow-x: hidden overflow-y: auto diff --git a/client/components/lists/list.styl b/client/components/lists/list.styl index 7e4550a4..3b82f07f 100644 --- a/client/components/lists/list.styl +++ b/client/components/lists/list.styl @@ -161,7 +161,7 @@ .mini-list flex: 0 0 60px - height: 60px + height: auto width: 100% border-left: 0px border-bottom: 1px solid darken(white, 20%) @@ -189,7 +189,12 @@ border-bottom: 1px solid darken(white, 20%) .list-header - + padding: 0 12px 0px + border-bottom: 0px solid #e4e4e4 + height: 60px + margin-top: 10px + display: flex + align-items: center .list-header-left-icon display: inline padding: 7px @@ -201,8 +206,10 @@ .list-header-menu-icon position: absolute padding: 7px - top: -@padding + top: 50% + transform: translateY(-50%) right: 17px + font-size: 20px .link-board-wrapper display: flex diff --git a/client/components/main/layouts.jade b/client/components/main/layouts.jade index ac2e4bf3..7fd0492e 100644 --- a/client/components/main/layouts.jade +++ b/client/components/main/layouts.jade @@ -1,7 +1,6 @@ head title - meta(name="viewport" - content="maximum-scale=1.0,width=device-width,initial-scale=1.0,user-scalable=0") + meta(name="viewport" content="maximum-scale=1.0,width=device-width,initial-scale=1.0,user-scalable=0") meta(http-equiv="X-UA-Compatible" content="IE=edge") //- XXX We should use pathFor in the following `href` to support the case where the application is deployed with a path prefix, but it seems to be diff --git a/client/components/settings/peopleBody.jade b/client/components/settings/peopleBody.jade index 4d06637e..4dca5cb1 100644 --- a/client/components/settings/peopleBody.jade +++ b/client/components/settings/peopleBody.jade @@ -3,8 +3,13 @@ template(name="people") unless currentUser.isAdmin | {{_ 'error-notAuthorized'}} else - .content-title - span {{_ 'people'}} + .content-title.ext-box + .ext-box-left + span {{_ 'people'}} + input#searchInput(placeholder="{{_ 'search'}}") + button#searchButton {{_ 'search'}} + .ext-box-right + span {{_ 'people-number'}} #{peopleNumber} .content-body .side-menu ul @@ -103,4 +108,4 @@ template(name="editUserPopup") | {{_ 'password'}} input.js-profile-password(type="password") - input.primary.wide(type="submit" value="{{_ 'save'}}")
\ No newline at end of file + input.primary.wide(type="submit" value="{{_ 'save'}}") diff --git a/client/components/settings/peopleBody.js b/client/components/settings/peopleBody.js index a4d70974..3ec96bb0 100644 --- a/client/components/settings/peopleBody.js +++ b/client/components/settings/peopleBody.js @@ -8,6 +8,8 @@ BlazeComponent.extendComponent({ this.error = new ReactiveVar(''); this.loading = new ReactiveVar(false); this.people = new ReactiveVar(true); + this.findUsersOptions = new ReactiveVar({}); + this.number = new ReactiveVar(0); this.page = new ReactiveVar(1); this.loadNextPageLocked = false; @@ -26,6 +28,33 @@ BlazeComponent.extendComponent({ }); }); }, + events() { + return [{ + 'click #searchButton'() { + this.filterPeople(); + }, + 'keydown #searchInput'(event) { + if (event.keyCode === 13 && !event.shiftKey) { + this.filterPeople(); + } + }, + }]; + }, + filterPeople() { + const value = $('#searchInput').first().val(); + if (value === '') { + this.findUsersOptions.set({}); + } else { + const regex = new RegExp(value, 'i'); + this.findUsersOptions.set({ + $or: [ + { username: regex }, + { 'profile.fullname': regex }, + { 'emails.address': regex }, + ], + }); + } + }, loadNextPage() { if (this.loadNextPageLocked === false) { this.page.set(this.page.get() + 1); @@ -49,9 +78,14 @@ BlazeComponent.extendComponent({ this.loading.set(w); }, peopleList() { - return Users.find({}, { + const users = Users.find(this.findUsersOptions.get(), { fields: {_id: true}, }); + this.number.set(users.count()); + return users; + }, + peopleNumber() { + return this.number.get(); }, }).register('people'); diff --git a/client/components/settings/peopleBody.styl b/client/components/settings/peopleBody.styl index 84db44a7..b98c5340 100644 --- a/client/components/settings/peopleBody.styl +++ b/client/components/settings/peopleBody.styl @@ -13,3 +13,24 @@ table tr:nth-child(even) background-color: #dddddd; + +.ext-box + display: flex; + flex-direction: row; + height: 34px; + + .ext-box-left + display: flex; + width: 40% + + span + vertical-align: center; + line-height: 34px; + margin-right: 10px; + + input, button + margin: 0 10px 0 0; + padding: 0; + + button + min-width: 60px; |