diff --git a/components/FollowMe.vue b/components/FollowMe.vue
index 7b9ddc55..0246d2bf 100644
--- a/components/FollowMe.vue
+++ b/components/FollowMe.vue
@@ -5,20 +5,23 @@
p(v-html="$t('event.follow_me_description', { title: settings.title, account: `@${settings.instance_name}@${domain}`})")
v-text-field(
:rules="[$validators.required('common.url')]"
+ :loading='loading'
:label="$t('common.url')"
v-model='instance_hostname')
- p
{{instance.title}}
+ v-btn(v-if='!isDialog' slot='prepend' text :disabled='(!couldGo || !proceed)' :href='link' target='_blank'
+ :loading='loading' color="primary") {{$t("common.follow")}}
- v-card-actions
+ p(slot='append')
{{instance.title}}
+
+ v-card-actions(v-if='isDialog')
v-spacer
- v-btn(color='warning' @click="$emit('close')") {{$t("common.cancel")}}
- v-btn(:disabled='(!couldGo || !proceed)'
+ v-btn(v-if='isDialog' color='warning' @click="$emit('close')") {{$t("common.cancel")}}
+ v-btn(:disabled='(!couldGo || !proceed)' :href='link' target='_blank'
:loading='loading' color="primary") {{$t("common.follow")}}
diff --git a/layouts/default.vue b/layouts/default.vue
index 4f3a305c..103829f9 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -13,7 +13,6 @@
\ No newline at end of file
+
diff --git a/layouts/modal.vue b/layouts/modal.vue
index 69e94b1c..8e2c3883 100644
--- a/layouts/modal.vue
+++ b/layouts/modal.vue
@@ -13,13 +13,12 @@
diff --git a/locales/it.json b/locales/it.json
index 6ace3293..72ca2ab5 100644
--- a/locales/it.json
+++ b/locales/it.json
@@ -165,7 +165,8 @@
"event_confirm_description": "Puoi confermare qui gli eventi inseriti da utenti anonimi",
"delete_user": "Elimina",
"remove_admin": "Rimuovi admin",
- "delete_user_confirm": "Sei sicuro/a di rimuovere questo utente?",
+ "disable_user_confirm": "Vuoi disabilitare {user}?",
+ "delete_user_confirm": "Vuoi rimuovere {user}?",
"user_remove_ok": "Utente eliminato",
"user_create_ok": "Utente creato",
"allow_registration_description": "Vuoi abilitare la registrazione?",
diff --git a/pages/event/_id.vue b/pages/event/_id.vue
index 67d97879..73a3c2a1 100644
--- a/pages/event/_id.vue
+++ b/pages/event/_id.vue
@@ -74,14 +74,6 @@ v-container#event
small.mr-3 🔖 {{event.likes.length}}
small ✊ {{event.boost.length}}
- //- p.p-2
- //- v-btn(type='text' @click='showFollowMe=true') {{$t('event.interact_with_me')}}
- //- span(v-if='settings.enable_resources && event.resources.length') - {{$tc('common.n_resources', event.resources.length)}}
-
- //- v-dialog(v-model='showFollowMe' destroy-on-close max-width='500px')
- h4(slot='title') {{$t('common.follow_me_title')}}
- FollowMe(@close='showFollowMe=false' is-dialog)
-
v-dialog.showResource#resourceDialog(v-model='showResources' fullscreen
width='95vw'
destroy-on-close
@@ -132,13 +124,12 @@ v-container#event
import { mapState } from 'vuex'
import EventAdmin from './eventAdmin'
import EmbedEvent from './embedEvent'
-import FollowMe from '../../components/FollowMe'
import moment from 'dayjs'
const htmlToText = require('html-to-text')
export default {
name: 'Event',
- components: { EventAdmin, EmbedEvent, FollowMe },
+ components: { EventAdmin, EmbedEvent },
async asyncData ({ $axios, params, error, store }) {
try {
const event = await $axios.$get(`/event/${params.id}`)
@@ -151,7 +142,6 @@ export default {
return {
event: {},
showEmbed: false,
- showFollowMe: false,
showResources: false,
selectedResource: { data: { attachment: [] } }
}
diff --git a/pages/export.vue b/pages/export.vue
index 785707e1..d66ab362 100644
--- a/pages/export.vue
+++ b/pages/export.vue
@@ -64,9 +64,9 @@
color='primary' v-clipboard:copy='listScript' v-clipboard:success='copyLink.bind(this,"list")') {{$t('common.copy')}}
v-icon.ml-1 mdi-content-copy
- //- v-tab(v-if='settings.enable_federation') {{$t('common.fediverse')}}
- //- v-tab-item(v-if='settings.enable_federation')
- //- FollowMe
+ v-tab(v-if='settings.enable_federation') {{$t('common.fediverse')}}
+ v-tab-item(v-if='settings.enable_federation')
+ FollowMe
//- TOFIX
//- v-tab.pt-1(label='calendar' name='calendar')
//- v-tab-item