From 17e6c6c78ebee25fd0c22a3b2d63a04b1d3d6df0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=83=86=E3=82=AF=E3=83=8B=E3=82=AB=E3=83=AB=E8=AB=8F?= =?UTF-8?q?=E8=A8=AA=E5=AD=90?= Date: Fri, 11 Feb 2022 18:25:24 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=AD=E3=83=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers.php | 2 +- public/css/styles.css | 2 -- .../layout/component/about/about.blade.php | 22 ------------------- .../component/about/about/features.blade.php | 16 +++++++------- .../component/about/about/instance.blade.php | 4 ++-- .../component/about/about/other.blade.php | 2 +- .../layout/component/about/features.blade.php | 16 +++++++------- .../layout/component/about/instance.blade.php | 22 +++++++++++++++++++ .../component/about/statistics.blade.php | 18 +++++++-------- .../layout/component/c/playlists.blade.php | 2 +- .../layout/component/stylelink.blade.php | 2 +- .../pages/peertube/about/instance.blade.php | 2 +- 12 files changed, 54 insertions(+), 56 deletions(-) delete mode 100644 resources/views/layout/component/about/about.blade.php create mode 100644 resources/views/layout/component/about/instance.blade.php diff --git a/app/helpers.php b/app/helpers.php index 15ea92e..c895695 100644 --- a/app/helpers.php +++ b/app/helpers.php @@ -112,7 +112,7 @@ function ptDuration ($v) { $minutes = sprintf("%02d", floor($seconds / 60)); $seconds -= sprintf("%02d", $minutes * 60); - return $hours != 0 ? $hours.':' : ''.$minutes != 0 ? $minutes.':' : '0:'.$seconds; + return ($hours != 0 ? $hours.':' : '').($minutes != 0 ? $minutes.':' : '0:').$seconds; } function ptAvatar ($v) { diff --git a/public/css/styles.css b/public/css/styles.css index 0c95b2b..4b05720 100755 --- a/public/css/styles.css +++ b/public/css/styles.css @@ -4,7 +4,6 @@ font-style: normal; font-stretch: normal; font-display: swap; - src: url(SourceSans3VF-Roman.ttf.123081915e9fbb9f01bd.woff2) format("woff2") } @font-face { @@ -13,7 +12,6 @@ font-style: italic; font-stretch: normal; font-display: swap; - src: url(SourceSans3VF-Italic.ttf.797355866311afb6142d.woff2) format("woff2") } .peertube-button { diff --git a/resources/views/layout/component/about/about.blade.php b/resources/views/layout/component/about/about.blade.php deleted file mode 100644 index 101c167..0000000 --- a/resources/views/layout/component/about/about.blade.php +++ /dev/null @@ -1,22 +0,0 @@ -
-
-
- @include('pages.peertube.about.components.about.ippan') - @include('pages.peertube.about.components.about.admin') - @include('pages.peertube.about.components.about.creation') - @include('pages.peertube.about.components.about.mentelife') - @include('pages.peertube.about.components.about.business') - @include('pages.peertube.about.components.about.information') - @include('pages.peertube.about.components.about.moderation') - @include('pages.peertube.about.components.about.cock') - @include('pages.peertube.about.components.about.terms') - @include('pages.peertube.about.components.about.other') -
-
- @include('pages.peertube.about.components.features') -
-
- @include('pages.peertube.about.components.statistics') -
-
-
diff --git a/resources/views/layout/component/about/about/features.blade.php b/resources/views/layout/component/about/about/features.blade.php index f765383..45ccea6 100644 --- a/resources/views/layout/component/about/about/features.blade.php +++ b/resources/views/layout/component/about/about/features.blade.php @@ -20,14 +20,14 @@ 新規ユーザー登録 - @include('pages.peertube.about.components.isfeature', ['check' => $conf->signup->allowed]) + @include('layout.component.about.about.isfeature', ['check' => $conf->signup->allowed]) 動画のアップロード 複数の解像度へのトランスコーディング - @include('pages.peertube.about.components.isfeature', ['check' => count($conf->transcoding->enabledResolutions) != 0]) + @include('layout.component.about.about.isfeature', ['check' => count($conf->transcoding->enabledResolutions) != 0]) 動画のアップロード @@ -44,11 +44,11 @@ ライブ配信 - @include('pages.peertube.about.components.isfeature', ['check' => $conf->live->enabled]) + @include('layout.component.about.about.isfeature', ['check' => $conf->live->enabled]) 複数の解像度でのライブ配信のトランスコーディング - @include('pages.peertube.about.components.isfeature', ['check' => $conf->live->transcoding->enabled && count($conf->live->transcoding->enabledResolutions) > 1]) + @include('layout.component.about.about.isfeature', ['check' => $conf->live->transcoding->enabled && count($conf->live->transcoding->enabledResolutions) > 1]) 同時ライブ配信の最大 @@ -59,25 +59,25 @@ HTTP でのインポート (YouTube、Vimeo、ダイレクトURLなど) - @include('pages.peertube.about.components.isfeature', ['check' => $conf->import->videos->http->enabled]) + @include('layout.component.about.about.isfeature', ['check' => $conf->import->videos->http->enabled]) Torrent でのインポート - @include('pages.peertube.about.components.isfeature', ['check' => $conf->import->videos->torrent->enabled]) + @include('layout.component.about.about.isfeature', ['check' => $conf->import->videos->torrent->enabled]) プレーヤー P2P機能 - @include('pages.peertube.about.components.isfeature', ['check' => $conf->tracker->enabled]) + @include('layout.component.about.about.isfeature', ['check' => $conf->tracker->enabled]) 検索 他のインスタンスのコンテンツ - @include('pages.peertube.about.components.isfeature', ['check' => $conf->search->searchIndex->enabled]) + @include('layout.component.about.about.isfeature', ['check' => $conf->search->searchIndex->enabled]) Plugins & Themes diff --git a/resources/views/layout/component/about/about/instance.blade.php b/resources/views/layout/component/about/about/instance.blade.php index b02f174..e08fa6a 100644 --- a/resources/views/layout/component/about/about/instance.blade.php +++ b/resources/views/layout/component/about/about/instance.blade.php @@ -104,12 +104,12 @@ instance->terms); ?> - @include('pages.peertube.about.components.about.other') + @include('layout.component.about.about.other')

特徴

- @include('pages.peertube.about.components.about.features') + @include('layout.component.about.about.features')
diff --git a/resources/views/layout/component/about/about/other.blade.php b/resources/views/layout/component/about/about/other.blade.php index 2cbf769..09846e3 100644 --- a/resources/views/layout/component/about/about/other.blade.php +++ b/resources/views/layout/component/about/about/other.blade.php @@ -2,4 +2,4 @@

その他の情報

 -@include('pages.peertube.about.components.about.other.hardware') +@include('layout.component.about.about.other.hardware') diff --git a/resources/views/layout/component/about/features.blade.php b/resources/views/layout/component/about/features.blade.php index 6fbae26..2ffe2b7 100644 --- a/resources/views/layout/component/about/features.blade.php +++ b/resources/views/layout/component/about/features.blade.php @@ -27,14 +27,14 @@ 新規ユーザー登録 - @include('pages.peertube.about.components.isfeature', ['check' => $conf->signup->allowed]) + @include('layout.component.about.isfeature', ['check' => $conf->signup->allowed]) 動画のアップロード 複数の解像度へのトランスコーディング - @include('pages.peertube.about.components.isfeature', ['check' => count($conf->transcoding->enabledResolutions) != 0]) + @include('layout.component.about.isfeature', ['check' => count($conf->transcoding->enabledResolutions) != 0]) 動画のアップロード @@ -51,11 +51,11 @@ ライブ配信 - @include('pages.peertube.about.components.isfeature', ['check' => $conf->live->enabled]) + @include('layout.component.about.isfeature', ['check' => $conf->live->enabled]) 複数の解像度でのライブ配信のトランスコーディング - @include('pages.peertube.about.components.isfeature', ['check' => $conf->live->transcoding->enabled && count($conf->live->transcoding->enabledResolutions) > 1]) + @include('layout.component.about.isfeature', ['check' => $conf->live->transcoding->enabled && count($conf->live->transcoding->enabledResolutions) > 1]) 同時ライブ配信の最大 @@ -66,25 +66,25 @@ HTTP でのインポート (YouTube、Vimeo、ダイレクトURLなど) - @include('pages.peertube.about.components.isfeature', ['check' => $conf->import->videos->http->enabled]) + @include('layout.component.about.isfeature', ['check' => $conf->import->videos->http->enabled]) Torrent でのインポート - @include('pages.peertube.about.components.isfeature', ['check' => $conf->import->videos->torrent->enabled]) + @include('layout.component.about.isfeature', ['check' => $conf->import->videos->torrent->enabled]) プレーヤー P2P機能 - @include('pages.peertube.about.components.isfeature', ['check' => $conf->tracker->enabled]) + @include('layout.component.about.isfeature', ['check' => $conf->tracker->enabled]) 検索 他のインスタンスのコンテンツ - @include('pages.peertube.about.components.isfeature', ['check' => $conf->search->searchIndex->enabled]) + @include('layout.component.about.isfeature', ['check' => $conf->search->searchIndex->enabled]) Plugins & Themes diff --git a/resources/views/layout/component/about/instance.blade.php b/resources/views/layout/component/about/instance.blade.php new file mode 100644 index 0000000..fd7c0bc --- /dev/null +++ b/resources/views/layout/component/about/instance.blade.php @@ -0,0 +1,22 @@ +
+
+
+ @include('layout.component.about.about.ippan') + @include('layout.component.about.about.admin') + @include('layout.component.about.about.creation') + @include('layout.component.about.about.mentelife') + @include('layout.component.about.about.business') + @include('layout.component.about.about.information') + @include('layout.component.about.about.moderation') + @include('layout.component.about.about.cock') + @include('layout.component.about.about.terms') + @include('layout.component.about.about.other') +
+
+ @include('layout.component.about.features') +
+
+ @include('layout.component.about.statistics') +
+
+
diff --git a/resources/views/layout/component/about/statistics.blade.php b/resources/views/layout/component/about/statistics.blade.php index 4619683..b2b416d 100644 --- a/resources/views/layout/component/about/statistics.blade.php +++ b/resources/views/layout/component/about/statistics.blade.php @@ -5,17 +5,17 @@

ローカル

- @include('pages.peertube.about.components.statcard', ['value' => $res['stats']->totalUsers, 'label' => 'ユーザー']) - @include('pages.peertube.about.components.statcard', ['value' => $res['stats']->totalLocalVideos, 'label' => '動画']) - @include('pages.peertube.about.components.statcard', ['value' => $res['stats']->totalLocalVideoViews, 'label' => '動画視聴回数']) - @include('pages.peertube.about.components.statcard', ['value' => $res['stats']->totalLocalVideoComments, 'label' => '動画のコメント']) - @include('pages.peertube.about.components.statcard', ['value' => round($res['stats']->totalLocalVideoFilesSize / 1024 / 1024 / 1024, 1).' GiB', 'label' => '合計アップロードサイズ']) + @include('layout.component.about.statcard', ['value' => $res['stats']->totalUsers, 'label' => 'ユーザー']) + @include('layout.component.about.statcard', ['value' => $res['stats']->totalLocalVideos, 'label' => '動画']) + @include('layout.component.about.statcard', ['value' => $res['stats']->totalLocalVideoViews, 'label' => '動画視聴回数']) + @include('layout.component.about.statcard', ['value' => $res['stats']->totalLocalVideoComments, 'label' => '動画のコメント']) + @include('layout.component.about.statcard', ['value' => round($res['stats']->totalLocalVideoFilesSize / 1024 / 1024 / 1024, 1).' GiB', 'label' => '合計アップロードサイズ'])

他インスタンスとの連合

- @include('pages.peertube.about.components.statcard', ['value' => $res['stats']->totalVideos, 'label' => '動画']) - @include('pages.peertube.about.components.statcard', ['value' => $res['stats']->totalVideoComments, 'label' => '動画のコメント']) - @include('pages.peertube.about.components.statcard', ['value' => $res['stats']->totalInstanceFollowers, 'label' => 'フォロワー']) - @include('pages.peertube.about.components.statcard', ['value' => $res['stats']->totalInstanceFollowing, 'label' => 'フォロー']) + @include('layout.component.about.statcard', ['value' => $res['stats']->totalVideos, 'label' => '動画']) + @include('layout.component.about.statcard', ['value' => $res['stats']->totalVideoComments, 'label' => '動画のコメント']) + @include('layout.component.about.statcard', ['value' => $res['stats']->totalInstanceFollowers, 'label' => 'フォロワー']) + @include('layout.component.about.statcard', ['value' => $res['stats']->totalInstanceFollowing, 'label' => 'フォロー'])
diff --git a/resources/views/layout/component/c/playlists.blade.php b/resources/views/layout/component/c/playlists.blade.php index 832c68b..e92e292 100644 --- a/resources/views/layout/component/c/playlists.blade.php +++ b/resources/views/layout/component/c/playlists.blade.php @@ -7,7 +7,7 @@
- +
動画数：{{ $v->videosLength }}
diff --git a/resources/views/layout/component/stylelink.blade.php b/resources/views/layout/component/stylelink.blade.php index 857f681..4e98509 100644 --- a/resources/views/layout/component/stylelink.blade.php +++ b/resources/views/layout/component/stylelink.blade.php @@ -41,7 +41,7 @@ } else if ($res['page'] == 'notification') { $name = '通知'; - $canonical = '/my-account/notifications' + $canonical = '/my-account/notifications'; } } ?> diff --git a/resources/views/pages/peertube/about/instance.blade.php b/resources/views/pages/peertube/about/instance.blade.php index 2da2867..4c6eeea 100644 --- a/resources/views/pages/peertube/about/instance.blade.php +++ b/resources/views/pages/peertube/about/instance.blade.php @@ -9,7 +9,7 @@
@include('layout.component.about.menu', ['active' => 'instance']) - @include('layout.component.about.about') + @include('layout.component.about.instance')