Fix missing icon, Fix import of all notes being outside all notes folder

This commit is contained in:
Marie 2025-05-08 01:40:40 +02:00
parent b66a486036
commit ffbfe741e3
No known key found for this signature in database
GPG key ID: 7ADF6C9CD9A28555
2 changed files with 23 additions and 22 deletions

View file

@ -15,27 +15,28 @@ SPDX-License-Identifier: AGPL-3.0-only
<MkFolder> <MkFolder>
<template #icon><i class="ti ti-pencil"></i></template> <template #icon><i class="ti ti-pencil"></i></template>
<template #label><SearchLabel>{{ i18n.ts._exportOrImport.allNotes }}</SearchLabel></template> <template #label><SearchLabel>{{ i18n.ts._exportOrImport.allNotes }}</SearchLabel></template>
<MkFolder :defaultOpen="true"> <div class="_gaps_s">
<template #label>{{ i18n.ts.export }}</template> <MkFolder :defaultOpen="true">
<template #icon><i class="ti ti-download"></i></template> <template #label>{{ i18n.ts.export }}</template>
<MkButton primary :class="$style.button" inline @click="exportNotes()"><i class="ti ti-download"></i> {{ i18n.ts.export }}</MkButton> <template #icon><i class="ti ti-download"></i></template>
</MkFolder> <MkButton primary :class="$style.button" inline @click="exportNotes()"><i class="ti ti-download"></i> {{ i18n.ts.export }}</MkButton>
</MkFolder> </MkFolder>
</SearchMarker> <SearchMarker :keywords="['notes', 'import']">
<MkFolder v-if="$i && $i.policies.canImportNotes">
<SearchMarker :keywords="['notes', 'import']"> <template #label><SearchLabel>{{ i18n.ts.import }}</SearchLabel></template>
<MkFolder v-if="$i && $i.policies.canImportNotes"> <template #icon><i class="ph-upload ph-bold ph-lg"></i></template>
<template #label><SearchLabel>{{ i18n.ts.import }}</SearchLabel></template> <MkRadios v-model="noteType" style="padding-bottom: 8px;" small>
<template #icon><i class="ph-upload ph-bold ph-lg"></i></template> <template #label>Origin</template>
<MkRadios v-model="noteType" style="padding-bottom: 8px;" small> <option value="Misskey">Misskey/Firefish</option>
<template #label>Origin</template> <option value="Mastodon">Mastodon/Pleroma/Akkoma</option>
<option value="Misskey">Misskey/Firefish</option> <option value="Twitter">Twitter</option>
<option value="Mastodon">Mastodon/Pleroma/Akkoma</option> <option value="Instagram">Instagram</option>
<option value="Twitter">Twitter</option> <option value="Facebook">Facebook</option>
<option value="Instagram">Instagram</option> </MkRadios>
<option value="Facebook">Facebook</option> <MkButton primary :class="$style.button" inline @click="importNotes($event)"><i class="ph-upload ph-bold ph-lg"></i> {{ i18n.ts.import }}</MkButton>
</MkRadios> </MkFolder>
<MkButton primary :class="$style.button" inline @click="importNotes($event)"><i class="ph-upload ph-bold ph-lg"></i> {{ i18n.ts.import }}</MkButton> </SearchMarker>
</div>
</MkFolder> </MkFolder>
</SearchMarker> </SearchMarker>

View file

@ -232,7 +232,7 @@ export function pluginReplaceIcons() {
'ti ti-external-link': 'ph-arrow-square-out ph-bold ph-lg', 'ti ti-external-link': 'ph-arrow-square-out ph-bold ph-lg',
'ti ti-eye': 'ph-eye ph-bold ph-lg', 'ti ti-eye': 'ph-eye ph-bold ph-lg',
'ti ti-eye-exclamation': 'ph-eye-slash ph-bold ph-lg', 'ti ti-eye-exclamation': 'ph-eye-slash ph-bold ph-lg',
'ti ti-eye-off': 'ti ti-eye-exclamation', 'ti ti-eye-off': 'ph-eye-slash ph-bold ph-lg',
'ti ti-feather': 'ph-feather ph-bold ph-lg', 'ti ti-feather': 'ph-feather ph-bold ph-lg',
'ti ti-file': 'ph-file ph-bold ph-lg', 'ti ti-file': 'ph-file ph-bold ph-lg',
'ti ti-file-invoice': 'ph-newspaper-clipping ph-bold ph-lg', 'ti ti-file-invoice': 'ph-newspaper-clipping ph-bold ph-lg',