diff options
5 files changed, 12 insertions, 2 deletions
diff --git a/client/src/app/+videos/+video-watch/video-watch.component.ts b/client/src/app/+videos/+video-watch/video-watch.component.ts index 0a61227a8..1b2820810 100644 --- a/client/src/app/+videos/+video-watch/video-watch.component.ts +++ b/client/src/app/+videos/+video-watch/video-watch.component.ts | |||
@@ -548,7 +548,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy { | |||
548 | this.zone.run(() => this.theaterEnabled = enabled) | 548 | this.zone.run(() => this.theaterEnabled = enabled) |
549 | }) | 549 | }) |
550 | 550 | ||
551 | this.hooks.runAction('action:video-watch.player.loaded', 'video-watch', { player: this.player, videojs }) | 551 | this.hooks.runAction('action:video-watch.player.loaded', 'video-watch', { player: this.player, videojs, video: this.video }) |
552 | }) | 552 | }) |
553 | 553 | ||
554 | this.setVideoDescriptionHTML() | 554 | this.setVideoDescriptionHTML() |
diff --git a/client/src/app/shared/shared-forms/dynamic-form-field.component.html b/client/src/app/shared/shared-forms/dynamic-form-field.component.html index c111ea7df..17b4a134f 100644 --- a/client/src/app/shared/shared-forms/dynamic-form-field.component.html +++ b/client/src/app/shared/shared-forms/dynamic-form-field.component.html | |||
@@ -1,6 +1,8 @@ | |||
1 | <div [formGroup]="form"> | 1 | <div [formGroup]="form"> |
2 | <label *ngIf="setting.type !== 'input-checkbox'" [attr.for]="setting.name" [innerHTML]="setting.label"></label> | 2 | <label *ngIf="setting.type !== 'input-checkbox'" [attr.for]="setting.name" [innerHTML]="setting.label"></label> |
3 | 3 | ||
4 | <div *ngIf="setting.descriptionHTML" class="label-small-info" [innerHTML]="setting.descriptionHTML"></div> | ||
5 | |||
4 | <input *ngIf="setting.type === 'input'" type="text" [id]="setting.name" [formControlName]="setting.name" /> | 6 | <input *ngIf="setting.type === 'input'" type="text" [id]="setting.name" [formControlName]="setting.name" /> |
5 | 7 | ||
6 | <textarea *ngIf="setting.type === 'input-textarea'" type="text" [id]="setting.name" [formControlName]="setting.name"></textarea> | 8 | <textarea *ngIf="setting.type === 'input-textarea'" type="text" [id]="setting.name" [formControlName]="setting.name"></textarea> |
diff --git a/client/src/app/shared/shared-forms/dynamic-form-field.component.scss b/client/src/app/shared/shared-forms/dynamic-form-field.component.scss index 70b3cf6c3..89193ed85 100644 --- a/client/src/app/shared/shared-forms/dynamic-form-field.component.scss +++ b/client/src/app/shared/shared-forms/dynamic-form-field.component.scss | |||
@@ -16,3 +16,9 @@ textarea { | |||
16 | .peertube-select-container { | 16 | .peertube-select-container { |
17 | @include peertube-select-container(340px); | 17 | @include peertube-select-container(340px); |
18 | } | 18 | } |
19 | |||
20 | .label-small-info { | ||
21 | font-style: italic; | ||
22 | margin-bottom: 10px; | ||
23 | font-size: 13px; | ||
24 | } | ||
diff --git a/client/src/standalone/videos/embed.ts b/client/src/standalone/videos/embed.ts index af98a1561..995e8c277 100644 --- a/client/src/standalone/videos/embed.ts +++ b/client/src/standalone/videos/embed.ts | |||
@@ -588,7 +588,7 @@ export class PeerTubeEmbed { | |||
588 | }) | 588 | }) |
589 | } | 589 | } |
590 | 590 | ||
591 | this.runHook('action:embed.player.loaded', undefined, { player: this.player, videojs }) | 591 | this.runHook('action:embed.player.loaded', undefined, { player: this.player, videojs, video: videoInfo }) |
592 | } | 592 | } |
593 | 593 | ||
594 | private async initCore () { | 594 | private async initCore () { |
diff --git a/shared/models/plugins/register-client-form-field.model.ts b/shared/models/plugins/register-client-form-field.model.ts index df24339c6..ec333e8d6 100644 --- a/shared/models/plugins/register-client-form-field.model.ts +++ b/shared/models/plugins/register-client-form-field.model.ts | |||
@@ -3,6 +3,8 @@ export interface RegisterClientFormFieldOptions { | |||
3 | label: string | 3 | label: string |
4 | type: 'input' | 'input-checkbox' | 'input-textarea' | 'markdown-text' | 'markdown-enhanced' | 4 | type: 'input' | 'input-checkbox' | 'input-textarea' | 'markdown-text' | 'markdown-enhanced' |
5 | 5 | ||
6 | descriptionHTML?: string | ||
7 | |||
6 | // Default setting value | 8 | // Default setting value |
7 | default?: string | boolean | 9 | default?: string | boolean |
8 | } | 10 | } |