OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix help transcoding placement

pull/1998/head
Chocobozzz 2019-07-29 16:41:25 +02:00
parent 34dd7cb4ca
commit 8e8eb2614b
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/app/shared/forms/peertube-checkbox.component.html
View File

@ -6,5 +6,5 @@
<span *ngIf="labelHtml" [innerHTML]="labelHtml"></span> <span *ngIf="labelHtml" [innerHTML]="labelHtml"></span>
</label> </label>
<my-help *ngIf="helpHtml" tooltipPlacement="top" helpType="custom" i18n-customHtml [customHtml]="helpHtml"></my-help> <my-help *ngIf="helpHtml" [tooltipPlacement]="helpPlacement" helpType="custom" i18n-customHtml [customHtml]="helpHtml"></my-help>
</div> </div>

1
client/src/app/shared/forms/peertube-checkbox.component.ts
View File

@ -19,6 +19,7 @@ export class PeertubeCheckboxComponent implements ControlValueAccessor {
@Input() labelText: string @Input() labelText: string
@Input() labelHtml: string @Input() labelHtml: string
@Input() helpHtml: string @Input() helpHtml: string
@Input() helpPlacement = 'top'
@Input() disabled = false @Input() disabled = false
// FIXME: https://github.com/angular/angular/issues/10816#issuecomment-307567836 // FIXME: https://github.com/angular/angular/issues/10816#issuecomment-307567836

2
client/src/app/videos/+video-edit/shared/video-edit.component.html
View File

@ -118,6 +118,7 @@
inputName="nsfw" formControlName="nsfw" inputName="nsfw" formControlName="nsfw"
i18n-labelText labelText="This video contains mature or explicit content" i18n-labelText labelText="This video contains mature or explicit content"
i18n-helpHtml helpHtml="Some instances do not list videos containing mature or explicit content by default." i18n-helpHtml helpHtml="Some instances do not list videos containing mature or explicit content by default."
helpPlacement="bottom-right"
></my-peertube-checkbox> ></my-peertube-checkbox>
<my-peertube-checkbox <my-peertube-checkbox
@ -125,6 +126,7 @@
inputName="waitTranscoding" formControlName="waitTranscoding" inputName="waitTranscoding" formControlName="waitTranscoding"
i18n-labelText labelText="Wait transcoding before publishing the video" i18n-labelText labelText="Wait transcoding before publishing the video"
i18n-helpHtml helpHtml="If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends." i18n-helpHtml helpHtml="If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends."
helpPlacement="bottom-right"
></my-peertube-checkbox> ></my-peertube-checkbox>
</div> </div>