aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/videos
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-06-29 14:34:04 +0200
committerChocobozzz <me@florianbigard.com>2018-06-29 14:34:04 +0200
commit52d9f792b3fee5acce80f948295b59e3ad2073eb (patch)
tree661f577e9c7196d199b4b49e475ecd2d88e6d7b7 /client/src/app/videos
parent4bbfc6c606c8d3794bae25c64c516120af41f4eb (diff)
downloadPeerTube-52d9f792b3fee5acce80f948295b59e3ad2073eb.tar.gz
PeerTube-52d9f792b3fee5acce80f948295b59e3ad2073eb.tar.zst
PeerTube-52d9f792b3fee5acce80f948295b59e3ad2073eb.zip
Client: Add ability to update video channel avatar
Diffstat (limited to 'client/src/app/videos')
-rw-r--r--client/src/app/videos/+video-edit/video-add.component.ts8
-rw-r--r--client/src/app/videos/+video-watch/video-watch.component.html2
-rw-r--r--client/src/app/videos/+video-watch/video-watch.component.scss7
3 files changed, 13 insertions, 4 deletions
diff --git a/client/src/app/videos/+video-edit/video-add.component.ts b/client/src/app/videos/+video-edit/video-add.component.ts
index 3ddeda109..9fe121371 100644
--- a/client/src/app/videos/+video-edit/video-add.component.ts
+++ b/client/src/app/videos/+video-edit/video-add.component.ts
@@ -132,10 +132,10 @@ export class VideoAddComponent extends FormReactive implements OnInit, OnDestroy
132 if (!videofile) return 132 if (!videofile) return
133 133
134 // Cannot upload videos > 4GB for now 134 // Cannot upload videos > 4GB for now
135 if (videofile.size > 4 * 1024 * 1024 * 1024) { 135 // if (videofile.size > 4 * 1024 * 1024 * 1024) {
136 this.notificationsService.error(this.i18n('Error'), this.i18n('We are sorry but PeerTube cannot handle videos > 4GB')) 136 // this.notificationsService.error(this.i18n('Error'), this.i18n('We are sorry but PeerTube cannot handle videos > 4GB'))
137 return 137 // return
138 } 138 // }
139 139
140 const videoQuota = this.authService.getUser().videoQuota 140 const videoQuota = this.authService.getUser().videoQuota
141 if (videoQuota !== -1 && (this.userVideoQuotaUsed + videofile.size) > videoQuota) { 141 if (videoQuota !== -1 && (this.userVideoQuotaUsed + videofile.size) > videoQuota) {
diff --git a/client/src/app/videos/+video-watch/video-watch.component.html b/client/src/app/videos/+video-watch/video-watch.component.html
index 492568d3c..cd470e320 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.html
+++ b/client/src/app/videos/+video-watch/video-watch.component.html
@@ -25,6 +25,8 @@
25 <div class="video-info-channel"> 25 <div class="video-info-channel">
26 <a [routerLink]="[ '/video-channels', video.channel.id ]" i18n-title title="Go the channel page"> 26 <a [routerLink]="[ '/video-channels', video.channel.id ]" i18n-title title="Go the channel page">
27 {{ video.channel.displayName }} 27 {{ video.channel.displayName }}
28
29 <img [src]="video.videoChannelAvatarUrl" alt="Video channel avatar" />
28 </a> 30 </a>
29 <!-- Here will be the subscribe button --> 31 <!-- Here will be the subscribe button -->
30 <my-help helpType="custom" i18n-customHtml customHtml="You can subscribe to this account via any ActivityPub-capable fediverse instance. For instance with Mastodon or Pleroma you can type in the search box <strong>@{{video.account.name}}@{{video.account.host}}</strong> and subscribe there. Subscription as a PeerTube user is being worked on in <a href='https://github.com/Chocobozzz/PeerTube/issues/470'>#470</a>."></my-help> 32 <my-help helpType="custom" i18n-customHtml customHtml="You can subscribe to this account via any ActivityPub-capable fediverse instance. For instance with Mastodon or Pleroma you can type in the search box <strong>@{{video.account.name}}@{{video.account.host}}</strong> and subscribe there. Subscription as a PeerTube user is being worked on in <a href='https://github.com/Chocobozzz/PeerTube/issues/470'>#470</a>."></my-help>
diff --git a/client/src/app/videos/+video-watch/video-watch.component.scss b/client/src/app/videos/+video-watch/video-watch.component.scss
index dfabdfa60..4404fa9b2 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.scss
+++ b/client/src/app/videos/+video-watch/video-watch.component.scss
@@ -84,6 +84,12 @@
84 &:hover { 84 &:hover {
85 opacity: 0.8; 85 opacity: 0.8;
86 } 86 }
87
88 img {
89 @include avatar(18px);
90
91 margin: -2px 2px 0 5px;
92 }
87 } 93 }
88 94
89 my-help { 95 my-help {
@@ -106,6 +112,7 @@
106 img { 112 img {
107 @include avatar(18px); 113 @include avatar(18px);
108 114
115 margin-top: -2px;
109 margin-left: 7px; 116 margin-left: 7px;
110 } 117 }
111 } 118 }