diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-12-02 12:08:12 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-12-02 12:08:12 +0000 |
| commit | 0c6737f33612f6808f687b896cc6e73ba635f0d2 (patch) | |
| tree | 913dbf52796c9b4f1d72613670332c66fa5997dd /src/components/user_card | |
| parent | 41d2fa2fd66ca33b0c83f65d608ee37f8ffcb152 (diff) | |
| parent | 7ebf3602d5d9a8630ffbe239bfe4431655046821 (diff) | |
Merge branch '712' into 'develop'
Move mention button right next to mute button
Closes #712
See merge request pleroma/pleroma-fe!1015
Diffstat (limited to 'src/components/user_card')
| -rw-r--r-- | src/components/user_card/user_card.js | 3 | ||||
| -rw-r--r-- | src/components/user_card/user_card.vue | 8 |
2 files changed, 11 insertions, 0 deletions
diff --git a/src/components/user_card/user_card.js b/src/components/user_card/user_card.js index a9278200..2f649910 100644 --- 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 index 96acf610..93d55fff 100644 --- 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" |