diff options
author | Chocobozzz <me@florianbigard.com> | 2021-10-15 10:54:12 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2021-10-15 10:54:12 +0200 |
commit | 3eb7ee658db32d270553046eeb77afc679a71466 (patch) | |
tree | 6bd575cc9a95760624ef3e0d6808f1d7e6dd18df | |
parent | ca44cb36921a495e0583fb3c0553dd262855273a (diff) | |
download | PeerTube-3eb7ee658db32d270553046eeb77afc679a71466.tar.gz PeerTube-3eb7ee658db32d270553046eeb77afc679a71466.tar.zst PeerTube-3eb7ee658db32d270553046eeb77afc679a71466.zip |
Try to improve permanent live label
3 files changed, 27 insertions, 8 deletions
diff --git a/client/src/app/+videos/+video-edit/shared/video-edit.component.html b/client/src/app/+videos/+video-edit/shared/video-edit.component.html index ee5a50611..1c0ec72d1 100644 --- a/client/src/app/+videos/+video-edit/shared/video-edit.component.html +++ b/client/src/app/+videos/+video-edit/shared/video-edit.component.html | |||
@@ -227,15 +227,23 @@ | |||
227 | </div> | 227 | </div> |
228 | 228 | ||
229 | <div class="form-group"> | 229 | <div class="form-group"> |
230 | <my-peertube-checkbox inputName="liveVideoPermanentLive" formControlName="permanentLive"> | 230 | <div class="peertube-radio-container"> |
231 | <ng-template ptTemplate="label"> | 231 | <input type="radio" formControlName="permanentLive" id="permanentLiveFalse" [value]="false"> |
232 | <ng-container i18n>This is a permanent live</ng-container> | 232 | <label i18n for="permanentLiveFalse" class="radio">This is a normal live</label> |
233 | </ng-template> | ||
234 | 233 | ||
235 | <ng-container ngProjectAs="description"> | 234 | <span class="form-group-description" i18n> |
236 | <span i18n>You can stream multiple times in a permanent live. The URL for your viewers won't change but you cannot save replays of your lives</span> | 235 | You can't stream multiple times in a normal live, but you can save a replay of it that will use the same URL |
237 | </ng-container> | 236 | </span> |
238 | </my-peertube-checkbox> | 237 | </div> |
238 | |||
239 | <div class="peertube-radio-container"> | ||
240 | <input type="radio" formControlName="permanentLive" id="permanentLiveTrue" [value]="true"> | ||
241 | <label i18n for="permanentLiveTrue" class="radio">This is a permanent/recurring live</label> | ||
242 | |||
243 | <span class="form-group-description" i18n> | ||
244 | You can stream multiple times in a permanent/recurring live. The URL for your viewers won't change but you cannot save replays of your lives | ||
245 | </span> | ||
246 | </div> | ||
239 | </div> | 247 | </div> |
240 | 248 | ||
241 | <div class="form-group" *ngIf="isSaveReplayEnabled()"> | 249 | <div class="form-group" *ngIf="isSaveReplayEnabled()"> |
diff --git a/client/src/app/+videos/+video-edit/video-add-components/video-go-live.component.ts b/client/src/app/+videos/+video-edit/video-add-components/video-go-live.component.ts index 2065e4e8e..ee7011b4c 100644 --- a/client/src/app/+videos/+video-edit/video-add-components/video-go-live.component.ts +++ b/client/src/app/+videos/+video-edit/video-add-components/video-go-live.component.ts | |||
@@ -70,6 +70,8 @@ export class VideoGoLiveComponent extends VideoSend implements OnInit, AfterView | |||
70 | waitTranscoding: true, | 70 | waitTranscoding: true, |
71 | commentsEnabled: true, | 71 | commentsEnabled: true, |
72 | downloadEnabled: true, | 72 | downloadEnabled: true, |
73 | permanentLive: false, | ||
74 | saveReplay: false, | ||
73 | channelId: this.firstStepChannelId | 75 | channelId: this.firstStepChannelId |
74 | } | 76 | } |
75 | 77 | ||
diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss index 679c235a6..0634f4677 100644 --- a/client/src/sass/include/_mixins.scss +++ b/client/src/sass/include/_mixins.scss | |||
@@ -438,6 +438,8 @@ | |||
438 | cursor: pointer; | 438 | cursor: pointer; |
439 | line-height: 20px; | 439 | line-height: 20px; |
440 | display: inline-block; | 440 | display: inline-block; |
441 | font-size: 15px; | ||
442 | font-weight: $font-regular; | ||
441 | } | 443 | } |
442 | 444 | ||
443 | [type=radio]:checked + label::before, | 445 | [type=radio]:checked + label::before, |
@@ -473,6 +475,13 @@ | |||
473 | opacity: 1; | 475 | opacity: 1; |
474 | transform: scale(1); | 476 | transform: scale(1); |
475 | } | 477 | } |
478 | |||
479 | .form-group-description { | ||
480 | display: block; | ||
481 | margin-top: -10px; | ||
482 | margin-bottom: 10px; | ||
483 | margin-left: 29px; | ||
484 | } | ||
476 | } | 485 | } |
477 | 486 | ||
478 | @mixin peertube-checkbox ($border-width) { | 487 | @mixin peertube-checkbox ($border-width) { |