From 1a72e8b95c4434ffe6d67bcd62c42b410500a86f Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 14 Nov 2017 08:50:55 +0900 Subject: [PATCH] =?UTF-8?q?=E3=82=84=E3=81=A3=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- locales/en.yml | 4 +- locales/ja.yml | 4 +- .../desktop/tags/home-widgets/activity.tag | 234 +---------------- .../desktop/tags/home-widgets/timemachine.tag | 4 +- src/web/app/desktop/tags/index.ts | 3 +- src/web/app/desktop/tags/user.tag | 3 +- src/web/app/desktop/tags/widgets/activity.tag | 246 ++++++++++++++++++ .../desktop/tags/{ => widgets}/calendar.tag | 12 +- 8 files changed, 269 insertions(+), 241 deletions(-) create mode 100644 src/web/app/desktop/tags/widgets/activity.tag rename src/web/app/desktop/tags/{ => widgets}/calendar.tag (93%) diff --git a/locales/en.yml b/locales/en.yml index d6fcd1e6d..4c8af3931 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -347,7 +347,7 @@ desktop: title: "Server info" toggle: "Toggle views" - mk-activity-home-widget: + mk-activity-widget: title: "Activity" toggle: "Toggle views" @@ -379,7 +379,7 @@ desktop: settings: "Widget settings" get-started: "Please click the cog in the upper right to specify the channel to receive" - mk-timemachine-home-widget: + mk-calendar-widget: title: "{1} / {2}" prev: "Previous month" next: "Next month" diff --git a/locales/ja.yml b/locales/ja.yml index 478afac13..653010670 100644 --- a/locales/ja.yml +++ b/locales/ja.yml @@ -347,7 +347,7 @@ desktop: title: "サーバー情報" toggle: "表示を切り替え" - mk-activity-home-widget: + mk-activity-widget: title: "アクティビティ" toggle: "表示を切り替え" @@ -379,7 +379,7 @@ desktop: settings: "ウィジェットの設定" get-started: "右上の歯車をクリックして受信するチャンネルを指定してください" - mk-timemachine-home-widget: + mk-calendar-widget: title: "{1}年 {2}月" prev: "先月" next: "来月" diff --git a/src/web/app/desktop/tags/home-widgets/activity.tag b/src/web/app/desktop/tags/home-widgets/activity.tag index fd2f4a279..439820140 100644 --- a/src/web/app/desktop/tags/home-widgets/activity.tag +++ b/src/web/app/desktop/tags/home-widgets/activity.tag @@ -1,59 +1,10 @@ - - -

%i18n:desktop.tags.mk-activity-home-widget.title%

- -
-

%i18n:common.loading%

- - + + - - - - - { date.year }/{ date.month }/{ date.day }
Post: { posts }, Reply: { replies }, Repost: { reposts }
-
- - -
- - -
- - - - Black ... Total
Blue ... Posts
Red ... Replies
Green ... Reposts
- - - - -
- - -
- diff --git a/src/web/app/desktop/tags/home-widgets/timemachine.tag b/src/web/app/desktop/tags/home-widgets/timemachine.tag index 2199cf4c6..31b749d91 100644 --- a/src/web/app/desktop/tags/home-widgets/timemachine.tag +++ b/src/web/app/desktop/tags/home-widgets/timemachine.tag @@ -1,5 +1,5 @@ - + + + + + + + + { date.year }/{ date.month }/{ date.day }
Post: { posts }, Reply: { replies }, Repost: { reposts }
+
+ + +
+ + +
+ + + + Black ... Total
Blue ... Posts
Red ... Replies
Green ... Reposts
+ + + + +
+ + +
+ diff --git a/src/web/app/desktop/tags/calendar.tag b/src/web/app/desktop/tags/widgets/calendar.tag similarity index 93% rename from src/web/app/desktop/tags/calendar.tag rename to src/web/app/desktop/tags/widgets/calendar.tag index 3535e8190..5f00d5cf2 100644 --- a/src/web/app/desktop/tags/calendar.tag +++ b/src/web/app/desktop/tags/widgets/calendar.tag @@ -1,8 +1,8 @@ - + - -

{ '%i18n:desktop.tags.mk-calendar.title%'.replace('{1}', year).replace('{2}', month) }

- + +

{ '%i18n:desktop.tags.mk-calendar-widget.title%'.replace('{1}', year).replace('{2}', month) }

+
@@ -16,7 +16,7 @@ data-is-out-of-range={ isOutOfRange(i + 1) } data-is-donichi={ isDonichi(i + 1) } onclick={ go.bind(null, i + 1) } - title={ isOutOfRange(i + 1) ? null : '%i18n:desktop.tags.mk-calendar.go%' }>
{ i + 1 }
+ title={ isOutOfRange(i + 1) ? null : '%i18n:desktop.tags.mk-calendar-widget.go%' }>
{ i + 1 }