ソースを参照

ごめん

dev-master
コミット
f5294cd4d8
  1. 6
      resources/views/pages/peertube/a.blade.php
  2. 6
      resources/views/pages/peertube/c.blade.php
  3. 4
      resources/views/pages/peertube/home.blade.php
  4. 4
      resources/views/pages/peertube/videos/local.blade.php
  5. 8
      resources/views/pages/peertube/videos/overview.blade.php
  6. 4
      resources/views/pages/peertube/videos/recentlyadded.blade.php
  7. 4
      resources/views/pages/peertube/videos/trending.blade.php
  8. 4
      resources/views/pages/peertube/w.blade.php
  9. 6
      resources/views/theme/techsuwa/component/peertube/a/channels.blade.php
  10. 2
      resources/views/theme/techsuwa/component/peertube/a/info.blade.php
  11. 6
      resources/views/theme/techsuwa/component/peertube/c/head.blade.php
  12. 4
      resources/views/theme/techsuwa/component/peertube/c/head/info.blade.php
  13. 4
      resources/views/theme/techsuwa/component/peertube/c/videos.blade.php
  14. 12
      resources/views/theme/techsuwa/component/peertube/common/videosbydate.blade.php
  15. 2
      resources/views/theme/techsuwa/component/peertube/home/newest.blade.php
  16. 2
      resources/views/theme/techsuwa/component/peertube/home/popularest.blade.php
  17. 4
      resources/views/theme/techsuwa/component/peertube/menu.blade.php
  18. 8
      resources/views/theme/techsuwa/component/peertube/menu/top.blade.php
  19. 2
      resources/views/theme/techsuwa/component/peertube/menu/top/loggedin.blade.php
  20. 2
      resources/views/theme/techsuwa/component/peertube/videos/categories.blade.php
  21. 2
      resources/views/theme/techsuwa/component/peertube/videos/channels.blade.php
  22. 2
      resources/views/theme/techsuwa/component/peertube/videos/tags.blade.php
  23. 10
      resources/views/theme/techsuwa/component/peertube/w/info.blade.php
  24. 16
      resources/views/theme/techsuwa/component/peertube/w/info/first.blade.php
  25. 12
      resources/views/theme/techsuwa/peertube.blade.php

6
resources/views/pages/peertube/a.blade.php

@ -4,9 +4,9 @@
<div id="content" tabindex="-1" class="main-col">
<div class="main-row">
<div class="root ng-star-inserted">
@include('theme.'.env('THEME').'.component.peertube.parts.a.info')
@include('theme.'.env('THEME').'.component.peertube.parts.a.links')
@include('theme.'.env('THEME').'.component.peertube.parts.a.channels')
@include('theme.'.env('THEME').'.component.peertube.a.info')
@include('theme.'.env('THEME').'.component.peertube.a.links')
@include('theme.'.env('THEME').'.component.peertube.a.channels')
</div>
</div>
</div>

6
resources/views/pages/peertube/c.blade.php

@ -2,8 +2,8 @@
@section('content')
<div id="content" tabindex="-1" class="main-col">
@include('theme.'.env('THEME').'.component.peertube.parts.c.head')
@include('theme.'.env('THEME').'.component.peertube.parts.c.links')
@include('theme.'.env('THEME').'.component.peertube.parts.c.'.($res['cat'] == 'video-playlists' ? 'playlists' : 'videos'))
@include('theme.'.env('THEME').'.component.peertube.c.head')
@include('theme.'.env('THEME').'.component.peertube.c.links')
@include('theme.'.env('THEME').'.component.peertube.c.'.($res['cat'] == 'video-playlists' ? 'playlists' : 'videos'))
</div>
@endsection

4
resources/views/pages/peertube/home.blade.php

@ -7,8 +7,8 @@
<ng-component class="ng-star-inserted">
<h1 class="sr-only">トップページ</h1>
<div class="margin-content">
@include('theme.'.env('THEME').'.component.peertube.parts.home.newest')
@include('theme.'.env('THEME').'.component.peertube.parts.home.popularest')
@include('theme.'.env('THEME').'.component.peertube.home.newest')
@include('theme.'.env('THEME').'.component.peertube.home.popularest')
</div>
</div>
</div>

4
resources/views/pages/peertube/videos/local.blade.php

@ -21,8 +21,8 @@
</div>
<div class="action-block"></div>
</div>
@include('theme.'.env('THEME').'.component.peertube.parts.common.videosbydate')
@include('theme.'.env('THEME').'.component.peertube.parts.common.paginate', [
@include('theme.'.env('THEME').'.component.peertube.common.videosbydate')
@include('theme.'.env('THEME').'.component.peertube.common.paginate', [
'root' => '/peertube/videos/local'
])
</div>

8
resources/views/pages/peertube/videos/overview.blade.php

@ -7,11 +7,11 @@
<ng-component class="ng-star-inserted">
<h1 class="sr-only">ディスカバー</h1>
<div class="margin-content">
@if (!empty($res['video']->categories)) @include('theme.'.env('THEME').'.component.peertube.parts.videos.categories') @endif
@if (!empty($res['video']->tags)) @include('theme.'.env('THEME').'.component.peertube.parts.videos.tags') @endif
@if (!empty($res['video']->channels)) @include('theme.'.env('THEME').'.component.peertube.parts.videos.channels') @endif
@if (!empty($res['video']->categories)) @include('theme.'.env('THEME').'.component.peertube.videos.categories') @endif
@if (!empty($res['video']->tags)) @include('theme.'.env('THEME').'.component.peertube.videos.tags') @endif
@if (!empty($res['video']->channels)) @include('theme.'.env('THEME').'.component.peertube.videos.channels') @endif
<div style="margin-top: 16px;"></div>
@include('theme.'.env('THEME').'.component.peertube.parts.common.paginate', [
@include('theme.'.env('THEME').'.component.peertube.common.paginate', [
'root' => '/peertube/videos/overview'
])
</div>

4
resources/views/pages/peertube/videos/recentlyadded.blade.php

@ -21,8 +21,8 @@
</div>
<div class="action-block"></div>
</div>
@include('theme.'.env('THEME').'.component.peertube.parts.common.videosbydate')
@include('theme.'.env('THEME').'.component.peertube.parts.common.paginate', [
@include('theme.'.env('THEME').'.component.peertube.common.videosbydate')
@include('theme.'.env('THEME').'.component.peertube.common.paginate', [
'root' => '/peertube/videos/recently-added'
])
</div>

4
resources/views/pages/peertube/videos/trending.blade.php

@ -23,10 +23,10 @@
</div>
<div class="videos">
@foreach ($res['video']->data as $v)
@include('theme.'.env('THEME').'.component.peertube.parts.common.videominature')
@include('theme.'.env('THEME').'.component.peertube.common.videominature')
@endforeach
</div>
@include('theme.'.env('THEME').'.component.peertube.parts.common.paginate', [
@include('theme.'.env('THEME').'.component.peertube.common.paginate', [
'root' => '/peertube/videos/trending'
])
</div>

4
resources/views/pages/peertube/w.blade.php

@ -5,8 +5,8 @@
<div class="main-row">
<my-video-watch class="ng-star-inserted">
<div class="root">
@include('theme.'.env('THEME').'.component.peertube.parts.w.player')
@include('theme.'.env('THEME').'.component.peertube.parts.w.info')
@include('theme.'.env('THEME').'.component.peertube.w.player')
@include('theme.'.env('THEME').'.component.peertube.w.info')
</div>
</my-video-watch>
</div>

6
resources/views/theme/techsuwa/component/peertube/a/channels.blade.php

@ -4,9 +4,9 @@
@foreach ($res['channel']->data as $ch)
<?php $fullchan = $ch->name.($ch->host != 'video.076.ne.jp' ? '@'.$ch->host : ''); ?>
<div class="channel ng-star-inserted">
@include('theme.'.env('THEME').'.component.peertube.parts.a.channels.avatar')
@include('theme.'.env('THEME').'.component.peertube.parts.common.subscribe')
@include('theme.'.env('THEME').'.component.peertube.parts.a.channels.videos')
@include('theme.'.env('THEME').'.component.peertube.a.channels.avatar')
@include('theme.'.env('THEME').'.component.peertube.common.subscribe')
@include('theme.'.env('THEME').'.component.peertube.a.channels.videos')
</div>
@endforeach
</div>

2
resources/views/theme/techsuwa/component/peertube/a/info.blade.php

@ -28,6 +28,6 @@
</div>
</div>
<div class="buttons">
@include('theme.'.env('THEME').'.component.peertube.parts.common.subscribe')
@include('theme.'.env('THEME').'.component.peertube.common.subscribe')
</div>
</div>

6
resources/views/theme/techsuwa/component/peertube/c/head.blade.php

@ -1,7 +1,7 @@
<div class="main-row">
<div class="root ng-star-inserted">
@include('theme.'.env('THEME').'.component.peertube.parts.c.head.banner')
@include('theme.'.env('THEME').'.component.peertube.parts.c.head.info')
@include('theme.'.env('THEME').'.component.peertube.parts.c.head.owner', ['class' => 'bottom-owner'])
@include('theme.'.env('THEME').'.component.peertube.c.head.banner')
@include('theme.'.env('THEME').'.component.peertube.c.head.info')
@include('theme.'.env('THEME').'.component.peertube.c.head.owner', ['class' => 'bottom-owner'])
</div>
</div>

4
resources/views/theme/techsuwa/component/peertube/c/head/info.blade.php

@ -19,7 +19,7 @@
</div>
</div>
<div class="channel-buttons right">
@include('theme.'.env('THEME').'.component.peertube.parts.common.subscribe')
@include('theme.'.env('THEME').'.component.peertube.common.subscribe')
<button class="support-button peertube-button orange-button-inverted ng-star-inserted">
<my-global-icon iconname="support" aria-hidden="true">
<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 947.70386 999.3125" width="947.70386" height="999.3125">
@ -44,5 +44,5 @@
</p>
</div>
</div>
@include('theme.'.env('THEME').'.component.peertube.parts.c.head.owner', ['class' => 'owner-card'])
@include('theme.'.env('THEME').'.component.peertube.c.head.owner', ['class' => 'owner-card'])
</div>

4
resources/views/theme/techsuwa/component/peertube/c/videos.blade.php

@ -16,10 +16,10 @@
</div>
<div class="videos">
@foreach ($res['video']->data as $v)
@include('theme.'.env('THEME').'.component.peertube.parts.common.videominature')
@include('theme.'.env('THEME').'.component.peertube.common.videominature')
@endforeach
</div>
@include('theme.'.env('THEME').'.component.peertube.parts.common.paginate', [
@include('theme.'.env('THEME').'.component.peertube.common.paginate', [
'root' => '/peertube/c/'.$res['channel']->name.($res['channel']->host != 'video.076.ne.jp' ? '@'.$res['channel']->host : '').'/'.$res['cat']
])
</div>

12
resources/views/theme/techsuwa/component/peertube/common/videosbydate.blade.php

@ -2,42 +2,42 @@
@if (!empty($res['video']['today']))
<h2 class="date-title ng-star-inserted"> 今日 </h2>
@foreach ($res['video']['today'] as $v)
@include('theme.'.env('THEME').'.component.peertube.parts.common.videominature')
@include('theme.'.env('THEME').'.component.peertube.common.videominature')
@endforeach
@endif
@if (!empty($res['video']['yesterday']))
<h2 class="date-title ng-star-inserted"> 今日 </h2>
@foreach ($res['video']['today'] as $v)
@include('theme.'.env('THEME').'.component.peertube.parts.common.videominature')
@include('theme.'.env('THEME').'.component.peertube.common.videominature')
@endforeach
@endif
@if (!empty($res['video']['week']))
<h2 class="date-title ng-star-inserted"> 今週 </h2>
@foreach ($res['video']['week'] as $v)
@include('theme.'.env('THEME').'.component.peertube.parts.common.videominature')
@include('theme.'.env('THEME').'.component.peertube.common.videominature')
@endforeach
@endif
@if (!empty($res['video']['month']))
<h2 class="date-title ng-star-inserted"> 今月 </h2>
@foreach ($res['video']['month'] as $v)
@include('theme.'.env('THEME').'.component.peertube.parts.common.videominature')
@include('theme.'.env('THEME').'.component.peertube.common.videominature')
@endforeach
@endif
@if (!empty($res['video']['lastmonth']))
<h2 class="date-title ng-star-inserted"> 先月 </h2>
@foreach ($res['video']['lastmonth'] as $v)
@include('theme.'.env('THEME').'.component.peertube.parts.common.videominature')
@include('theme.'.env('THEME').'.component.peertube.common.videominature')
@endforeach
@endif
@if (!empty($res['video']['moreearly']))
<h2 class="date-title ng-star-inserted"> もっと前 </h2>
@foreach ($res['video']['moreearly'] as $v)
@include('theme.'.env('THEME').'.component.peertube.parts.common.videominature')
@include('theme.'.env('THEME').'.component.peertube.common.videominature')
@endforeach
@endif
</div>

2
resources/views/theme/techsuwa/component/peertube/home/newest.blade.php

@ -3,6 +3,6 @@
<h2 class="section-title">最新投稿された動画</h2>
</div>
@foreach ($res['new']->data as $v)
@include('theme.'.env('THEME').'.component.peertube.parts.common.videominature')
@include('theme.'.env('THEME').'.component.peertube.common.videominature')
@endforeach
</div>

2
resources/views/theme/techsuwa/component/peertube/home/popularest.blade.php

@ -3,6 +3,6 @@
<h2 class="section-title">人気な動画</h2>
</div>
@foreach ($res['hot']->data as $v)
@include('theme.'.env('THEME').'.component.peertube.parts.common.videominature')
@include('theme.'.env('THEME').'.component.peertube.common.videominature')
@endforeach
</div>

4
resources/views/theme/techsuwa/component/peertube/menu.blade.php

@ -1,8 +1,8 @@
<my-menu class="ng-star-inserted">
<div class="menu-wrapper">
<menu class="is-logged-in">
@include('theme.'.env('THEME').'.component.peertube.parts.menu.top')
@include('theme.'.env('THEME').'.component.peertube.parts.menu.footer')
@include('theme.'.env('THEME').'.component.peertube.menu.top')
@include('theme.'.env('THEME').'.component.peertube.menu.footer')
</menu>
</div>
</my-menu>

8
resources/views/theme/techsuwa/component/peertube/menu/top.blade.php

@ -1,9 +1,9 @@
<div class="top-menu">
@if (!is_null($res['userinfo']) && (isset($res['userinfo']->me) && !is_null($res['userinfo']->me)))
@include('theme.'.env('THEME').'.component.peertube.parts.menu.top.loggedin')
@include('theme.'.env('THEME').'.component.peertube.parts.menu.top.inmylibrary')
@include('theme.'.env('THEME').'.component.peertube.menu.top.loggedin')
@include('theme.'.env('THEME').'.component.peertube.menu.top.inmylibrary')
@else
@include('theme.'.env('THEME').'.component.peertube.parts.menu.top.loginmenu')
@include('theme.'.env('THEME').'.component.peertube.menu.top.loginmenu')
@endif
@include('theme.'.env('THEME').'.component.peertube.parts.menu.top.oninstance')
@include('theme.'.env('THEME').'.component.peertube.menu.top.oninstance')
</div>

2
resources/views/theme/techsuwa/component/peertube/menu/top/loggedin.blade.php

@ -16,7 +16,7 @@
</div>
</a>
</div>
@include('theme.'.env('THEME').'.component.peertube.parts.menu.top.notification')
@include('theme.'.env('THEME').'.component.peertube.menu.top.notification')
</div>
<div class="logged-in-menu">
<a routerlink="/my-account" routerlinkactive="active" class="menu-link" href="/peertube/my-account">

2
resources/views/theme/techsuwa/component/peertube/videos/categories.blade.php

@ -3,6 +3,6 @@
<a routerlink="/search" href="/peertube/search?categoryOneOf={{ $res['video']->categories[0]->category->id }}">{{ $res['video']->categories[0]->category->label }}</a>
</h1>
@foreach ($res['video']->categories[0]->videos as $k => $v)
@include('theme.'.env('THEME').'.component.peertube.parts.common.videominature')
@include('theme.'.env('THEME').'.component.peertube.common.videominature')
@endforeach
</div>

2
resources/views/theme/techsuwa/component/peertube/videos/channels.blade.php

@ -8,6 +8,6 @@
</a>
</div>
@foreach ($res['video']->channels[0]->videos as $k => $v)
@include('theme.'.env('THEME').'.component.peertube.parts.common.videominature')
@include('theme.'.env('THEME').'.component.peertube.common.videominature')
@endforeach
</div>

2
resources/views/theme/techsuwa/component/peertube/videos/tags.blade.php

@ -3,6 +3,6 @@
<a routerlink="/search" href="/peertube/search?tagsOneOf=vampiros">{{ '#'.$res['video']->tags[0]->tag }}</a>
</h2>
@foreach ($res['video']->tags[0]->videos as $k => $v)
@include('theme.'.env('THEME').'.component.peertube.parts.common.videominature')
@include('theme.'.env('THEME').'.component.peertube.common.videominature')
@endforeach
</div>

10
resources/views/theme/techsuwa/component/peertube/w/info.blade.php

@ -1,9 +1,9 @@
<div class="margin-content video-bottom ng-star-inserted">
<div class="video-info">
@include('theme.'.env('THEME').'.component.peertube.parts.w.info.first')
@include('theme.'.env('THEME').'.component.peertube.parts.w.info.description')
@include('theme.'.env('THEME').'.component.peertube.parts.w.info.attrib')
@include('theme.'.env('THEME').'.component.peertube.parts.w.info.comments')
@include('theme.'.env('THEME').'.component.peertube.w.info.first')
@include('theme.'.env('THEME').'.component.peertube.w.info.description')
@include('theme.'.env('THEME').'.component.peertube.w.info.attrib')
@include('theme.'.env('THEME').'.component.peertube.w.info.comments')
</div>
@include('theme.'.env('THEME').'.component.peertube.parts.w.videorecommend')
@include('theme.'.env('THEME').'.component.peertube.w.videorecommend')
</div>

16
resources/views/theme/techsuwa/component/peertube/w/info/first.blade.php

@ -5,23 +5,23 @@
<h1 class="video-info-name">{{ $res['detail']->name }}</h1>
</div>
<div class="video-info-first-row-bottom">
@include('theme.'.env('THEME').'.component.peertube.parts.w.info.viewsdate')
@include('theme.'.env('THEME').'.component.peertube.w.info.viewsdate')
<my-action-buttons>
<div class="video-actions-rates">
<div class="video-actions full-width justify-content-end">
@include('theme.'.env('THEME').'.component.peertube.parts.w.info.videorate')
@include('theme.'.env('THEME').'.component.peertube.parts.w.info.support')
@include('theme.'.env('THEME').'.component.peertube.parts.w.info.share')
@include('theme.'.env('THEME').'.component.peertube.parts.w.info.save')
@include('theme.'.env('THEME').'.component.peertube.parts.w.info.more')
@include('theme.'.env('THEME').'.component.peertube.w.info.videorate')
@include('theme.'.env('THEME').'.component.peertube.w.info.support')
@include('theme.'.env('THEME').'.component.peertube.w.info.share')
@include('theme.'.env('THEME').'.component.peertube.w.info.save')
@include('theme.'.env('THEME').'.component.peertube.w.info.more')
</div>
</div>
</my-action-buttons>
</div>
</div>
<div class="pt-3 border-top video-info-channel d-flex">
@include('theme.'.env('THEME').'.component.peertube.parts.w.info.channel')
@include('theme.'.env('THEME').'.component.peertube.parts.common.subscribe')
@include('theme.'.env('THEME').'.component.peertube.w.info.channel')
@include('theme.'.env('THEME').'.component.peertube.common.subscribe')
</div>
</div>
</div>

12
resources/views/theme/techsuwa/peertube.blade.php

@ -1,17 +1,17 @@
<!DOCTYPE html>
<html lang="ja">
<head>
@include('theme.'.env('THEME').'.component.peertube.parts.manifest')
@include('theme.'.env('THEME').'.component.peertube.parts.style')
@include('theme.'.env('THEME').'.component.peertube.parts.meta')
@include('theme.'.env('THEME').'.component.peertube.parts.stylelink')
@include('theme.'.env('THEME').'.component.peertube.manifest')
@include('theme.'.env('THEME').'.component.peertube.style')
@include('theme.'.env('THEME').'.component.peertube.meta')
@include('theme.'.env('THEME').'.component.peertube.stylelink')
</head>
<body id="custom-css">
<div class="peertube-container user-logged-in">
@include('theme.'.env('THEME').'.component.peertube.parts.header')
@include('theme.'.env('THEME').'.component.peertube.header')
<div class="sub-header-container">
@include('theme.'.env('THEME').'.component.peertube.parts.menu')
@include('theme.'.env('THEME').'.component.peertube.menu')
@yield('content')
</div>
</div>

読み込み中…
キャンセル
保存