diff options
author | Chocobozzz <me@florianbigard.com> | 2022-06-10 15:58:38 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2022-06-10 15:58:38 +0200 |
commit | a70bf3bd3337406704af5907a015ba385df0483d (patch) | |
tree | 5c64314edae6dc68339116b26b7d0480cdb65e4e | |
parent | b15fcd49bff880a8246cb48292af3ae8d66f0699 (diff) | |
download | PeerTube-a70bf3bd3337406704af5907a015ba385df0483d.tar.gz PeerTube-a70bf3bd3337406704af5907a015ba385df0483d.tar.zst PeerTube-a70bf3bd3337406704af5907a015ba385df0483d.zip |
Rename input toggle hidden to input text
It's more than just an hidden toggle
22 files changed, 52 insertions, 52 deletions
diff --git a/client/src/app/+admin/overview/users/user-edit/user-edit.component.html b/client/src/app/+admin/overview/users/user-edit/user-edit.component.html index 7e0eaf280..bfa414164 100644 --- a/client/src/app/+admin/overview/users/user-edit/user-edit.component.html +++ b/client/src/app/+admin/overview/users/user-edit/user-edit.component.html | |||
@@ -123,9 +123,9 @@ | |||
123 | </ng-template> | 123 | </ng-template> |
124 | </my-help> | 124 | </my-help> |
125 | 125 | ||
126 | <my-input-toggle-hidden | 126 | <my-input-text |
127 | formControlName="password" inputId="password" [ngClass]="{ 'input-error': formErrors['password'] }" autocomplete="new-password" | 127 | formControlName="password" inputId="password" [ngClass]="{ 'input-error': formErrors['password'] }" autocomplete="new-password" |
128 | ></my-input-toggle-hidden> | 128 | ></my-input-text> |
129 | 129 | ||
130 | <div *ngIf="formErrors.password" class="form-error"> | 130 | <div *ngIf="formErrors.password" class="form-error"> |
131 | {{ formErrors.password }} | 131 | {{ formErrors.password }} |
diff --git a/client/src/app/+admin/overview/users/user-edit/user-edit.component.scss b/client/src/app/+admin/overview/users/user-edit/user-edit.component.scss index d7932154b..f9f4474a2 100644 --- a/client/src/app/+admin/overview/users/user-edit/user-edit.component.scss +++ b/client/src/app/+admin/overview/users/user-edit/user-edit.component.scss | |||
@@ -22,7 +22,7 @@ input:not([type=submit]) { | |||
22 | display: block; | 22 | display: block; |
23 | } | 23 | } |
24 | 24 | ||
25 | my-input-toggle-hidden { | 25 | my-input-text { |
26 | @include responsive-width($form-base-input-width); | 26 | @include responsive-width($form-base-input-width); |
27 | 27 | ||
28 | display: block; | 28 | display: block; |
diff --git a/client/src/app/+login/login.component.html b/client/src/app/+login/login.component.html index dc74354d8..a2d8dae2a 100644 --- a/client/src/app/+login/login.component.html +++ b/client/src/app/+login/login.component.html | |||
@@ -36,10 +36,10 @@ | |||
36 | 36 | ||
37 | <div class="form-group"> | 37 | <div class="form-group"> |
38 | <label i18n for="password">Password</label> | 38 | <label i18n for="password">Password</label> |
39 | <my-input-toggle-hidden formControlName="password" inputId="password" | 39 | <my-input-text formControlName="password" inputId="password" |
40 | i18n-placeholder placeholder="Password" | 40 | i18n-placeholder placeholder="Password" |
41 | [ngClass]="{ 'input-error': formErrors['password'] }" | 41 | [ngClass]="{ 'input-error': formErrors['password'] }" |
42 | autocomplete="current-password" [tabindex]="2"></my-input-toggle-hidden> | 42 | autocomplete="current-password" [tabindex]="2"></my-input-text> |
43 | <div *ngIf="formErrors.password" class="form-error"> | 43 | <div *ngIf="formErrors.password" class="form-error"> |
44 | {{ formErrors.password }} | 44 | {{ formErrors.password }} |
45 | </div> | 45 | </div> |
diff --git a/client/src/app/+my-account/my-account-applications/my-account-applications.component.html b/client/src/app/+my-account/my-account-applications/my-account-applications.component.html index 8f3a55be5..2fc691707 100644 --- a/client/src/app/+my-account/my-account-applications/my-account-applications.component.html +++ b/client/src/app/+my-account/my-account-applications/my-account-applications.component.html | |||
@@ -17,12 +17,12 @@ | |||
17 | 17 | ||
18 | <div class="form-group"> | 18 | <div class="form-group"> |
19 | <label i18n for="feed-url">Feed URL</label> | 19 | <label i18n for="feed-url">Feed URL</label> |
20 | <my-input-toggle-hidden [value]="feedUrl" [withToggle]="false" [withCopy]="true" [show]="true" [readonly]="true"></my-input-toggle-hidden> | 20 | <my-input-text [value]="feedUrl" [withToggle]="false" [withCopy]="true" [show]="true" [readonly]="true"></my-input-text> |
21 | </div> | 21 | </div> |
22 | 22 | ||
23 | <div class="form-group"> | 23 | <div class="form-group"> |
24 | <label i18n for="feed-token">Feed Token</label> | 24 | <label i18n for="feed-token">Feed Token</label> |
25 | <my-input-toggle-hidden [value]="feedToken" [withCopy]="true" [readonly]="true"></my-input-toggle-hidden> | 25 | <my-input-text [value]="feedToken" [withCopy]="true" [readonly]="true"></my-input-text> |
26 | 26 | ||
27 | <div class="form-group-description" i18n>⚠️ Never share your feed token with anyone.</div> | 27 | <div class="form-group-description" i18n>⚠️ Never share your feed token with anyone.</div> |
28 | </div> | 28 | </div> |
diff --git a/client/src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.html b/client/src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.html index 6d2d7d46e..b0a9dbb38 100644 --- a/client/src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.html +++ b/client/src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.html | |||
@@ -23,11 +23,11 @@ | |||
23 | </div> | 23 | </div> |
24 | 24 | ||
25 | <div class="form-group"> | 25 | <div class="form-group"> |
26 | <my-input-toggle-hidden formControlName="password" | 26 | <my-input-text formControlName="password" |
27 | id="password" | 27 | id="password" |
28 | i18n-placeholder placeholder="Current password" | 28 | i18n-placeholder placeholder="Current password" |
29 | [ngClass]="{ 'input-error': formErrors['password'] }" | 29 | [ngClass]="{ 'input-error': formErrors['password'] }" |
30 | autocomplete="current-password"></my-input-toggle-hidden> | 30 | autocomplete="current-password"></my-input-text> |
31 | <div *ngIf="formErrors['password']" class="form-error"> | 31 | <div *ngIf="formErrors['password']" class="form-error"> |
32 | {{ formErrors['password'] }} | 32 | {{ formErrors['password'] }} |
33 | </div> | 33 | </div> |
diff --git a/client/src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.scss b/client/src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.scss index 788db02ad..9be9056b8 100644 --- a/client/src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.scss +++ b/client/src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.scss | |||
@@ -6,7 +6,7 @@ label { | |||
6 | font-size: 100%; | 6 | font-size: 100%; |
7 | } | 7 | } |
8 | 8 | ||
9 | my-input-toggle-hidden { | 9 | my-input-text { |
10 | width: 340px; | 10 | width: 340px; |
11 | display: block; | 11 | display: block; |
12 | } | 12 | } |
diff --git a/client/src/app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.html b/client/src/app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.html index 43facb7ed..f1deb4273 100644 --- a/client/src/app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.html +++ b/client/src/app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.html | |||
@@ -3,29 +3,29 @@ | |||
3 | <form role="form" (ngSubmit)="changePassword()" [formGroup]="form"> | 3 | <form role="form" (ngSubmit)="changePassword()" [formGroup]="form"> |
4 | 4 | ||
5 | <label i18n for="current-password">Change password</label> | 5 | <label i18n for="current-password">Change password</label> |
6 | <my-input-toggle-hidden formControlName="current-password" | 6 | <my-input-text formControlName="current-password" |
7 | inputId="current-password" | 7 | inputId="current-password" |
8 | i18n-placeholder placeholder="Current password" | 8 | i18n-placeholder placeholder="Current password" |
9 | [ngClass]="{ 'input-error': formErrors['current-password'] }" | 9 | [ngClass]="{ 'input-error': formErrors['current-password'] }" |
10 | autocomplete="current-password"></my-input-toggle-hidden> | 10 | autocomplete="current-password"></my-input-text> |
11 | <div *ngIf="formErrors['current-password']" class="form-error"> | 11 | <div *ngIf="formErrors['current-password']" class="form-error"> |
12 | {{ formErrors['current-password'] }} | 12 | {{ formErrors['current-password'] }} |
13 | </div> | 13 | </div> |
14 | 14 | ||
15 | <my-input-toggle-hidden formControlName="new-password" | 15 | <my-input-text formControlName="new-password" |
16 | inputId="new-password" | 16 | inputId="new-password" |
17 | i18n-placeholder placeholder="New password" | 17 | i18n-placeholder placeholder="New password" |
18 | [ngClass]="{ 'input-error': formErrors['new-password'] }" | 18 | [ngClass]="{ 'input-error': formErrors['new-password'] }" |
19 | autocomplete="new-password"></my-input-toggle-hidden> | 19 | autocomplete="new-password"></my-input-text> |
20 | <div *ngIf="formErrors['new-password']" class="form-error"> | 20 | <div *ngIf="formErrors['new-password']" class="form-error"> |
21 | {{ formErrors['new-password'] }} | 21 | {{ formErrors['new-password'] }} |
22 | </div> | 22 | </div> |
23 | 23 | ||
24 | <my-input-toggle-hidden formControlName="new-confirmed-password" | 24 | <my-input-text formControlName="new-confirmed-password" |
25 | inputId="new-confirmed-password" | 25 | inputId="new-confirmed-password" |
26 | i18n-placeholder placeholder="Confirm new password" | 26 | i18n-placeholder placeholder="Confirm new password" |
27 | [ngClass]="{ 'input-error': formErrors['new-confirmed-password'] }" | 27 | [ngClass]="{ 'input-error': formErrors['new-confirmed-password'] }" |
28 | autocomplete="new-password"></my-input-toggle-hidden> | 28 | autocomplete="new-password"></my-input-text> |
29 | <div *ngIf="formErrors['new-confirmed-password']" class="form-error"> | 29 | <div *ngIf="formErrors['new-confirmed-password']" class="form-error"> |
30 | {{ formErrors['new-confirmed-password'] }} | 30 | {{ formErrors['new-confirmed-password'] }} |
31 | </div> | 31 | </div> |
diff --git a/client/src/app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.scss b/client/src/app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.scss index c46aae266..ab6a43b57 100644 --- a/client/src/app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.scss +++ b/client/src/app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.scss | |||
@@ -6,12 +6,12 @@ label { | |||
6 | font-size: 100%; | 6 | font-size: 100%; |
7 | } | 7 | } |
8 | 8 | ||
9 | my-input-toggle-hidden { | 9 | my-input-text { |
10 | width: 340px; | 10 | width: 340px; |
11 | display: block; | 11 | display: block; |
12 | } | 12 | } |
13 | 13 | ||
14 | my-input-toggle-hidden + my-input-toggle-hidden { | 14 | my-input-text + my-input-text { |
15 | margin-top: 15px; | 15 | margin-top: 15px; |
16 | } | 16 | } |
17 | 17 | ||
diff --git a/client/src/app/+reset-password/reset-password.component.html b/client/src/app/+reset-password/reset-password.component.html index 143f426ec..1910ebd15 100644 --- a/client/src/app/+reset-password/reset-password.component.html +++ b/client/src/app/+reset-password/reset-password.component.html | |||
@@ -6,10 +6,10 @@ | |||
6 | <form role="form" (ngSubmit)="resetPassword()" [formGroup]="form"> | 6 | <form role="form" (ngSubmit)="resetPassword()" [formGroup]="form"> |
7 | <div class="form-group"> | 7 | <div class="form-group"> |
8 | <label i18n for="password">Password</label> | 8 | <label i18n for="password">Password</label> |
9 | <my-input-toggle-hidden formControlName="password" inputId="password" | 9 | <my-input-text formControlName="password" inputId="password" |
10 | i18n-placeholder placeholder="Password" | 10 | i18n-placeholder placeholder="Password" |
11 | [ngClass]="{ 'input-error': formErrors['password'] }" | 11 | [ngClass]="{ 'input-error': formErrors['password'] }" |
12 | autocomplete="new-password"></my-input-toggle-hidden> | 12 | autocomplete="new-password"></my-input-text> |
13 | <div *ngIf="formErrors.password" class="form-error"> | 13 | <div *ngIf="formErrors.password" class="form-error"> |
14 | {{ formErrors.password }} | 14 | {{ formErrors.password }} |
15 | </div> | 15 | </div> |
@@ -17,10 +17,10 @@ | |||
17 | 17 | ||
18 | <div class="form-group"> | 18 | <div class="form-group"> |
19 | <label i18n for="password-confirm">Confirm password</label> | 19 | <label i18n for="password-confirm">Confirm password</label> |
20 | <my-input-toggle-hidden formControlName="password-confirm" inputId="password-confirm" | 20 | <my-input-text formControlName="password-confirm" inputId="password-confirm" |
21 | i18n-placeholder placeholder="Confirmed password" | 21 | i18n-placeholder placeholder="Confirmed password" |
22 | [ngClass]="{ 'input-error': formErrors['password-confirm'] }" | 22 | [ngClass]="{ 'input-error': formErrors['password-confirm'] }" |
23 | autocomplete="new-password"></my-input-toggle-hidden> | 23 | autocomplete="new-password"></my-input-text> |
24 | <div *ngIf="formErrors['password-confirm']" class="form-error"> | 24 | <div *ngIf="formErrors['password-confirm']" class="form-error"> |
25 | {{ formErrors['password-confirm'] }} | 25 | {{ formErrors['password-confirm'] }} |
26 | </div> | 26 | </div> |
diff --git a/client/src/app/+signup/+register/register-step-user.component.html b/client/src/app/+signup/+register/register-step-user.component.html index 745b37c10..6e367b4c7 100644 --- a/client/src/app/+signup/+register/register-step-user.component.html +++ b/client/src/app/+signup/+register/register-step-user.component.html | |||
@@ -52,10 +52,10 @@ | |||
52 | 52 | ||
53 | <div class="form-group"> | 53 | <div class="form-group"> |
54 | <label for="password" i18n>Password</label> | 54 | <label for="password" i18n>Password</label> |
55 | <my-input-toggle-hidden formControlName="password" inputId="password" | 55 | <my-input-text formControlName="password" inputId="password" |
56 | i18n-placeholder placeholder="Password" | 56 | i18n-placeholder placeholder="Password" |
57 | [ngClass]="{ 'input-error': formErrors['password'] }" | 57 | [ngClass]="{ 'input-error': formErrors['password'] }" |
58 | autocomplete="new-password"></my-input-toggle-hidden> | 58 | autocomplete="new-password"></my-input-text> |
59 | <div *ngIf="formErrors.password" class="form-error"> | 59 | <div *ngIf="formErrors.password" class="form-error"> |
60 | {{ formErrors.password }} | 60 | {{ formErrors.password }} |
61 | </div> | 61 | </div> |
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 44004eb21..26bfaa583 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 | |||
@@ -243,17 +243,17 @@ | |||
243 | 243 | ||
244 | <div *ngIf="liveVideo.rtmpUrl" class="form-group"> | 244 | <div *ngIf="liveVideo.rtmpUrl" class="form-group"> |
245 | <label for="liveVideoRTMPUrl" i18n>Live RTMP Url</label> | 245 | <label for="liveVideoRTMPUrl" i18n>Live RTMP Url</label> |
246 | <my-input-toggle-hidden inputId="liveVideoRTMPUrl" [value]="liveVideo.rtmpUrl" [withToggle]="false" [withCopy]="true" [show]="true" [readonly]="true"></my-input-toggle-hidden> | 246 | <my-input-text inputId="liveVideoRTMPUrl" [value]="liveVideo.rtmpUrl" [withToggle]="false" [withCopy]="true" [show]="true" [readonly]="true"></my-input-text> |
247 | </div> | 247 | </div> |
248 | 248 | ||
249 | <div *ngIf="liveVideo.rtmpsUrl" class="form-group"> | 249 | <div *ngIf="liveVideo.rtmpsUrl" class="form-group"> |
250 | <label for="liveVideoRTMPSUrl" i18n>Live RTMPS Url</label> | 250 | <label for="liveVideoRTMPSUrl" i18n>Live RTMPS Url</label> |
251 | <my-input-toggle-hidden inputId="liveVideoRTMPSUrl" [value]="liveVideo.rtmpsUrl" [withToggle]="false" [withCopy]="true" [show]="true" [readonly]="true"></my-input-toggle-hidden> | 251 | <my-input-text inputId="liveVideoRTMPSUrl" [value]="liveVideo.rtmpsUrl" [withToggle]="false" [withCopy]="true" [show]="true" [readonly]="true"></my-input-text> |
252 | </div> | 252 | </div> |
253 | 253 | ||
254 | <div class="form-group"> | 254 | <div class="form-group"> |
255 | <label for="liveVideoStreamKey" i18n>Live stream key</label> | 255 | <label for="liveVideoStreamKey" i18n>Live stream key</label> |
256 | <my-input-toggle-hidden inputId="liveVideoStreamKey" [value]="liveVideo.streamKey" [withCopy]="true" [readonly]="true"></my-input-toggle-hidden> | 256 | <my-input-text inputId="liveVideoStreamKey" [value]="liveVideo.streamKey" [withCopy]="true" [readonly]="true"></my-input-text> |
257 | 257 | ||
258 | <div class="form-group-description" i18n>⚠️ Never share your stream key with anyone.</div> | 258 | <div class="form-group-description" i18n>⚠️ Never share your stream key with anyone.</div> |
259 | </div> | 259 | </div> |
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> |
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss index 460356422..d288d2a21 100644 --- a/client/src/sass/application.scss +++ b/client/src/sass/application.scss | |||
@@ -151,7 +151,7 @@ code { | |||
151 | } | 151 | } |
152 | 152 | ||
153 | .input-error, | 153 | .input-error, |
154 | my-input-toggle-hidden ::ng-deep input { | 154 | my-input-text ::ng-deep input { |
155 | border-color: $red !important; | 155 | border-color: $red !important; |
156 | } | 156 | } |
157 | 157 | ||