github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-30 22:48:45 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

moving user filter for groups

Browse Source
This commit is contained in:
Kris 2018-05-08 10:08:31 -04:00
parent 2e67998319
commit edb97edf5f
2 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/assets/javascripts/discourse/templates/group-index.hbs
View File

@ -1,20 +1,24 @@
<div class="group-members-actions"> <div class="group-members-actions">
{{#if hasMembers}}
{{text-field value=filterInput {{text-field value=filterInput
placeholderKey=filterPlaceholder placeholderKey=filterPlaceholder
class="group-username-filter no-blur"}} class="group-username-filter no-blur"}}
{{/if}}
<div class="group-members-add">
{{#if canManageGroup}} {{#if canManageGroup}}
{{#if currentUser.admin}}
{{group-members-dropdown
showAddMembersModal="showAddMembersModal"
showBulkAddModal="showBulkAddModal"}}
{{else}}
{{d-button icon="plus" {{d-button icon="plus"
action="showAddMembersModal" action="showAddMembersModal"
label="groups.add_members.title" label="groups.add_members.title"
class="group-members-add"}} class="group-members-add"}}
{{#if currentUser.admin}}
{{d-button icon="plus"
action="showBulkAddModal"
label="admin.groups.bulk_add.title"
class="group-bulk-add"}}
{{/if}} {{/if}}
{{/if}} {{/if}}
</div>
</div> </div>
{{#if hasMembers}} {{#if hasMembers}}

15
app/assets/stylesheets/common/base/group.scss
View File

@ -14,18 +14,19 @@
} }
.group-members-actions { .group-members-actions {
position: absolute; display: flex;
top: -49px; flex-wrap: wrap;
right: 0px; width: 100%;
input + .group-members-add {
margin-left: auto;
}
.group-username-filter { .group-username-filter {
margin: 0px; margin: 0 0 5px 0;
vertical-align: middle; vertical-align: middle;
} }
.group-members-dropdown, .group-members-add {
vertical-align: middle;
}
} }
.group-info { .group-info {