summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2020-11-15 13:47:15 +0900
committersyuilo <syuilotan@yahoo.co.jp>2020-11-15 13:47:15 +0900
commit77de3f2b9d50afa3b7959faa16ce5a87d7328864 (patch)
tree64026bbf04ba5fc87ddcea33a78c27f9a0c28757
parentImprove Pages (diff)
downloadsharkey-77de3f2b9d50afa3b7959faa16ce5a87d7328864.tar.gz
sharkey-77de3f2b9d50afa3b7959faa16ce5a87d7328864.tar.bz2
sharkey-77de3f2b9d50afa3b7959faa16ce5a87d7328864.zip
Pages埋め込みノートで詳細表示にするかどうか選べるように
-rw-r--r--locales/ja-JP.yml1
-rw-r--r--src/client/components/page/page.note.vue2
-rw-r--r--src/client/pages/page-editor/els/page-editor.el.note.vue7
3 files changed, 7 insertions, 3 deletions
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index ecba573bae..330776db9f 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1181,6 +1181,7 @@ _pages:
_note:
id: "ノートID"
idDescription: "ノートURLをペーストして設定することもできます。"
+ detailed: "詳細な表示"
switch: "スイッチ"
_switch:
diff --git a/src/client/components/page/page.note.vue b/src/client/components/page/page.note.vue
index 4f1df77675..b4b6a9efcd 100644
--- a/src/client/components/page/page.note.vue
+++ b/src/client/components/page/page.note.vue
@@ -1,6 +1,6 @@
<template>
<div class="voxdxuby">
- <XNote v-if="note" v-model:note="note" :key="note.id"/>
+ <XNote v-if="note" v-model:note="note" :key="note.id" :detail="value.detailed"/>
</div>
</template>
diff --git a/src/client/pages/page-editor/els/page-editor.el.note.vue b/src/client/pages/page-editor/els/page-editor.el.note.vue
index d80623a63e..239ae3c014 100644
--- a/src/client/pages/page-editor/els/page-editor.el.note.vue
+++ b/src/client/pages/page-editor/els/page-editor.el.note.vue
@@ -7,8 +7,9 @@
<span>{{ $t('_pages.blocks._note.id') }}</span>
<template #desc>{{ $t('_pages.blocks._note.idDescription') }}</template>
</MkInput>
+ <MkSwitch v-model:value="value.detailed"><span>{{ $t('_pages.blocks._note.detailed') }}</span></MkSwitch>
- <XNote v-if="note" v-model:note="note" :key="note.id" style="margin-bottom: 16px;"/>
+ <XNote v-if="note" v-model:note="note" :key="note.id + ':' + (value.detailed ? 'detailed' : 'normal')" :detail="value.detailed" style="margin-bottom: 16px;"/>
</section>
</XContainer>
</template>
@@ -18,12 +19,13 @@ import { defineComponent } from 'vue';
import { faStickyNote } from '@fortawesome/free-solid-svg-icons';
import XContainer from '../page-editor.container.vue';
import MkInput from '@/components/ui/input.vue';
+import MkSwitch from '@/components/ui/switch.vue';
import XNote from '@/components/note.vue';
import * as os from '@/os';
export default defineComponent({
components: {
- XContainer, MkInput, XNote
+ XContainer, MkInput, MkSwitch, XNote
},
props: {
@@ -57,6 +59,7 @@ export default defineComponent({
created() {
if (this.value.note == null) this.value.note = null;
+ if (this.value.detailed == null) this.value.detailed = false;
},
});
</script>