summaryrefslogtreecommitdiff
path: root/src/client/app/admin
diff options
context:
space:
mode:
authorAcid Chicken (硫酸鶏) <root@acid-chicken.com>2018-12-11 20:19:13 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2018-12-11 20:19:13 +0900
commit08142ead678c598b8500f563cc117bfa7faf5944 (patch)
tree38e36da1904b52385d5649db60958ef57a0f12d8 /src/client/app/admin
parentShow user fields (#3590) (diff)
downloadmisskey-08142ead678c598b8500f563cc117bfa7faf5944.tar.gz
misskey-08142ead678c598b8500f563cc117bfa7faf5944.tar.bz2
misskey-08142ead678c598b8500f563cc117bfa7faf5944.zip
Resolve #3581 (#3589)
* Update ja-JP.yml * Create 404.vue * Update script.ts * Update script.ts * Update script.ts * Update script.ts * Update script.ts * Update script.ts * Update 404.vue * Update meta.ts * Update instance.vue * Update update-meta.ts
Diffstat (limited to 'src/client/app/admin')
-rw-r--r--src/client/app/admin/script.ts2
-rw-r--r--src/client/app/admin/views/instance.vue4
2 files changed, 6 insertions, 0 deletions
diff --git a/src/client/app/admin/script.ts b/src/client/app/admin/script.ts
index 4002734d3d..1b9b91c865 100644
--- a/src/client/app/admin/script.ts
+++ b/src/client/app/admin/script.ts
@@ -9,6 +9,7 @@ import './style.styl';
import init from '../init';
import Index from './views/index.vue';
+import NotFound from '../common/views/pages/404.vue';
init(launch => {
document.title = 'Admin';
@@ -19,6 +20,7 @@ init(launch => {
base: '/admin/',
routes: [
{ path: '/', component: Index },
+ { path: '*', component: NotFound }
]
});
diff --git a/src/client/app/admin/views/instance.vue b/src/client/app/admin/views/instance.vue
index 353abfd12c..db1f39c604 100644
--- a/src/client/app/admin/views/instance.vue
+++ b/src/client/app/admin/views/instance.vue
@@ -7,6 +7,7 @@
<ui-input v-model="name">{{ $t('instance-name') }}</ui-input>
<ui-textarea v-model="description">{{ $t('instance-description') }}</ui-textarea>
<ui-input v-model="bannerUrl"><i slot="icon"><fa icon="link"/></i>{{ $t('banner-url') }}</ui-input>
+ <ui-input v-model="errorImageUrl"><i slot="icon"><fa icon="link"/></i>{{ $t('error-image-url') }}</ui-input>
<ui-input v-model="languages"><i slot="icon"><fa icon="language"/></i>{{ $t('languages') }}<span slot="desc">{{ $t('languages-desc') }}</span></ui-input>
</section>
<section class="fit-bottom">
@@ -132,6 +133,7 @@ export default Vue.extend({
disableRegistration: false,
disableLocalTimeline: false,
bannerUrl: null,
+ errorImageUrl: null,
name: null,
description: null,
languages: null,
@@ -175,6 +177,7 @@ export default Vue.extend({
this.disableRegistration = meta.disableRegistration;
this.disableLocalTimeline = meta.disableLocalTimeline;
this.bannerUrl = meta.bannerUrl;
+ this.errorImageUrl = meta.errorImageUrl;
this.name = meta.name;
this.description = meta.description;
this.languages = meta.langs.join(' ');
@@ -228,6 +231,7 @@ export default Vue.extend({
disableRegistration: this.disableRegistration,
disableLocalTimeline: this.disableLocalTimeline,
bannerUrl: this.bannerUrl,
+ errorImageUrl: this.errorImageUrl,
name: this.name,
description: this.description,
langs: this.languages.split(' '),