hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'themes3' into shigusegubu-themes3

Browse source
This commit is contained in:
Henry Jameson 2024-03-06 10:35:56 +02:00
commit ac38e3f4a8
3 changed files with 40 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/video-poster.update.skip Normal file
View file

@ -0,0 +1 @@
nothing

36
src/components/settings_modal/admin_tabs/emoji_tab.vue
View file

@ -43,7 +43,11 @@
<template #content> <template #content>
<div class="emoji-tab-popover-input"> <div class="emoji-tab-popover-input">
<h3>{{ $t('admin_dash.emoji.remote_pack_instance') }}</h3> <h3>{{ $t('admin_dash.emoji.remote_pack_instance') }}</h3>
<input v-model="remotePackInstance" :placeholder="$t('admin_dash.emoji.remote_pack_instance')"> <input
v-model="remotePackInstance"
class="input"
:placeholder="$t('admin_dash.emoji.remote_pack_instance')"
>
<button <button
class="button button-default btn emoji-tab-popover-button" class="button button-default btn emoji-tab-popover-button"
type="button" type="button"
@ -86,7 +90,11 @@
<template #content> <template #content>
<div class="emoji-tab-popover-input"> <div class="emoji-tab-popover-input">
<h3>{{ $t('admin_dash.emoji.new_pack_name') }}</h3> <h3>{{ $t('admin_dash.emoji.new_pack_name') }}</h3>
<input v-model="newPackName" :placeholder="$t('admin_dash.emoji.new_pack_name')"> <input
v-model="newPackName"
:placeholder="$t('admin_dash.emoji.new_pack_name')"
class="input"
>
<button <button
class="button button-default btn emoji-tab-popover-button" class="button button-default btn emoji-tab-popover-button"
type="button" type="button"
@ -110,7 +118,8 @@
<textarea <textarea
v-model="packMeta.description" v-model="packMeta.description"
:disabled="pack.remote !== undefined" :disabled="pack.remote !== undefined"
class="bio resize-height" /> class="bio resize-height input"
/>
</label> </label>
</li> </li>
<li> <li>
@ -119,7 +128,8 @@
<ModifiedIndicator :changed="metaEdited('homepage')" message-key="admin_dash.emoji.metadata_changed" /> <ModifiedIndicator :changed="metaEdited('homepage')" message-key="admin_dash.emoji.metadata_changed" />
<input <input
class="emoji-info-input" v-model="packMeta.homepage" class="emoji-info-input input"
v-model="packMeta.homepage"
:disabled="pack.remote !== undefined"> :disabled="pack.remote !== undefined">
</label> </label>
</li> </li>
@ -128,14 +138,22 @@
{{ $t('admin_dash.emoji.fallback_src') }} {{ $t('admin_dash.emoji.fallback_src') }}
<ModifiedIndicator :changed="metaEdited('fallback-src')" message-key="admin_dash.emoji.metadata_changed" /> <ModifiedIndicator :changed="metaEdited('fallback-src')" message-key="admin_dash.emoji.metadata_changed" />
<input class="emoji-info-input" v-model="packMeta['fallback-src']" :disabled="pack.remote !== undefined"> <input
class="emoji-info-input input"
v-model="packMeta['fallback-src']"
:disabled="pack.remote !== undefined"
>
</label> </label>
</li> </li>
<li> <li>
<label> <label>
{{ $t('admin_dash.emoji.fallback_sha256') }} {{ $t('admin_dash.emoji.fallback_sha256') }}
<input :disabled="true" class="emoji-info-input" v-model="packMeta['fallback-src-sha256']"> <input
:disabled="true"
class="emoji-info-input input"
v-model="packMeta['fallback-src-sha256']"
>
</label> </label>
</li> </li>
<li> <li>
@ -202,9 +220,11 @@
<div class="emoji-tab-popover-input"> <div class="emoji-tab-popover-input">
<label> <label>
{{ $t('admin_dash.emoji.download_as_name') }} {{ $t('admin_dash.emoji.download_as_name') }}
<input class="emoji-data-input" <input
class="emoji-data-input input"
v-model="remotePackDownloadAs" v-model="remotePackDownloadAs"
:placeholder="$t('admin_dash.emoji.download_as_name_full')"> :placeholder="$t('admin_dash.emoji.download_as_name_full')"
>
</label> </label>
<div v-if="downloadWillReplaceLocal" class="warning"> <div v-if="downloadWillReplaceLocal" class="warning">

18
src/components/settings_modal/helpers/emoji_editing_popover.vue
View file

@ -25,16 +25,18 @@
<input <input
type="file" type="file"
accept="image/*" accept="image/*"
class="emoji-tab-popover-file" class="emoji-tab-popover-file input"
@change="uploadFile = $event.target.files"> @change="uploadFile = $event.target.files">
</div> </div>
<div> <div>
<div class="emoji-tab-popover-input"> <div class="emoji-tab-popover-input">
<label> <label>
{{ $t('admin_dash.emoji.shortcode') }} {{ $t('admin_dash.emoji.shortcode') }}
<input class="emoji-data-input" <input
class="emoji-data-input input"
v-model="editedShortcode" v-model="editedShortcode"
:placeholder="$t('admin_dash.emoji.new_shortcode')"> :placeholder="$t('admin_dash.emoji.new_shortcode')"
>
</label> </label>
</div> </div>
@ -42,16 +44,18 @@
<label> <label>
{{ $t('admin_dash.emoji.filename') }} {{ $t('admin_dash.emoji.filename') }}
<input class="emoji-data-input" <input
class="emoji-data-input input"
v-model="editedFile" v-model="editedFile"
:placeholder="$t('admin_dash.emoji.new_filename')"> :placeholder="$t('admin_dash.emoji.new_filename')"
>
</label> </label>
</div> </div>
<button <button
class="button button-default btn" class="button button-default btn"
type="button" type="button"
:disabled="uploadFile.length == 0" :disabled="newUpload ? uploadFile.length == 0 : !isEdited"
@click="newUpload ? uploadEmoji() : saveEditedEmoji()"> @click="newUpload ? uploadEmoji() : saveEditedEmoji()">
{{ $t('admin_dash.emoji.save') }} {{ $t('admin_dash.emoji.save') }}
</button> </button>
@ -157,7 +161,7 @@ export default {
this.deleteModalVisible = false this.deleteModalVisible = false
this.$store.state.api.backendInteractor.deleteEmojiFile( this.$store.state.api.backendInteractor.deleteEmojiFile(
{ packName: this.packName, shortcode: this.editedShortcode } { packName: this.packName, shortcode: this.shortcode }
).then(resp => resp.json()).then(resp => { ).then(resp => resp.json()).then(resp => {
if (resp.error !== undefined) { if (resp.error !== undefined) {
this.$emit('displayError', resp.error) this.$emit('displayError', resp.error)