diff --git a/website/client/assets/members/message.svg b/website/client/assets/members/message.svg new file mode 100644 index 0000000000..dfd7c12a9c --- /dev/null +++ b/website/client/assets/members/message.svg @@ -0,0 +1,3 @@ + + + diff --git a/website/client/assets/members/remove.svg b/website/client/assets/members/remove.svg new file mode 100644 index 0000000000..a717d49915 --- /dev/null +++ b/website/client/assets/members/remove.svg @@ -0,0 +1,3 @@ + + + diff --git a/website/client/assets/members/star.svg b/website/client/assets/members/star.svg new file mode 100644 index 0000000000..9fbdda6bbe --- /dev/null +++ b/website/client/assets/members/star.svg @@ -0,0 +1,3 @@ + + + diff --git a/website/client/components/appHeader.vue b/website/client/components/appHeader.vue index c6f9d52776..e209980c9b 100644 --- a/website/client/components/appHeader.vue +++ b/website/client/components/appHeader.vue @@ -47,9 +47,9 @@ export default { UserListDetail, }, computed: { - ...mapState({ - user: 'user.data', - }), + ...mapState({ + user: 'user.data', + }), }, }; diff --git a/website/client/components/guilds/guild.vue b/website/client/components/guilds/guild.vue index f95a5545a4..4a3fcccddc 100644 --- a/website/client/components/guilds/guild.vue +++ b/website/client/components/guilds/guild.vue @@ -24,7 +24,7 @@ .col-12 h3(v-once) {{ $t('chat') }} - textarea(placeholder="$('chatPlaceHolder')") + textarea(:placeholder="$t('chatPlaceHolder')") button.btn.btn-secondary.send-chat.float-right(v-once) {{ $t('send') }} .hr @@ -66,9 +66,7 @@ .col-6 members-modal(:group='guild') br - button.btn.btn-primary(v-once) {{$t('joinGuild')}} - br - button.btn.float-left(:class="[isMember ? 'btn-danger' : 'btn-success']") {{ isMember ? $t('leave') : $t('join') }} + button.btn.btn-primary(:class="[isMember ? 'btn-danger' : 'btn-success']") {{ isMember ? $t('leave') : $t('join') }} br button.btn.btn-primary(v-once) {{$t('inviteToGuild')}} br @@ -289,18 +287,6 @@ export default { }, ]; }, - editGroup () { - // @TODO: Open up model - }, - save () { - let newLeader = this.group._newLeader && this.group._newLeader._id; - - if (newLeader) { - this.group.leader = newLeader; - } - - // Groups.Group.update(group); - }, deleteAllMessages () { if (confirm(this.$t('confirmDeleteAllMessages'))) { // User.clearPMs(); diff --git a/website/client/components/guilds/membersModal.vue b/website/client/components/guilds/membersModal.vue index 95c095801a..150af0fbba 100644 --- a/website/client/components/guilds/membersModal.vue +++ b/website/client/components/guilds/membersModal.vue @@ -2,30 +2,41 @@ div button.btn.btn-primary(b-btn, @click="$root.$emit('show::modal','members-modal')") {{ $t('viewMembers') }} - b-modal#members-modal(:title="$t('createGuild')") + b-modal#members-modal(:title="$t('createGuild')", size='lg') .header-wrap(slot="modal-header") .row .col-6 - h1 Testing + h1(v-once) {{$t('members')}} .col-6 button(type="button" aria-label="Close" class="close") span(aria-hidden="true") × .row .form-group.col-6 input.form-control.search(type="text", :placeholder="$t('search')", v-model='searchTerm') - .col-6 + .col-4.offset-2 span.dropdown-label {{ $t('sortBy') }} b-dropdown(:text="$t('sort')", right=true) - b-dropdown-item(v-for='sortOption in sortOptions', :key="sortOption.value", @click='sort(sortOption.value)') {{sortOption.text}} + b-dropdown-item(v-for='sortOption in sortOptions', @click='sort(sortOption.value)', :key='sortOption.value') {{sortOption.text}} .row(v-for='member in members', :key='member', ) - .col-8 - user-list-detail - .col-4 + .col-8.offset-1 + user-list-detail(:user='member') + .col-3.actions b-dropdown(:text="$t('sort')", right=true) - b-dropdown-item(@click='sort(option.value)') {{$t('remove')}} - b-dropdown-item(@click='sort(option.value)') {{$t('message')}} - b-dropdown-item(@click='sort(option.value)') {{$t('addManager')}} - b-dropdown-item(@click='sort(option.value)') {{$t('removeManager')}} + b-dropdown-item(@click='sort(option.value)') + img.action-icon(src='~assets/members/remove.svg') + | {{$t('removeMember')}} + b-dropdown-item(@click='sort(option.value)') + img.action-icon(src='~assets/members/message.svg') + | {{$t('sendMessage')}} + b-dropdown-item(@click='sort(option.value)') + img.action-icon(src='~assets/members/star.svg') + | {{$t('promoteToLeader')}} + b-dropdown-item(@click='sort(option.value)') + img.action-icon(src='~assets/members/star.svg') + | {{$t('addManager')}} + b-dropdown-item(@click='sort(option.value)') + img.action-icon(src='~assets/members/remove.svg') + | {{$t('removeManager2')}} b-modal#remove-member(:title="$t('confirmRemoveMember')") button(@click='confirmRemoveMember(member)', v-once) {{$t('remove')}} @@ -35,20 +46,26 @@ div