diff options
| author | Hazelnoot <acomputerdog@gmail.com> | 2025-05-12 18:52:54 +0000 |
|---|---|---|
| committer | Hazelnoot <acomputerdog@gmail.com> | 2025-05-12 18:52:54 +0000 |
| commit | 90e4ea765ad58097e430fb1e522d1c190db2a3e6 (patch) | |
| tree | abce6849daab47f3720c1e347a4b747552f88406 /packages/frontend/src | |
| parent | merge: Make muted post placeholders look clickable (resolves #502) (!1019) (diff) | |
| parent | add hint about bubble timeline roles (diff) | |
| download | sharkey-90e4ea765ad58097e430fb1e522d1c190db2a3e6.tar.gz sharkey-90e4ea765ad58097e430fb1e522d1c190db2a3e6.tar.bz2 sharkey-90e4ea765ad58097e430fb1e522d1c190db2a3e6.zip | |
merge: Always show bubble controls (!1023)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/1023
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
Diffstat (limited to 'packages/frontend/src')
| -rw-r--r-- | packages/frontend/src/pages/admin/moderation.vue | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/packages/frontend/src/pages/admin/moderation.vue b/packages/frontend/src/pages/admin/moderation.vue index 6845bd7ad0..2213890d14 100644 --- a/packages/frontend/src/pages/admin/moderation.vue +++ b/packages/frontend/src/pages/admin/moderation.vue @@ -26,15 +26,19 @@ SPDX-License-Identifier: AGPL-3.0-only <FormLink to="/admin/server-rules">{{ i18n.ts.serverRules }}</FormLink> - <!-- TODO translate --> - <MkFolder v-if="bubbleTimelineEnabled"> + <MkFolder> <template #icon><i class="ph-drop ph-bold ph-lg"></i></template> - <template #label>Bubble timeline</template> + <template #label>{{ i18n.ts.bubbleTimeline }}</template> <div class="_gaps"> + <div v-if="!$i.policies.btlAvailable"> + <i class="ti ti-alert-triangle"></i> {{ i18n.ts.bubbleTimelineMustBeEnabled }} + </div> + <MkTextarea v-model="bubbleTimeline"> - <template #caption>Choose which instances should be displayed in the bubble.</template> + <template #caption>{{ i18n.ts.bubbleTimelineDescription }}</template> </MkTextarea> + <MkButton primary @click="save_bubbleTimeline">{{ i18n.ts.save }}</MkButton> </div> </MkFolder> @@ -179,11 +183,11 @@ import MkButton from '@/components/MkButton.vue'; import FormLink from '@/components/form/link.vue'; import MkFolder from '@/components/MkFolder.vue'; import SkPatternTest from '@/components/SkPatternTest.vue'; +import { $i } from '@/i'; const enableRegistration = ref<boolean>(false); const emailRequiredForSignup = ref<boolean>(false); const approvalRequiredForSignup = ref<boolean>(false); -const bubbleTimelineEnabled = ref<boolean>(false); const sensitiveWords = ref<string>(''); const prohibitedWords = ref<string>(''); const prohibitedWordsForNameOfUser = ref<string>(''); @@ -206,7 +210,6 @@ async function init() { hiddenTags.value = meta.hiddenTags.join('\n'); preservedUsernames.value = meta.preservedUsernames.join('\n'); bubbleTimeline.value = meta.bubbleInstances.join('\n'); - bubbleTimelineEnabled.value = meta.policies.btlAvailable; trustedLinkUrlPatterns.value = meta.trustedLinkUrlPatterns.join('\n'); blockedHosts.value = meta.blockedHosts.join('\n'); silencedHosts.value = meta.silencedHosts?.join('\n') ?? ''; |