おっぱい
このコミットが含まれているのは:
コミット
0a5b8dce09
|
@ -15,7 +15,8 @@ class About extends Common {
|
|||
|
||||
public function index () {
|
||||
$res = [
|
||||
'page' => 'dummy',
|
||||
'page' => 'about',
|
||||
'style' => 'dummy',
|
||||
'userinfo' => $this->common->user,
|
||||
];
|
||||
// $res['owner'] = $this->getOwner($id);
|
||||
|
|
|
@ -16,6 +16,7 @@ class Account extends Common {
|
|||
public function index ($id, $cat='video-channels') {
|
||||
$res = [
|
||||
'page' => 'account',
|
||||
'style' => 'account',
|
||||
'cat' => $cat,
|
||||
'userinfo' => $this->common->user,
|
||||
];
|
||||
|
|
|
@ -22,6 +22,7 @@ class Users extends Common {
|
|||
|
||||
$res = [
|
||||
'page' => 'dummy',
|
||||
'style' => 'dummy',
|
||||
'userinfo' => $this->common->user,
|
||||
];
|
||||
// $res['owner'] = $this->getOwner($id);
|
||||
|
|
|
@ -18,6 +18,7 @@ class Channel extends Common {
|
|||
public function index ($id, $cat='videos', $page=0) {
|
||||
$res = [
|
||||
'page' => 'channel',
|
||||
'style' => 'channel',
|
||||
'cat' => $cat,
|
||||
'paginate' => $page,
|
||||
'pagetotal' => 500,
|
||||
|
|
|
@ -15,7 +15,8 @@ class Home extends Common {
|
|||
|
||||
public function index () {
|
||||
$res = [
|
||||
'page' => 'dummy',
|
||||
'page' => 'home',
|
||||
'style' => 'dummy',
|
||||
'userinfo' => $this->common->user,
|
||||
];
|
||||
// $res['owner'] = $this->getOwner($id);
|
||||
|
|
|
@ -20,6 +20,7 @@ class Login extends Common {
|
|||
|
||||
$res = [
|
||||
'page' => 'dummy',
|
||||
'style' => 'dummy',
|
||||
'userinfo' => $this->common->user,
|
||||
];
|
||||
// $res['owner'] = $this->getOwner($id);
|
||||
|
|
|
@ -20,6 +20,7 @@ class Logout extends Common {
|
|||
|
||||
$res = [
|
||||
'page' => 'dummy',
|
||||
'style' => 'dummy',
|
||||
'userinfo' => $this->common->user,
|
||||
];
|
||||
// $res['owner'] = $this->getOwner($id);
|
||||
|
|
|
@ -20,6 +20,7 @@ class Myaccount extends Common {
|
|||
|
||||
$res = [
|
||||
'page' => 'dummy',
|
||||
'style' => 'dummy',
|
||||
'userinfo' => $this->common->user,
|
||||
];
|
||||
// $res['owner'] = $this->getOwner($id);
|
||||
|
|
|
@ -20,6 +20,7 @@ class Mylibrary extends Common {
|
|||
|
||||
$res = [
|
||||
'page' => 'dummy',
|
||||
'style' => 'dummy',
|
||||
'userinfo' => $this->common->user,
|
||||
];
|
||||
// $res['owner'] = $this->getOwner($id);
|
||||
|
|
|
@ -20,6 +20,7 @@ class Videos extends Common {
|
|||
|
||||
$res = [
|
||||
'page' => 'dummy',
|
||||
'style' => 'dummy',
|
||||
'userinfo' => $this->common->user,
|
||||
];
|
||||
// $res['owner'] = $this->getOwner($id);
|
||||
|
|
|
@ -20,6 +20,7 @@ class Subscriptions extends Common {
|
|||
|
||||
$res = [
|
||||
'page' => 'dummy',
|
||||
'style' => 'dummy',
|
||||
'userinfo' => $this->common->user,
|
||||
];
|
||||
// $res['owner'] = $this->getOwner($id);
|
||||
|
|
|
@ -20,6 +20,7 @@ class Videochannels extends Common {
|
|||
|
||||
$res = [
|
||||
'page' => 'dummy',
|
||||
'style' => 'dummy',
|
||||
'userinfo' => $this->common->user,
|
||||
];
|
||||
// $res['owner'] = $this->getOwner($id);
|
||||
|
|
|
@ -20,6 +20,7 @@ class Videoplaylists extends Common {
|
|||
|
||||
$res = [
|
||||
'page' => 'dummy',
|
||||
'style' => 'dummy',
|
||||
'userinfo' => $this->common->user,
|
||||
];
|
||||
// $res['owner'] = $this->getOwner($id);
|
||||
|
|
|
@ -20,6 +20,7 @@ class Videos extends Common {
|
|||
|
||||
$res = [
|
||||
'page' => 'dummy',
|
||||
'style' => 'dummy',
|
||||
'userinfo' => $this->common->user,
|
||||
];
|
||||
// $res['owner'] = $this->getOwner($id);
|
||||
|
|
|
@ -20,6 +20,7 @@ class Notification extends Common {
|
|||
|
||||
$res = [
|
||||
'page' => 'dummy',
|
||||
'style' => 'dummy',
|
||||
'userinfo' => $this->common->user,
|
||||
];
|
||||
// $res['owner'] = $this->getOwner($id);
|
||||
|
|
|
@ -20,6 +20,7 @@ class Signup extends Common {
|
|||
|
||||
$res = [
|
||||
'page' => 'dummy',
|
||||
'style' => 'dummy',
|
||||
'userinfo' => $this->common->user,
|
||||
];
|
||||
// $res['owner'] = $this->getOwner($id);
|
||||
|
|
|
@ -17,7 +17,8 @@ class Local extends Common {
|
|||
|
||||
public function index ($page=0) {
|
||||
$res = [
|
||||
'page' => 'videoslist',
|
||||
'page' => 'local',
|
||||
'style' => 'videoslist',
|
||||
'paginate' => $page,
|
||||
'pagetotal' => 500,
|
||||
'userinfo' => $this->common->user,
|
||||
|
|
|
@ -15,7 +15,8 @@ class Overview extends Common {
|
|||
|
||||
public function index ($page=1) {
|
||||
$res = [
|
||||
'page' => 'videoslist',
|
||||
'page' => 'overview',
|
||||
'style' => 'videoslist',
|
||||
'paginate' => $page,
|
||||
'pagetotal' => 500,
|
||||
'userinfo' => $this->common->user,
|
||||
|
|
|
@ -17,7 +17,8 @@ class Recentlyadded extends Common {
|
|||
|
||||
public function index ($page=0) {
|
||||
$res = [
|
||||
'page' => 'videoslist',
|
||||
'page' => 'recently-added',
|
||||
'style' => 'videoslist',
|
||||
'paginate' => $page,
|
||||
'pagetotal' => 500,
|
||||
'userinfo' => $this->common->user,
|
||||
|
|
|
@ -20,6 +20,7 @@ class Subscriptions extends Common {
|
|||
|
||||
$res = [
|
||||
'page' => 'dummy',
|
||||
'style' => 'videoslist',
|
||||
'userinfo' => $this->common->user,
|
||||
];
|
||||
// $res['owner'] = $this->getOwner($id);
|
||||
|
|
|
@ -17,7 +17,8 @@ class Trending extends Common {
|
|||
|
||||
public function index ($page=0) {
|
||||
$res = [
|
||||
'page' => 'videoslist',
|
||||
'page' => 'trending',
|
||||
'style' => 'videoslist',
|
||||
'paginate' => $page,
|
||||
'pagetotal' => 500,
|
||||
'userinfo' => $this->common->user,
|
||||
|
|
|
@ -16,6 +16,7 @@ class Upload extends Common {
|
|||
public function index () {
|
||||
$res = [
|
||||
'page' => 'dummy',
|
||||
'style' => 'videoslist',
|
||||
'userinfo' => $this->common->user,
|
||||
];
|
||||
// $res['owner'] = $this->getOwner($id);
|
||||
|
|
|
@ -16,6 +16,7 @@ class Watch extends Common {
|
|||
public function index ($id) {
|
||||
$res = [
|
||||
'page' => 'watch',
|
||||
'style' => 'watch',
|
||||
'userinfo' => $this->common->user,
|
||||
];
|
||||
$res['detail'] = $this->getDetail($id);
|
||||
|
|
|
@ -5,6 +5,12 @@
|
|||
if ($res['page'] == 'watch') $name = $res['detail']->name;
|
||||
else if ($res['page'] == 'account') $name = $res['owner']->displayName.'さんのチャンネル一覧';
|
||||
else if ($res['page'] == 'channel') $name = $res['channel']->displayName.'さんのチャンネル';
|
||||
else if ($res['page'] == 'home') $name = 'トップページ';
|
||||
else if ($res['page'] == 'overview') $name = 'ディスカバー';
|
||||
else if ($res['page'] == 'trending') $name = 'トレンド';
|
||||
else if ($res['page'] == 'recently-added') $name = '最近投稿された動画';
|
||||
else if ($res['page'] == 'local') $name = 'ローカル動画';
|
||||
else if ($res['page'] == 'about') $name = 'このアプリについて';
|
||||
}
|
||||
?>
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
<my-global-icon iconname="help" aria-hidden="true">
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-help-circle"><circle cx="12" cy="12" r="10"></circle><path d="M9.09 9a3 3 0 0 1 5.83 1c0 2-3 3-3 3"></path><line x1="12" y1="17" x2="12.01" y2="17"></line></svg>
|
||||
</my-global-icon>
|
||||
このインスタンスについて
|
||||
このアプリについて
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
|
@ -1,4 +1,4 @@
|
|||
<link rel="stylesheet" href="{{ asset('css/peertube/common.css') }}" />
|
||||
@if (isset($res['page']))
|
||||
<link rel="stylesheet" href="{{ asset('css/peertube/'.$res['page'].'.css') }}" />
|
||||
@if (isset($res['style']))
|
||||
<link rel="stylesheet" href="{{ asset('css/peertube/'.$res['style'].'.css') }}" />
|
||||
@endif
|
新しいイシューから参照