This commit is contained in:
Henry Jameson 2025-12-08 18:17:11 +02:00
commit bdb992a8e5
16 changed files with 66 additions and 47 deletions

View file

@ -13,8 +13,8 @@
<button <button
class="button button-default" class="button button-default"
type="button" type="button"
@click="reloadEmoji"
:title="$t('admin_dash.emoji.reload')" :title="$t('admin_dash.emoji.reload')"
@click="reloadEmoji"
> >
<FAIcon icon="arrows-rotate" /> <FAIcon icon="arrows-rotate" />
{{ $t('admin_dash.emoji.reload_short') }} {{ $t('admin_dash.emoji.reload_short') }}
@ -62,8 +62,8 @@
<template #trigger> <template #trigger>
<button <button
class="button button-default emoji-panel-additional-actions" class="button button-default emoji-panel-additional-actions"
@click="$refs.additionalRemotePopover.showPopover"
:title="$t('admin_dash.emoji.import_pack')" :title="$t('admin_dash.emoji.import_pack')"
@click="$refs.additionalRemotePopover.showPopover"
> >
<FAIcon icon="folder-open" /> <FAIcon icon="folder-open" />
{{ $t('admin_dash.emoji.import_pack_short') }} {{ $t('admin_dash.emoji.import_pack_short') }}
@ -372,8 +372,9 @@
</EmojiEditingPopover> </EmojiEditingPopover>
<template v-if="!pack"> <template v-if="!pack">
<div <div
v-for="(_, i) in new Array(20)"
:key="i"
class="placeholder" class="placeholder"
v-for="_ in new Array(20)"
/> />
</template> </template>

View file

@ -42,8 +42,8 @@
<ul class="cards-list"> <ul class="cards-list">
<li <li
v-for="frontend in frontends" v-for="frontend in frontends"
class="frontend-card"
:key="frontend.name" :key="frontend.name"
class="frontend-card"
> >
<h5>{{ frontend.name }}</h5> <h5>{{ frontend.name }}</h5>
{{ ' ' }} {{ ' ' }}

View file

@ -163,7 +163,7 @@
<li> <li>
<BooleanSetting <BooleanSetting
:path="[':pleroma','Pleroma.Web.Metadata', ':unfurl_nsfw']" :path="[':pleroma','Pleroma.Web.Metadata', ':unfurl_nsfw']"
/> />
</li> </li>
</ul> </ul>
</div> </div>

View file

@ -70,15 +70,15 @@
:model-value="relIsPresent" :model-value="relIsPresent"
@update:model-value="checkRel" @update:model-value="checkRel"
> >
<i18n-t <i18n-t
keypath="admin_dash.temp_overrides.:pleroma.Pleroma_DOT_Formatter.:attribute_toggle.label" keypath="admin_dash.temp_overrides.:pleroma.Pleroma_DOT_Formatter.:attribute_toggle.label"
tag="span" tag="span"
scope="global" scope="global"
> >
<template #attr> <template #attr>
<code>rel</code> <code>rel</code>
</template> </template>
</i18n-t> </i18n-t>
</Checkbox> </Checkbox>
<div class="setting-list suboptions weird-suboptions"> <div class="setting-list suboptions weird-suboptions">
<StringSetting <StringSetting
@ -141,6 +141,6 @@
</div> </div>
</template> </template>
<style lang="scss" src="./links_tab.scss"></style>
<script src="./links_tab.js"></script> <script src="./links_tab.js"></script>
<style lang="scss" src="./links_tab.scss"></style>

View file

@ -15,7 +15,6 @@
<h4>{{ $t('admin_dash.mailer.auth') }}</h4> <h4>{{ $t('admin_dash.mailer.auth') }}</h4>
<ul class="setting-list suboptions"> <ul class="setting-list suboptions">
<li v-if="adapterHasKey(':api_key')"> <li v-if="adapterHasKey(':api_key')">
<!-- authentication info --> <!-- authentication info -->
<StringSetting <StringSetting
:path="[':pleroma','Pleroma.Emails.Mailer',':api_key']" :path="[':pleroma','Pleroma.Emails.Mailer',':api_key']"
@ -38,7 +37,8 @@
/> />
</li> </li>
<li v-if="adapterHasKey(':username')"> <li v-if="adapterHasKey(':username')">
<StringSetting :path="[':pleroma','Pleroma.Emails.Mailer',':username']" <StringSetting
:path="[':pleroma','Pleroma.Emails.Mailer',':username']"
:subgroup="adapter" :subgroup="adapter"
/> />
</li> </li>
@ -137,7 +137,7 @@
<IntegerSetting <IntegerSetting
:path="[':pleroma','Pleroma.Emails.Mailer',':retries']" :path="[':pleroma','Pleroma.Emails.Mailer',':retries']"
:subgroup="adapter" :subgroup="adapter"
/> />
</li> </li>
</ul> </ul>
</li> </li>

View file

@ -65,13 +65,13 @@
<StringSetting <StringSetting
:path="[':pleroma', 'Pleroma.Web.MediaProxy.Invalidation.Script', ':script_path']" :path="[':pleroma', 'Pleroma.Web.MediaProxy.Invalidation.Script', ':script_path']"
parent-path=":pleroma.:media_proxy.:invalidation.:enabled" parent-path=":pleroma.:media_proxy.:invalidation.:enabled"
/> />
</li> </li>
<li> <li>
<StringSetting <StringSetting
:path="[':pleroma', 'Pleroma.Web.MediaProxy.Invalidation.Script', ':url_format']" :path="[':pleroma', 'Pleroma.Web.MediaProxy.Invalidation.Script', ':url_format']"
parent-path=":pleroma.:media_proxy.:invalidation.:enabled" parent-path=":pleroma.:media_proxy.:invalidation.:enabled"
/> />
</li> </li>
</template> </template>
</ul> </ul>

View file

@ -33,7 +33,7 @@
<BooleanSetting path=":pleroma.:instance.:account_approval_required" /> <BooleanSetting path=":pleroma.:instance.:account_approval_required" />
</li> </li>
<li> <li>
<h4>{{ $t('admin_dash.instance.captcha_header') }}</h4> <h4>{{ $t('admin_dash.instance.captcha_header') }}</h4>
<ul class="setting-list"> <ul class="setting-list">
<li> <li>
<BooleanSetting :path="[':pleroma', 'Pleroma.Captcha', ':enabled']" /> <BooleanSetting :path="[':pleroma', 'Pleroma.Captcha', ':enabled']" />

View file

@ -8,7 +8,7 @@
:path="[':pleroma','Pleroma.Upload',':uploader']" :path="[':pleroma','Pleroma.Upload',':uploader']"
:options="uploaders" :options="uploaders"
/> />
<h4>{{ $t('admin_dash.uploads.uploader_settings')}}</h4> <h4>{{ $t('admin_dash.uploads.uploader_settings') }}</h4>
<ul class="setting-list suboptions"> <ul class="setting-list suboptions">
<template v-if="uploader === 'Pleroma.Uploaders.Local'"> <template v-if="uploader === 'Pleroma.Uploaders.Local'">
<li> <li>

View file

@ -44,6 +44,7 @@
</label> </label>
</template> </template>
<script src="./color_setting.js"></script>
<style lang="scss"> <style lang="scss">
.ColorSetting { .ColorSetting {
.color-setting-input { .color-setting-input {
@ -51,4 +52,3 @@
} }
} }
</style> </style>
<script src="./color_setting.js"></script>

View file

@ -2,8 +2,8 @@
<!-- TODO make it reusable --> <!-- TODO make it reusable -->
<template> <template>
<span <span
class="DraftButtons"
v-if="$parent.isDirty || $parent.canHardReset" v-if="$parent.isDirty || $parent.canHardReset"
class="DraftButtons"
> >
<Popover <Popover
v-if="$parent.isDirty" v-if="$parent.isDirty"

View file

@ -23,7 +23,10 @@
{{ backendDescriptionDescription + ' ' }} {{ backendDescriptionDescription + ' ' }}
</p> </p>
<ul class="setting-list"> <ul class="setting-list">
<li v-for="item in builtinEntries"> <li
v-for="(item, i) in builtinEntries"
:key="i"
>
<Checkbox <Checkbox
:disabled="shouldBeDisabled" :disabled="shouldBeDisabled"
:model-value="optionPresent(item.value)" :model-value="optionPresent(item.value)"
@ -32,7 +35,10 @@
{{ item.label }} {{ item.label }}
</Checkbox> </Checkbox>
</li> </li>
<li v-for="(item, index) in extraEntries"> <li
v-for="(item, index) in extraEntries"
:key="index"
>
<div class="btn-group"> <div class="btn-group">
<input <input
class="input string-input" class="input string-input"
@ -51,10 +57,10 @@
<li v-if="showNew"> <li v-if="showNew">
<div class="btn-group"> <div class="btn-group">
<input <input
v-model="newValue"
class="input string-input" class="input string-input"
:class="{ disabled: shouldBeDisabled }" :class="{ disabled: shouldBeDisabled }"
:disabled="shouldBeDisabled" :disabled="shouldBeDisabled"
v-model="newValue"
> >
<button <button
class="button-default" class="button-default"
@ -74,6 +80,7 @@
</div> </div>
</template> </template>
<script src="./list_setting.js"></script>
<style lang="scss"> <style lang="scss">
.ListSetting { .ListSetting {
.btn-group { .btn-group {
@ -81,4 +88,3 @@
} }
} }
</style> </style>
<script src="./list_setting.js"></script>

View file

@ -23,7 +23,10 @@
{{ backendDescriptionDescription + ' ' }} {{ backendDescriptionDescription + ' ' }}
</p> </p>
<ul class="setting-list"> <ul class="setting-list">
<li v-for="(item, index) in visibleState"> <li
v-for="(item, index) in visibleState"
:key="index"
>
<div class="btn-group"> <div class="btn-group">
<input <input
class="input string-input" class="input string-input"
@ -48,18 +51,18 @@
<li> <li>
<div class="btn-group"> <div class="btn-group">
<input <input
v-model="newValue[0]"
class="input string-input" class="input string-input"
:class="{ disabled: shouldBeDisabled }" :class="{ disabled: shouldBeDisabled }"
:disabled="shouldBeDisabled" :disabled="shouldBeDisabled"
:placeholder="backendDescriptionSuggestions[0][0]" :placeholder="backendDescriptionSuggestions[0][0]"
v-model="newValue[0]"
> >
<input <input
v-model="newValue[1]"
class="input string-input" class="input string-input"
:class="{ disabled: shouldBeDisabled }" :class="{ disabled: shouldBeDisabled }"
:disabled="shouldBeDisabled" :disabled="shouldBeDisabled"
:placeholder="backendDescriptionSuggestions[0][1]" :placeholder="backendDescriptionSuggestions[0][1]"
v-model="newValue[1]"
> >
<button <button
class="button-default" class="button-default"
@ -79,6 +82,7 @@
</div> </div>
</template> </template>
<script src="./list_tuple_setting.js"></script>
<style lang="scss"> <style lang="scss">
.ListTupleSetting { .ListTupleSetting {
.btn-group { .btn-group {
@ -107,4 +111,3 @@
} }
} }
</style> </style>
<script src="./list_tuple_setting.js"></script>

View file

@ -23,7 +23,10 @@
{{ backendDescriptionDescription + ' ' }} {{ backendDescriptionDescription + ' ' }}
</p> </p>
<ul class="setting-list"> <ul class="setting-list">
<li v-for="item in displayState"> <li
v-for="(item, i) in displayState"
:key="i"
>
<div class="btn-group"> <div class="btn-group">
<input <input
class="input string-input" class="input string-input"
@ -48,18 +51,18 @@
<li v-if="allowNew"> <li v-if="allowNew">
<div class="btn-group"> <div class="btn-group">
<input <input
v-model="newValue[0]"
class="input string-input" class="input string-input"
:class="{ disabled: shouldBeDisabled }" :class="{ disabled: shouldBeDisabled }"
:disabled="shouldBeDisabled" :disabled="shouldBeDisabled"
:placeholder="backendDescriptionSuggestions[0][0]" :placeholder="backendDescriptionSuggestions[0][0]"
v-model="newValue[0]"
> >
<input <input
v-model="newValue[1]"
class="input string-input" class="input string-input"
:class="{ disabled: shouldBeDisabled }" :class="{ disabled: shouldBeDisabled }"
:disabled="shouldBeDisabled" :disabled="shouldBeDisabled"
:placeholder="backendDescriptionSuggestions[0][1]" :placeholder="backendDescriptionSuggestions[0][1]"
v-model="newValue[1]"
> >
<button <button
class="button-default" class="button-default"
@ -79,6 +82,7 @@
</div> </div>
</template> </template>
<script src="./map_setting.js"></script>
<style lang="scss"> <style lang="scss">
.ListSetting { .ListSetting {
.btn-group { .btn-group {
@ -106,4 +110,3 @@
} }
} }
</style> </style>
<script src="./map_setting.js"></script>

View file

@ -23,7 +23,10 @@
{{ backendDescriptionDescription + ' ' }} {{ backendDescriptionDescription + ' ' }}
</p> </p>
<ul class="setting-list"> <ul class="setting-list">
<li v-for="(item, index) in visibleState"> <li
v-for="(item, index) in visibleState"
:key="index"
>
<div> <div>
<dl> <dl>
<dt><code>purpose</code></dt> <dt><code>purpose</code></dt>
@ -90,6 +93,7 @@
</div> </div>
</template> </template>
<script src="./pwa_manifest_icons_setting.js"></script>
<style lang="scss"> <style lang="scss">
.PWAManifestIconsSetting { .PWAManifestIconsSetting {
display: inline-block; display: inline-block;
@ -132,4 +136,3 @@
} }
} }
</style> </style>
<script src="./pwa_manifest_icons_setting.js"></script>

View file

@ -161,13 +161,16 @@
<div class="fun-monitor-neck button-default" /> <div class="fun-monitor-neck button-default" />
<div class="fun-monitor-display-bezel button-default"> <div class="fun-monitor-display-bezel button-default">
<div class="fun-monitor-display-screen input"> <div class="fun-monitor-display-screen input">
<img <img
v-if="backgroundPreview || user.background_image || instanceWallpaper" v-if="backgroundPreview || user.background_image || instanceWallpaper"
class="fun-monitor-display-screen-image" class="fun-monitor-display-screen-image"
:src="backgroundPreview || user.background_image || instanceWallpaper" :src="backgroundPreview || user.background_image || instanceWallpaper"
/> >
<div v-else class="wallpaper" /> <div
<div class="fun-monitor-display-screen-overlay input" /> v-else
class="wallpaper"
/>
<div class="fun-monitor-display-screen-overlay input" />
<div <div
v-if="backgroundUploading" v-if="backgroundUploading"
class="fun-monitor-display-uploading" class="fun-monitor-display-uploading"

View file

@ -7,7 +7,7 @@
<ChoiceSetting <ChoiceSetting
:path="[':pleroma','Pleroma.Upload']" :path="[':pleroma','Pleroma.Upload']"
:option-label-map="adaptersLabels" :option-label-map="adaptersLabels"
/> />
</li> </li>
<h4>{{ $t('admin_dash.mailer.auth') }}</h4> <h4>{{ $t('admin_dash.mailer.auth') }}</h4>
<li> <li>