diff options
Diffstat (limited to 'client/src/app/shared')
10 files changed, 24 insertions, 24 deletions
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 2ef61ecfc..2ec436ac6 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 | |||
@@ -18,7 +18,7 @@ | |||
18 | </select> | 18 | </select> |
19 | </div> | 19 | </div> |
20 | 20 | ||
21 | <my-input-toggle-hidden *ngIf="setting.type === 'input-password'" [formControlName]="setting.name" [inputId]="setting.name"></my-input-toggle-hidden> | 21 | <my-input-text *ngIf="setting.type === 'input-password'" [formControlName]="setting.name" [inputId]="setting.name"></my-input-text> |
22 | 22 | ||
23 | <textarea *ngIf="setting.type === 'input-textarea'" type="text" [id]="setting.name" [formControlName]="setting.name"></textarea> | 23 | <textarea *ngIf="setting.type === 'input-textarea'" type="text" [id]="setting.name" [formControlName]="setting.name"></textarea> |
24 | 24 | ||
diff --git a/client/src/app/shared/shared-forms/index.ts b/client/src/app/shared/shared-forms/index.ts index 727416a40..495785e7b 100644 --- a/client/src/app/shared/shared-forms/index.ts +++ b/client/src/app/shared/shared-forms/index.ts | |||
@@ -3,7 +3,7 @@ export * from './form-reactive' | |||
3 | export * from './form-validator.service' | 3 | export * from './form-validator.service' |
4 | export * from './form-validator.service' | 4 | export * from './form-validator.service' |
5 | export * from './input-switch.component' | 5 | export * from './input-switch.component' |
6 | export * from './input-toggle-hidden.component' | 6 | export * from './input-text.component' |
7 | export * from './markdown-textarea.component' | 7 | export * from './markdown-textarea.component' |
8 | export * from './peertube-checkbox.component' | 8 | export * from './peertube-checkbox.component' |
9 | export * from './preview-upload.component' | 9 | export * from './preview-upload.component' |
diff --git a/client/src/app/shared/shared-forms/input-toggle-hidden.component.html b/client/src/app/shared/shared-forms/input-text.component.html index f7f9ce403..f7f9ce403 100644 --- a/client/src/app/shared/shared-forms/input-toggle-hidden.component.html +++ b/client/src/app/shared/shared-forms/input-text.component.html | |||
diff --git a/client/src/app/shared/shared-forms/input-toggle-hidden.component.scss b/client/src/app/shared/shared-forms/input-text.component.scss index cc1646a69..cc1646a69 100644 --- a/client/src/app/shared/shared-forms/input-toggle-hidden.component.scss +++ b/client/src/app/shared/shared-forms/input-text.component.scss | |||
diff --git a/client/src/app/shared/shared-forms/input-toggle-hidden.component.ts b/client/src/app/shared/shared-forms/input-text.component.ts index e03353fe1..ed4637c17 100644 --- a/client/src/app/shared/shared-forms/input-toggle-hidden.component.ts +++ b/client/src/app/shared/shared-forms/input-text.component.ts | |||
@@ -3,18 +3,18 @@ import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms' | |||
3 | import { Notifier } from '@app/core' | 3 | import { Notifier } from '@app/core' |
4 | 4 | ||
5 | @Component({ | 5 | @Component({ |
6 | selector: 'my-input-toggle-hidden', | 6 | selector: 'my-input-text', |
7 | templateUrl: './input-toggle-hidden.component.html', | 7 | templateUrl: './input-text.component.html', |
8 | styleUrls: [ './input-toggle-hidden.component.scss' ], | 8 | styleUrls: [ './input-text.component.scss' ], |
9 | providers: [ | 9 | providers: [ |
10 | { | 10 | { |
11 | provide: NG_VALUE_ACCESSOR, | 11 | provide: NG_VALUE_ACCESSOR, |
12 | useExisting: forwardRef(() => InputToggleHiddenComponent), | 12 | useExisting: forwardRef(() => InputTextComponent), |
13 | multi: true | 13 | multi: true |
14 | } | 14 | } |
15 | ] | 15 | ] |
16 | }) | 16 | }) |
17 | export class InputToggleHiddenComponent implements ControlValueAccessor { | 17 | export class InputTextComponent implements ControlValueAccessor { |
18 | @Input() inputId = Math.random().toString(11).slice(2, 8) // id cannot be left empty or undefined | 18 | @Input() inputId = Math.random().toString(11).slice(2, 8) // id cannot be left empty or undefined |
19 | @Input() value = '' | 19 | @Input() value = '' |
20 | @Input() autocomplete = 'off' | 20 | @Input() autocomplete = 'off' |
diff --git a/client/src/app/shared/shared-forms/shared-form.module.ts b/client/src/app/shared/shared-forms/shared-form.module.ts index 60c2f66ae..81f076db6 100644 --- a/client/src/app/shared/shared-forms/shared-form.module.ts +++ b/client/src/app/shared/shared-forms/shared-form.module.ts | |||
@@ -9,7 +9,7 @@ import { AdvancedInputFilterComponent } from './advanced-input-filter.component' | |||
9 | import { DynamicFormFieldComponent } from './dynamic-form-field.component' | 9 | import { DynamicFormFieldComponent } from './dynamic-form-field.component' |
10 | import { FormValidatorService } from './form-validator.service' | 10 | import { FormValidatorService } from './form-validator.service' |
11 | import { InputSwitchComponent } from './input-switch.component' | 11 | import { InputSwitchComponent } from './input-switch.component' |
12 | import { InputToggleHiddenComponent } from './input-toggle-hidden.component' | 12 | import { InputTextComponent } from './input-text.component' |
13 | import { MarkdownTextareaComponent } from './markdown-textarea.component' | 13 | import { MarkdownTextareaComponent } from './markdown-textarea.component' |
14 | import { PeertubeCheckboxComponent } from './peertube-checkbox.component' | 14 | import { PeertubeCheckboxComponent } from './peertube-checkbox.component' |
15 | import { PreviewUploadComponent } from './preview-upload.component' | 15 | import { PreviewUploadComponent } from './preview-upload.component' |
@@ -40,7 +40,7 @@ import { TimestampInputComponent } from './timestamp-input.component' | |||
40 | ], | 40 | ], |
41 | 41 | ||
42 | declarations: [ | 42 | declarations: [ |
43 | InputToggleHiddenComponent, | 43 | InputTextComponent, |
44 | MarkdownTextareaComponent, | 44 | MarkdownTextareaComponent, |
45 | PeertubeCheckboxComponent, | 45 | PeertubeCheckboxComponent, |
46 | PreviewUploadComponent, | 46 | PreviewUploadComponent, |
@@ -71,7 +71,7 @@ import { TimestampInputComponent } from './timestamp-input.component' | |||
71 | InputMaskModule, | 71 | InputMaskModule, |
72 | NgSelectModule, | 72 | NgSelectModule, |
73 | 73 | ||
74 | InputToggleHiddenComponent, | 74 | InputTextComponent, |
75 | MarkdownTextareaComponent, | 75 | MarkdownTextareaComponent, |
76 | PeertubeCheckboxComponent, | 76 | PeertubeCheckboxComponent, |
77 | PreviewUploadComponent, | 77 | PreviewUploadComponent, |
diff --git a/client/src/app/shared/shared-share-modal/video-share.component.html b/client/src/app/shared/shared-share-modal/video-share.component.html index 572c03129..0658ae962 100644 --- a/client/src/app/shared/shared-share-modal/video-share.component.html +++ b/client/src/app/shared/shared-share-modal/video-share.component.html | |||
@@ -25,7 +25,7 @@ | |||
25 | 25 | ||
26 | <ng-template ngbNavContent> | 26 | <ng-template ngbNavContent> |
27 | <div class="nav-content"> | 27 | <div class="nav-content"> |
28 | <my-input-toggle-hidden [value]="getPlaylistUrl()" [withToggle]="false" [withCopy]="true" [show]="true" [readonly]="true"></my-input-toggle-hidden> | 28 | <my-input-text [value]="getPlaylistUrl()" [withToggle]="false" [withCopy]="true" [show]="true" [readonly]="true"></my-input-text> |
29 | </div> | 29 | </div> |
30 | </ng-template> | 30 | </ng-template> |
31 | </ng-container> | 31 | </ng-container> |
@@ -45,10 +45,10 @@ | |||
45 | 45 | ||
46 | <ng-template ngbNavContent> | 46 | <ng-template ngbNavContent> |
47 | <div class="nav-content"> | 47 | <div class="nav-content"> |
48 | <my-input-toggle-hidden | 48 | <my-input-text |
49 | [value]="customizations.onlyEmbedUrl ? getPlaylistEmbedUrl() : getPlaylistIframeCode()" (change)="updateEmbedCode()" | 49 | [value]="customizations.onlyEmbedUrl ? getPlaylistEmbedUrl() : getPlaylistIframeCode()" (change)="updateEmbedCode()" |
50 | [withToggle]="false" [withCopy]="true" [show]="true" [readonly]="true" | 50 | [withToggle]="false" [withCopy]="true" [show]="true" [readonly]="true" |
51 | ></my-input-toggle-hidden> | 51 | ></my-input-text> |
52 | 52 | ||
53 | <div i18n *ngIf="notSecure()" class="alert alert-warning"> | 53 | <div i18n *ngIf="notSecure()" class="alert alert-warning"> |
54 | The url is not secured (no HTTPS), so the embed video won't work on HTTPS websites (web browsers block non secured HTTP requests on HTTPS websites). | 54 | The url is not secured (no HTTPS), so the embed video won't work on HTTPS websites (web browsers block non secured HTTP requests on HTTPS websites). |
@@ -102,7 +102,7 @@ | |||
102 | 102 | ||
103 | <ng-template ngbNavContent> | 103 | <ng-template ngbNavContent> |
104 | <div class="nav-content"> | 104 | <div class="nav-content"> |
105 | <my-input-toggle-hidden [value]="getVideoUrl()" [withToggle]="false" [withCopy]="true" [show]="true" [readonly]="true"></my-input-toggle-hidden> | 105 | <my-input-text [value]="getVideoUrl()" [withToggle]="false" [withCopy]="true" [show]="true" [readonly]="true"></my-input-text> |
106 | </div> | 106 | </div> |
107 | </ng-template> | 107 | </ng-template> |
108 | </ng-container> | 108 | </ng-container> |
@@ -122,10 +122,10 @@ | |||
122 | 122 | ||
123 | <ng-template ngbNavContent> | 123 | <ng-template ngbNavContent> |
124 | <div class="nav-content"> | 124 | <div class="nav-content"> |
125 | <my-input-toggle-hidden | 125 | <my-input-text |
126 | [value]="customizations.onlyEmbedUrl ? getVideoEmbedUrl() : getVideoIframeCode()" (ngModelChange)="updateEmbedCode()" | 126 | [value]="customizations.onlyEmbedUrl ? getVideoEmbedUrl() : getVideoIframeCode()" (ngModelChange)="updateEmbedCode()" |
127 | [withToggle]="false" [withCopy]="true" [show]="true" [readonly]="true" | 127 | [withToggle]="false" [withCopy]="true" [show]="true" [readonly]="true" |
128 | ></my-input-toggle-hidden> | 128 | ></my-input-text> |
129 | 129 | ||
130 | <div i18n *ngIf="notSecure()" class="alert alert-warning"> | 130 | <div i18n *ngIf="notSecure()" class="alert alert-warning"> |
131 | The url is not secured (no HTTPS), so the embed video won't work on HTTPS websites (web browsers block non secured HTTP requests on HTTPS websites). | 131 | The url is not secured (no HTTPS), so the embed video won't work on HTTPS websites (web browsers block non secured HTTP requests on HTTPS websites). |
diff --git a/client/src/app/shared/shared-share-modal/video-share.component.scss b/client/src/app/shared/shared-share-modal/video-share.component.scss index abb78b09b..6123bc517 100644 --- a/client/src/app/shared/shared-share-modal/video-share.component.scss +++ b/client/src/app/shared/shared-share-modal/video-share.component.scss | |||
@@ -1,7 +1,7 @@ | |||
1 | @use '_mixins' as *; | 1 | @use '_mixins' as *; |
2 | @use '_variables' as *; | 2 | @use '_variables' as *; |
3 | 3 | ||
4 | my-input-toggle-hidden { | 4 | my-input-text { |
5 | width: 100%; | 5 | width: 100%; |
6 | } | 6 | } |
7 | 7 | ||
diff --git a/client/src/app/shared/shared-video-live/live-stream-information.component.html b/client/src/app/shared/shared-video-live/live-stream-information.component.html index 28396915a..6505e50e2 100644 --- a/client/src/app/shared/shared-video-live/live-stream-information.component.html +++ b/client/src/app/shared/shared-video-live/live-stream-information.component.html | |||
@@ -17,17 +17,17 @@ | |||
17 | 17 | ||
18 | <div *ngIf="live.rtmpUrl" class="form-group"> | 18 | <div *ngIf="live.rtmpUrl" class="form-group"> |
19 | <label for="liveVideoRTMPUrl" i18n>Live RTMP Url</label> | 19 | <label for="liveVideoRTMPUrl" i18n>Live RTMP Url</label> |
20 | <my-input-toggle-hidden inputId="liveVideoRTMPUrl" [value]="live.rtmpUrl" [withToggle]="false" [withCopy]="true" [show]="true" [readonly]="true"></my-input-toggle-hidden> | 20 | <my-input-text inputId="liveVideoRTMPUrl" [value]="live.rtmpUrl" [withToggle]="false" [withCopy]="true" [show]="true" [readonly]="true"></my-input-text> |
21 | </div> | 21 | </div> |
22 | 22 | ||
23 | <div *ngIf="live.rtmpsUrl" class="form-group"> | 23 | <div *ngIf="live.rtmpsUrl" class="form-group"> |
24 | <label for="liveVideoRTMPSUrl" i18n>Live RTMPS Url</label> | 24 | <label for="liveVideoRTMPSUrl" i18n>Live RTMPS Url</label> |
25 | <my-input-toggle-hidden inputId="liveVideoRTMPSUrl" [value]="live.rtmpsUrl" [withToggle]="false" [withCopy]="true" [show]="true" [readonly]="true"></my-input-toggle-hidden> | 25 | <my-input-text inputId="liveVideoRTMPSUrl" [value]="live.rtmpsUrl" [withToggle]="false" [withCopy]="true" [show]="true" [readonly]="true"></my-input-text> |
26 | </div> | 26 | </div> |
27 | 27 | ||
28 | <div class="form-group"> | 28 | <div class="form-group"> |
29 | <label for="liveVideoStreamKey" i18n>Live stream key</label> | 29 | <label for="liveVideoStreamKey" i18n>Live stream key</label> |
30 | <my-input-toggle-hidden inputId="liveVideoStreamKey" [value]="live.streamKey" [withCopy]="true" [readonly]="true"></my-input-toggle-hidden> | 30 | <my-input-text inputId="liveVideoStreamKey" [value]="live.streamKey" [withCopy]="true" [readonly]="true"></my-input-text> |
31 | 31 | ||
32 | <div class="form-group-description" i18n>⚠️ Never share your stream key with anyone.</div> | 32 | <div class="form-group-description" i18n>⚠️ Never share your stream key with anyone.</div> |
33 | </div> | 33 | </div> |
diff --git a/client/src/app/shared/shared-video-miniature/video-download.component.html b/client/src/app/shared/shared-video-miniature/video-download.component.html index bf971229e..e8990747a 100644 --- a/client/src/app/shared/shared-video-miniature/video-download.component.html +++ b/client/src/app/shared/shared-video-miniature/video-download.component.html | |||
@@ -28,10 +28,10 @@ | |||
28 | 28 | ||
29 | <ng-template ngbNavContent> | 29 | <ng-template ngbNavContent> |
30 | <div class="nav-content"> | 30 | <div class="nav-content"> |
31 | <my-input-toggle-hidden | 31 | <my-input-text |
32 | *ngIf="!isConfidentialVideo()" | 32 | *ngIf="!isConfidentialVideo()" |
33 | [show]="true" [readonly]="true" [withCopy]="true" [withToggle]="false" [value]="getLink()" | 33 | [show]="true" [readonly]="true" [withCopy]="true" [withToggle]="false" [value]="getLink()" |
34 | ></my-input-toggle-hidden> | 34 | ></my-input-text> |
35 | </div> | 35 | </div> |
36 | </ng-template> | 36 | </ng-template> |
37 | </ng-container> | 37 | </ng-container> |
@@ -48,10 +48,10 @@ | |||
48 | 48 | ||
49 | <ng-template ngbNavContent> | 49 | <ng-template ngbNavContent> |
50 | <div class="nav-content"> | 50 | <div class="nav-content"> |
51 | <my-input-toggle-hidden | 51 | <my-input-text |
52 | *ngIf="!isConfidentialVideo()" | 52 | *ngIf="!isConfidentialVideo()" |
53 | [show]="true" [readonly]="true" [withCopy]="true" [withToggle]="false" [value]="getLink()" | 53 | [show]="true" [readonly]="true" [withCopy]="true" [withToggle]="false" [value]="getLink()" |
54 | ></my-input-toggle-hidden> | 54 | ></my-input-text> |
55 | </div> | 55 | </div> |
56 | </ng-template> | 56 | </ng-template> |
57 | </ng-container> | 57 | </ng-container> |