Skip to content
Snippets Groups Projects
Commit 963c7761 authored by syuilo's avatar syuilo
Browse files

Pages

parent 1d6947d3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
locales/ja-JP.yml
+ 11
− 14
View file @ 963c7761
......@@ -338,6 +338,8 @@ unregister: "登録を解除"
passwordLessLogin: "パスワード無しログイン"
resetPassword: "パスワードをリセット"
newPasswordIs: "新しいパスワードは「{password}」です"
post: "投稿"
posted: "投稿しました"
_2fa:
registerDevice: "デバイスを登録"
......@@ -445,7 +447,6 @@ _visibility:
_postForm:
replyPlaceholder: "この投稿に返信..."
quotePlaceholder: "この投稿を引用..."
post: "投稿"
_placeholders:
a: "いまどうしてる？"
b: "何かありましたか？"
......@@ -505,21 +506,17 @@ _timelines:
global: "グローバル"
_pages:
new-page: "ページの作成"
edit-page: "ページの編集"
read-page: "ソースを表示中"
newPage: "ページの作成"
editPage: "ページの編集"
readPage: "ソースを表示中"
page-created: "ページを作成しました"
page-updated: "ページを更新しました"
name-already-exists: "指定されたページURLは既に存在しています"
title-invalid-name: "不正なページURLです"
text-invalid-name: "空白でないか確認してください"
are-you-sure-delete: "このページを削除しますか？"
page-deleted: "ページを削除しました"
edit-this-page: "このページを編集"
pin-this-page: "ピン留め"
unpin-this-page: "ピン留め解除"
view-source: "ソースを表示"
view-page: "ページを見る"
editThisPage: "このページを編集"
viewSource: "ソースを表示"
viewPage: "ページを見る"
like: "いいね"
unlike: "いいね解除"
liked-pages: "いいねしたページ"
......@@ -542,9 +539,9 @@ _pages:
fontSansSerif: "サンセリフ"
set-eye-catching-image: "アイキャッチ画像を設定"
remove-eye-catching-image: "アイキャッチ画像を削除"
choose-block: "ブロックを追加"
select-type: "種類を選択"
enter-variable-name: "変数名を決めてください"
chooseBlock: "ブロックを追加"
selectType: "種類を選択"
enterVariableName: "変数名を決めてください"
the-variable-name-is-already-used: "その変数名は既に使われています"
content-blocks: "コンテンツ"
input-blocks: "入力"
......
src/client/components/page/page.post.vue
+ 10
− 7
View file @ 963c7761
<template>
<div class="ngbfujlo">
<mk-textarea class="textarea" :value="text" readonly></mk-textarea>
<mk-button primary @click="post()" :disabled="posting || posted">{{ posted ? $t('posted-from-post-form') : $t('post-from-post-form') }}</mk-button>
<mk-textarea :value="text" readonly style="margin: 0;"></mk-textarea>
<mk-button class="button" primary @click="post()" :disabled="posting || posted">{{ posted ? $t('posted') : $t('post') }}</mk-button>
</div>
</template>
......@@ -59,16 +59,19 @@ export default Vue.extend({
<style lang="scss" scoped>
.ngbfujlo {
padding: 0 32px 32px 32px;
border: solid 2px var(--divider);
padding: 32px;
border-radius: 6px;
box-shadow: 0 2px 8px var(--shadow);
> .button {
margin-top: 32px;
}
@media (max-width: 600px) {
padding: 0 16px 16px 16px;
padding: 16px;
> .textarea {
> .button {
margin-top: 16px;
margin-bottom: 16px;
}
}
}
......
src/client/components/page/page.vue
+ 0
− 69
View file @ 963c7761
......@@ -97,74 +97,5 @@ export default Vue.extend({
&.center {
text-align: center;
}
> header {
> .title {
z-index: 1;
margin: 0;
padding: 16px 32px;
font-size: 20px;
font-weight: bold;
color: var(--text);
box-shadow: 0 var(--lineWidth) rgba(#000, 0.07);
@media (max-width: 600px) {
padding: 16px 32px;
font-size: 20px;
}
@media (max-width: 400px) {
padding: 10px 20px;
font-size: 16px;
}
}
}
> div {
color: var(--text);
padding: 24px 32px;
font-size: 16px;
@media (max-width: 600px) {
padding: 24px 32px;
font-size: 16px;
}
@media (max-width: 400px) {
padding: 20px 20px;
font-size: 15px;
}
}
> footer {
color: var(--text);
padding: 0 32px 28px 32px;
@media (max-width: 600px) {
padding: 0 32px 28px 32px;
}
@media (max-width: 400px) {
padding: 0 20px 20px 20px;
font-size: 14px;
}
> small {
display: block;
opacity: 0.5;
}
> a {
font-size: 90%;
}
> a + a {
margin-left: 8px;
}
> .like {
margin-top: 16px;
}
}
}
</style>
src/client/components/post-form.vue
+ 1
− 1
View file @ 963c7761
......@@ -164,7 +164,7 @@ export default Vue.extend({
? this.$t('renote')
: this.reply
? this.$t('reply')
: this.$t('_postForm.post');
: this.$t('post');
},
canPost(): boolean {
......
src/client/pages/page-editor/page-editor.vue
+ 4
− 4
View file @ 963c7761
......@@ -2,7 +2,7 @@
<div>
<div class="gwbmwxkm _panel">
<header>
<div class="title"><fa :icon="faStickyNote"/> {{ readonly ? $t('read-page') : pageId ? $t('edit-page') : $t('new-page') }}</div>
<div class="title"><fa :icon="faStickyNote"/> {{ readonly ? $t('readPage') : pageId ? $t('editPage') : $t('newPage') }}</div>
<div class="buttons">
<button class="_button" @click="del()" v-if="!readonly"><fa :icon="faTrashAlt"/></button>
<button class="_button" @click="() => showOptions = !showOptions"><fa :icon="faCog"/></button>
......@@ -27,7 +27,7 @@
<span>{{ $t('url') }}</span>
</mk-input>
<mk-switch v-model="alignCenter">{{ $t('align-center') }}</mk-switch>
<mk-switch v-model="alignCenter">{{ $t('alignCenter') }}</mk-switch>
<mk-select v-model="font">
<template #label>{{ $t('font') }}</template>
......@@ -301,7 +301,7 @@ export default Vue.extend({
async add() {
const { canceled, result: type } = await this.$root.dialog({
type: null,
title: this.$t('choose-block'),
title: this.$t('chooseBlock'),
select: {
groupedItems: this.getPageBlockList()
},
......@@ -315,7 +315,7 @@ export default Vue.extend({
async addVariable() {
let { canceled, result: name } = await this.$root.dialog({
title: this.$t('enter-variable-name'),
title: this.$t('enterVariableName'),
input: {
type: 'text',
},
......
src/client/pages/page.vue
+ 6
− 6
View file @ 963c7761
......@@ -11,14 +11,14 @@
<div class="_footer">
<small>@{{ page.user.username }}</small>
<template v-if="$store.getters.isSignedIn && $store.state.i.id === page.userId">
<router-link :to="`/my/pages/edit/${page.id}`">{{ $t('edit-this-page') }}</router-link>
<a v-if="$store.state.i.pinnedPageId === page.id" @click="pin(false)">{{ $t('unpin-this-page') }}</a>
<a v-else @click="pin(true)">{{ $t('pin-this-page') }}</a>
<router-link :to="`/my/pages/edit/${page.id}`">{{ $t('_pages.editThisPage') }}</router-link>
<a v-if="$store.state.i.pinnedPageId === page.id" @click="pin(false)">{{ $t('unpin') }}</a>
<a v-else @click="pin(true)">{{ $t('pin') }}</a>
</template>
<router-link :to="`./${page.name}/view-source`">{{ $t('view-source') }}</router-link>
<router-link :to="`./${page.name}/view-source`">{{ $t('_pages.viewSource') }}</router-link>
<div class="like">
<button @click="unlike()" v-if="page.isLiked" :title="$t('unlike')"><fa :icon="faHeartS"/></button>
<button @click="like()" v-else :title="$t('like')"><fa :icon="faHeart"/></button>
<button @click="unlike()" v-if="page.isLiked" :title="$t('_pages.unlike')"><fa :icon="faHeartS"/></button>
<button @click="like()" v-else :title="$t('_pages.like')"><fa :icon="faHeart"/></button>
<span class="count" v-if="page.likedCount > 0">{{ page.likedCount }}</span>
</div>
</div>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment