suwako
/
LightPeer
アーカイブ
1
0
フォーク 0
コード イシュー プルリクエスト プロジェクト リリース Wiki アクティビティ

ロリ

このコミットが含まれているのは:
守矢諏訪子 2022-02-11 18:25:24 +09:00
親 e050e773a0
コミット 17e6c6c78e
12個のファイルの変更、54行の追加、56行の削除
統計情報を表示 Patchファイルをダウンロード Diffファイルをダウンロード すべてのファイルを展開 すべてのファイルを折り畳む

2
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) {

2
public/css/styles.css vendored
ファイルの表示

@ -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 {

22
resources/views/layout/component/about/about.blade.php
ファイルの表示

@ -1,22 +0,0 @@
<div class="margin-content offset-content">
<div class="row">
<div class="col-md-12 col-xl-6">
@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')
</div>
<div class="col-md-12 col-xl-6">
@include('pages.peertube.about.components.features')
</div>
<div class="col">
@include('pages.peertube.about.components.statistics')
</div>
</div>
</div>

16
resources/views/layout/component/about/about/features.blade.php
ファイルの表示

@ -20,14 +20,14 @@
</tr>
<tr>
<th scope="row" class="label">新規ユーザー登録</th>
@include('pages.peertube.about.components.isfeature', ['check' => $conf->signup->allowed])
@include('layout.component.about.about.isfeature', ['check' => $conf->signup->allowed])
</tr>
<tr>
<th colspan="2" class="label">動画のアップロード</th>
</tr>
<tr>
<th scope="row" class="sub-label">複数の解像度へのトランスコーディング</th>
@include('pages.peertube.about.components.isfeature', ['check' => count($conf->transcoding->enabledResolutions) != 0])
@include('layout.component.about.about.isfeature', ['check' => count($conf->transcoding->enabledResolutions) != 0])
</tr>
<tr>
<th scope="row" class="sub-label">動画のアップロード</th>
@ -44,11 +44,11 @@
</tr>
<tr>
<th scope="row" class="sub-label">ライブ配信</th>
@include('pages.peertube.about.components.isfeature', ['check' => $conf->live->enabled])
@include('layout.component.about.about.isfeature', ['check' => $conf->live->enabled])
</tr>
<tr class="ng-star-inserted">
<th scope="row" class="sub-label">複数の解像度でのライブ配信のトランスコーディング</th>
@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])
</tr>
<tr class="ng-star-inserted">
<th scope="row" class="sub-label">同時ライブ配信の最大</th>
@ -59,25 +59,25 @@
</tr>
<tr>
<th scope="row" class="sub-label">HTTP でのインポート (YouTube、Vimeo、ダイレクトURLなど)</th>
@include('pages.peertube.about.components.isfeature', ['check' => $conf->import->videos->http->enabled])
@include('layout.component.about.about.isfeature', ['check' => $conf->import->videos->http->enabled])
</tr>
<tr>
<th scope="row" class="sub-label">Torrent でのインポート</th>
@include('pages.peertube.about.components.isfeature', ['check' => $conf->import->videos->torrent->enabled])
@include('layout.component.about.about.isfeature', ['check' => $conf->import->videos->torrent->enabled])
</tr>
<tr>
<th colspan="2" class="label">プレーヤー</th>
</tr>
<tr>
<th scope="row" class="sub-label">P2P機能</th>
@include('pages.peertube.about.components.isfeature', ['check' => $conf->tracker->enabled])
@include('layout.component.about.about.isfeature', ['check' => $conf->tracker->enabled])
</tr>
<tr>
<th colspan="2" class="label">検索</th>
</tr>
<tr>
<th scope="row" class="sub-label">他のインスタンスのコンテンツ</th>
@include('pages.peertube.about.components.isfeature', ['check' => $conf->search->searchIndex->enabled])
@include('layout.component.about.about.isfeature', ['check' => $conf->search->searchIndex->enabled])
</tr>
<tr>
<th colspan="2" class="label">Plugins &amp; Themes</th>

4
resources/views/layout/component/about/about/instance.blade.php
ファイルの表示

@ -104,12 +104,12 @@
<?php echo nl2br($res['about']->instance->terms); ?>
</div>
</div>
@include('pages.peertube.about.components.about.other')
@include('layout.component.about.about.other')
</div>
<div class="col-md-12 col-xl-6">
<h2 class="sr-only">特徴</h2>
</div>
@include('pages.peertube.about.components.about.features')
@include('layout.component.about.about.features')
<div class="col">
<div id="statistics" class="anchor"></div>
<a class="anchor-link" href="/about/instance#statistics">

2
resources/views/layout/component/about/about/other.blade.php
ファイルの表示

@ -2,4 +2,4 @@
<a class="anchor-link ng-star-inserted" href="/about/instance#other-information">
<h2 class="middle-title">その他の情報</h2>
</a>
@include('pages.peertube.about.components.about.other.hardware')
@include('layout.component.about.about.other.hardware')

16
resources/views/layout/component/about/features.blade.php
ファイルの表示

@ -27,14 +27,14 @@
</tr>
<tr>
<th scope="row" class="label">新規ユーザー登録</th>
@include('pages.peertube.about.components.isfeature', ['check' => $conf->signup->allowed])
@include('layout.component.about.isfeature', ['check' => $conf->signup->allowed])
</tr>
<tr>
<th colspan="2" class="label">動画のアップロード</th>
</tr>
<tr>
<th scope="row" class="sub-label">複数の解像度へのトランスコーディング</th>
@include('pages.peertube.about.components.isfeature', ['check' => count($conf->transcoding->enabledResolutions) != 0])
@include('layout.component.about.isfeature', ['check' => count($conf->transcoding->enabledResolutions) != 0])
</tr>
<tr>
<th scope="row" class="sub-label">動画のアップロード</th>
@ -51,11 +51,11 @@
</tr>
<tr>
<th scope="row" class="sub-label">ライブ配信</th>
@include('pages.peertube.about.components.isfeature', ['check' => $conf->live->enabled])
@include('layout.component.about.isfeature', ['check' => $conf->live->enabled])
</tr>
<tr class="ng-star-inserted">
<th scope="row" class="sub-label">複数の解像度でのライブ配信のトランスコーディング</th>
@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])
</tr>
<tr class="ng-star-inserted">
<th scope="row" class="sub-label">同時ライブ配信の最大</th>
@ -66,25 +66,25 @@
</tr>
<tr>
<th scope="row" class="sub-label">HTTP でのインポート (YouTube、Vimeo、ダイレクトURLなど)</th>
@include('pages.peertube.about.components.isfeature', ['check' => $conf->import->videos->http->enabled])
@include('layout.component.about.isfeature', ['check' => $conf->import->videos->http->enabled])
</tr>
<tr>
<th scope="row" class="sub-label">Torrent でのインポート</th>
@include('pages.peertube.about.components.isfeature', ['check' => $conf->import->videos->torrent->enabled])
@include('layout.component.about.isfeature', ['check' => $conf->import->videos->torrent->enabled])
</tr>
<tr>
<th colspan="2" class="label">プレーヤー</th>
</tr>
<tr>
<th scope="row" class="sub-label">P2P機能</th>
@include('pages.peertube.about.components.isfeature', ['check' => $conf->tracker->enabled])
@include('layout.component.about.isfeature', ['check' => $conf->tracker->enabled])
</tr>
<tr>
<th colspan="2" class="label">検索</th>
</tr>
<tr>
<th scope="row" class="sub-label">他のインスタンスのコンテンツ</th>
@include('pages.peertube.about.components.isfeature', ['check' => $conf->search->searchIndex->enabled])
@include('layout.component.about.isfeature', ['check' => $conf->search->searchIndex->enabled])
</tr>
<tr>
<th colspan="2" class="label">Plugins &amp; Themes</th>

22
resources/views/layout/component/about/instance.blade.php ノーマルファイル
ファイルの表示

@ -0,0 +1,22 @@
<div class="margin-content offset-content">
<div class="row">
<div class="col-md-12 col-xl-6">
@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')
</div>
<div class="col-md-12 col-xl-6">
@include('layout.component.about.features')
</div>
<div class="col">
@include('layout.component.about.statistics')
</div>
</div>
</div>

18
resources/views/layout/component/about/statistics.blade.php
ファイルの表示

@ -5,17 +5,17 @@
<section class="ng-star-inserted">
<h3>ローカル</h3>
<div class="row">
@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' => '合計アップロードサイズ'])
</div>
<h3>他インスタンスとの連合</h3>
<div class="row">
@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' => 'フォロー'])
</div>
</section>

2
resources/views/layout/component/c/playlists.blade.php
ファイルの表示

@ -7,7 +7,7 @@
<div class="miniature">
<my-link class="miniature-thumbnail">
<a tabindex="0" href="/w/p/{{ $v->shortUUID }}" class="ng-star-inserted">
<img alt="" aria-labelledby="{{ $v->displayName }}" src="{{ !is_null($v->thumbnailPath) ? {{ env('PEER_URI') }}.$v->thumbnailPath : '/img/noicon.jpg' }}" class="ng-star-inserted" />
<img alt="" aria-labelledby="{{ $v->displayName }}" src="{{ !is_null($v->thumbnailPath) ? env('PEER_URI').$v->thumbnailPath : '/img/noicon.jpg' }}" class="ng-star-inserted" />
<div class="miniature-playlist-info-overlay ng-star-inserted">動画数：{{ $v->videosLength }} </div>
<div class="play-overlay ng-star-inserted">
<div class="icon"></div>

2
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';
}
}
?>

2
resources/views/pages/peertube/about/instance.blade.php
ファイルの表示

@ -9,7 +9,7 @@
<div class="main-row">
<div class="row">
@include('layout.component.about.menu', ['active' => 'instance'])
@include('layout.component.about.about')
@include('layout.component.about.instance')
</div>
</div>
</div>