commit: 0c6737f33612f6808f687b896cc6e73ba635f0d2
parent: 41d2fa2fd66ca33b0c83f65d608ee37f8ffcb152
Author: Shpuld Shpludson <shp@cock.li>
Date: Mon, 2 Dec 2019 12:08:12 +0000
Merge branch '712' into 'develop'
Move mention button right next to mute button
Closes #712
See merge request pleroma/pleroma-fe!1015
Diffstat:
4 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/src/components/account_actions/account_actions.js b/src/components/account_actions/account_actions.js
@@ -25,9 +25,6 @@ const AccountActions = {
},
reportUser () {
this.$store.dispatch('openUserReportingModal', this.user.id)
- },
- mentionUser () {
- this.$store.dispatch('openPostStatusModal', { replyTo: true, repliedUser: this.user })
}
}
}
diff --git a/src/components/account_actions/account_actions.vue b/src/components/account_actions/account_actions.vue
@@ -9,17 +9,7 @@
>
<div slot="popover">
<div class="dropdown-menu">
- <button
- class="btn btn-default btn-block dropdown-item"
- @click="mentionUser"
- >
- {{ $t('user_card.mention') }}
- </button>
<template v-if="user.following">
- <div
- role="separator"
- class="dropdown-divider"
- />
<button
v-if="user.showing_reblogs"
class="btn btn-default dropdown-item"
@@ -34,11 +24,11 @@
>
{{ $t('user_card.show_repeats') }}
</button>
+ <div
+ role="separator"
+ class="dropdown-divider"
+ />
</template>
- <div
- role="separator"
- class="dropdown-divider"
- />
<button
v-if="user.statusnet_blocking"
class="btn btn-default btn-block dropdown-item"
diff --git a/src/components/user_card/user_card.js b/src/components/user_card/user_card.js
@@ -149,6 +149,9 @@ export default {
}
this.$store.dispatch('setMedia', [attachment])
this.$store.dispatch('setCurrent', attachment)
+ },
+ mentionUser () {
+ this.$store.dispatch('openPostStatusModal', { replyTo: true, repliedUser: this.user })
}
}
}
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
@@ -175,6 +175,14 @@
{{ $t('user_card.mute') }}
</button>
</div>
+ <div>
+ <button
+ class="btn btn-default btn-block"
+ @click="mentionUser"
+ >
+ {{ $t('user_card.mention') }}
+ </button>
+ </div>
<ModerationTools
v-if="loggedIn.role === "admin""
:user="user"