diff options
| author | syuilo <4439005+syuilo@users.noreply.github.com> | 2024-05-31 20:11:55 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-31 20:11:55 +0900 |
| commit | e8f523f00a516232af7958e541840825d46d2c32 (patch) | |
| tree | d09aecd9b740c7ddbcdd2ef1f0b91d7648e23100 | |
| parent | Bump version to 2024.5.0-rc.9 (diff) | |
| parent | :art: (diff) | |
| download | sharkey-e8f523f00a516232af7958e541840825d46d2c32.tar.gz sharkey-e8f523f00a516232af7958e541840825d46d2c32.tar.bz2 sharkey-e8f523f00a516232af7958e541840825d46d2c32.zip | |
Merge branch 'develop' into release/2024.5.0
| -rw-r--r-- | locales/index.d.ts | 4 | ||||
| -rw-r--r-- | locales/ja-JP.yml | 1 | ||||
| -rw-r--r-- | packages/frontend/src/pages/admin/index.vue | 16 |
3 files changed, 13 insertions, 8 deletions
diff --git a/locales/index.d.ts b/locales/index.d.ts index 91bbe4ccb6..0b1b86d373 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -3365,6 +3365,10 @@ export interface Locale extends ILocale { */ "noMaintainerInformationWarning": string; /** + * 問い合わせ先URLが設定されていません。 + */ + "noInquiryUrlWarning": string; + /** * Botプロテクションが設定されていません。 */ "noBotProtectionWarning": string; diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index b7083b4942..a89cfbd843 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -837,6 +837,7 @@ administration: "管理" accounts: "アカウント" switch: "切り替え" noMaintainerInformationWarning: "管理者情報が設定されていません。" +noInquiryUrlWarning: "問い合わせ先URLが設定されていません。" noBotProtectionWarning: "Botプロテクションが設定されていません。" configure: "設定する" postToGallery: "ギャラリーへ投稿" diff --git a/packages/frontend/src/pages/admin/index.vue b/packages/frontend/src/pages/admin/index.vue index eef1c8afa9..794feae202 100644 --- a/packages/frontend/src/pages/admin/index.vue +++ b/packages/frontend/src/pages/admin/index.vue @@ -12,10 +12,13 @@ SPDX-License-Identifier: AGPL-3.0-only <img :src="instance.iconUrl || '/favicon.ico'" alt="" class="icon"/> </div> - <MkInfo v-if="thereIsUnresolvedAbuseReport" warn class="info">{{ i18n.ts.thereIsUnresolvedAbuseReportWarning }} <MkA to="/admin/abuses" class="_link">{{ i18n.ts.check }}</MkA></MkInfo> - <MkInfo v-if="noMaintainerInformation" warn class="info">{{ i18n.ts.noMaintainerInformationWarning }} <MkA to="/admin/settings" class="_link">{{ i18n.ts.configure }}</MkA></MkInfo> - <MkInfo v-if="noBotProtection" warn class="info">{{ i18n.ts.noBotProtectionWarning }} <MkA to="/admin/security" class="_link">{{ i18n.ts.configure }}</MkA></MkInfo> - <MkInfo v-if="noEmailServer" warn class="info">{{ i18n.ts.noEmailServerWarning }} <MkA to="/admin/email-settings" class="_link">{{ i18n.ts.configure }}</MkA></MkInfo> + <div class="_gaps_s"> + <MkInfo v-if="thereIsUnresolvedAbuseReport" warn>{{ i18n.ts.thereIsUnresolvedAbuseReportWarning }} <MkA to="/admin/abuses" class="_link">{{ i18n.ts.check }}</MkA></MkInfo> + <MkInfo v-if="noMaintainerInformation" warn>{{ i18n.ts.noMaintainerInformationWarning }} <MkA to="/admin/settings" class="_link">{{ i18n.ts.configure }}</MkA></MkInfo> + <MkInfo v-if="noInquiryUrl" warn>{{ i18n.ts.noInquiryUrlWarning }} <MkA to="/admin/moderation" class="_link">{{ i18n.ts.configure }}</MkA></MkInfo> + <MkInfo v-if="noBotProtection" warn>{{ i18n.ts.noBotProtectionWarning }} <MkA to="/admin/security" class="_link">{{ i18n.ts.configure }}</MkA></MkInfo> + <MkInfo v-if="noEmailServer" warn>{{ i18n.ts.noEmailServerWarning }} <MkA to="/admin/email-settings" class="_link">{{ i18n.ts.configure }}</MkA></MkInfo> + </div> <MkSuperMenu :def="menuDef" :grid="narrow"></MkSuperMenu> </div> @@ -61,6 +64,7 @@ const pageProps = ref({}); let noMaintainerInformation = isEmpty(instance.maintainerName) || isEmpty(instance.maintainerEmail); let noBotProtection = !instance.disableRegistration && !instance.enableHcaptcha && !instance.enableRecaptcha && !instance.enableTurnstile; let noEmailServer = !instance.enableEmail; +let noInquiryUrl = isEmpty(instance.inquiryUrl); const thereIsUnresolvedAbuseReport = ref(false); const currentPage = computed(() => router.currentRef.value.child); @@ -348,10 +352,6 @@ defineExpose({ > .nav { .lxpfedzu { - > .info { - margin: 16px 0; - } - > .banner { margin: 16px; |