From 2bc9bd08cd121bdffbf56a0241c4decfb77bfdd5 Mon Sep 17 00:00:00 2001 From: Rigel Kent Date: Mon, 13 Apr 2020 17:03:01 +0200 Subject: Improving select displays, focus box-shadows for paginators, instructions for index url --- .../edit-custom-config.component.html | 35 +++++++++++----------- .../src/app/+admin/config/shared/config.service.ts | 12 +++++--- .../video-redundancies-list.component.html | 14 ++++----- .../video-redundancies-list.component.ts | 4 +-- .../instance-account-blocklist.component.html | 3 ++ .../instance-server-blocklist.component.html | 4 ++- .../moderation-comment-modal.component.html | 4 ++- .../moderation-comment-modal.component.ts | 2 +- .../video-abuse-list.component.html | 15 +++++----- .../video-blacklist-list.component.html | 16 +++++----- .../src/app/+admin/system/jobs/jobs.component.html | 4 +-- .../src/app/+admin/system/logs/logs.component.html | 6 ++-- .../users/user-edit/user-edit.component.html | 4 +-- client/src/app/+admin/users/user-edit/user-edit.ts | 13 +++++--- .../users/user-list/user-list.component.html | 2 ++ .../users/user-list/user-list.component.scss | 5 ++++ .../my-account-blocklist.component.html | 1 + .../my-account-server-blocklist.component.html | 2 +- .../my-account-video-settings.component.html | 1 + .../shared/forms/timestamp-input.component.scss | 7 +++++ .../+video-watch/modal/video-share.component.ts | 2 +- client/src/sass/bootstrap.scss | 13 ++++---- client/src/sass/primeng-custom.scss | 32 ++++++++++++++++---- 23 files changed, 130 insertions(+), 71 deletions(-) diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html index 4ce4c18fc..b925d3d02 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html +++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html @@ -108,6 +108,7 @@
- @@ -331,7 +332,7 @@
@@ -441,10 +442,14 @@
- ⚠️ This functionality requires a lot of attention and extra moderation. +

⚠️ This functionality requires a lot of attention and extra moderation.

+ + + You should only follow indexes you trust, or host your own. + @@ -651,20 +656,16 @@
-
- -
- -
- -
-
{{ formErrors.transcoding.threads }}
+
+ +
+
- +
{{ formErrors.transcoding.threads }}
diff --git a/client/src/app/+admin/config/shared/config.service.ts b/client/src/app/+admin/config/shared/config.service.ts index 28a3d67d6..874b8094d 100644 --- a/client/src/app/+admin/config/shared/config.service.ts +++ b/client/src/app/+admin/config/shared/config.service.ts @@ -10,8 +10,8 @@ import { I18n } from '@ngx-translate/i18n-polyfill' export class ConfigService { private static BASE_APPLICATION_URL = environment.apiUrl + '/api/v1/config' - videoQuotaOptions: { value: number, label: string }[] = [] - videoQuotaDailyOptions: { value: number, label: string }[] = [] + videoQuotaOptions: { value: number, label: string, disabled?: boolean }[] = [] + videoQuotaDailyOptions: { value: number, label: string, disabled?: boolean }[] = [] constructor ( private authHttp: HttpClient, @@ -19,8 +19,10 @@ export class ConfigService { private i18n: I18n ) { this.videoQuotaOptions = [ + { value: undefined, label: 'Default quota', disabled: true }, { value: -1, label: this.i18n('Unlimited') }, - { value: 0, label: '0' }, + { value: undefined, label: '─────', disabled: true }, + { value: 0, label: this.i18n('None - no upload possible') }, { value: 100 * 1024 * 1024, label: this.i18n('100MB') }, { value: 500 * 1024 * 1024, label: this.i18n('500MB') }, { value: 1024 * 1024 * 1024, label: this.i18n('1GB') }, @@ -30,8 +32,10 @@ export class ConfigService { ] this.videoQuotaDailyOptions = [ + { value: undefined, label: 'Default daily upload limit', disabled: true }, { value: -1, label: this.i18n('Unlimited') }, - { value: 0, label: '0' }, + { value: undefined, label: '─────', disabled: true }, + { value: 0, label: this.i18n('None - no upload possible') }, { value: 10 * 1024 * 1024, label: this.i18n('10MB') }, { value: 50 * 1024 * 1024, label: this.i18n('50MB') }, { value: 100 * 1024 * 1024, label: this.i18n('100MB') }, diff --git a/client/src/app/+admin/follows/video-redundancies-list/video-redundancies-list.component.html b/client/src/app/+admin/follows/video-redundancies-list/video-redundancies-list.component.html index 18d88c20c..07362b3b9 100644 --- a/client/src/app/+admin/follows/video-redundancies-list/video-redundancies-list.component.html +++ b/client/src/app/+admin/follows/video-redundancies-list/video-redundancies-list.component.html @@ -3,9 +3,9 @@
- + +
@@ -22,14 +22,14 @@ Video name Video URL Total size - + - + @@ -53,7 +53,7 @@ - +
@@ -61,7 +61,7 @@ - +
diff --git a/client/src/app/+admin/follows/video-redundancies-list/video-redundancies-list.component.ts b/client/src/app/+admin/follows/video-redundancies-list/video-redundancies-list.component.ts index d563b4e95..2b62d30a3 100644 --- a/client/src/app/+admin/follows/video-redundancies-list/video-redundancies-list.component.ts +++ b/client/src/app/+admin/follows/video-redundancies-list/video-redundancies-list.component.ts @@ -66,9 +66,9 @@ export class VideoRedundanciesListComponent extends RestTable implements OnInit } getColspan () { - if (this.isDisplayingRemoteVideos()) return 3 + if (this.isDisplayingRemoteVideos()) return 5 - return 2 + return 4 } isDisplayingRemoteVideos () { diff --git a/client/src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.html b/client/src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.html index 7797bc56e..8c3930643 100644 --- a/client/src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.html +++ b/client/src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.html @@ -1,12 +1,15 @@ Account Muted at + diff --git a/client/src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.html b/client/src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.html index f634ba834..44c5c2fb8 100644 --- a/client/src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.html +++ b/client/src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.html @@ -1,13 +1,15 @@ Instance Muted at - + diff --git a/client/src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.html b/client/src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.html index 8fbd33871..8082e93f4 100644 --- a/client/src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.html +++ b/client/src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.html @@ -8,7 +8,9 @@
-
{{ formErrors.moderationComment }} diff --git a/client/src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.ts b/client/src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.ts index 29f90194b..a0471f2b0 100644 --- a/client/src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.ts +++ b/client/src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.ts @@ -32,7 +32,7 @@ export class ModerationCommentModalComponent extends FormReactive implements OnI ngOnInit () { this.buildForm({ - moderationComment: this.videoAbuseValidatorsService.VIDEO_ABUSE_REASON + moderationComment: this.videoAbuseValidatorsService.VIDEO_ABUSE_MODERATION_COMMENT }) } diff --git a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html index b25412c99..cf7b61d2a 100644 --- a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html +++ b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html @@ -1,12 +1,14 @@ - - + + Reporter - Created + Created Video State @@ -15,9 +17,8 @@ - - - + + @@ -31,7 +32,7 @@ {{ videoAbuse.createdAt }} - + {{ videoAbuse.video.name }} diff --git a/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html b/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html index 4f9a6c18c..a39e7639e 100644 --- a/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html +++ b/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html @@ -1,23 +1,25 @@ - Video name - Sensitive - Unfederated - Date + Video + Sensitive + Unfederated + Date - - - + + + diff --git a/client/src/app/+admin/system/jobs/jobs.component.html b/client/src/app/+admin/system/jobs/jobs.component.html index 3dd4e8a2a..e9765ca77 100644 --- a/client/src/app/+admin/system/jobs/jobs.component.html +++ b/client/src/app/+admin/system/jobs/jobs.component.html @@ -2,7 +2,7 @@
-
@@ -11,7 +11,7 @@
-
diff --git a/client/src/app/+admin/system/logs/logs.component.html b/client/src/app/+admin/system/logs/logs.component.html index 37f833020..ae1b0c601 100644 --- a/client/src/app/+admin/system/logs/logs.component.html +++ b/client/src/app/+admin/system/logs/logs.component.html @@ -1,18 +1,18 @@
-
-
-
diff --git a/client/src/app/+admin/users/user-edit/user-edit.component.html b/client/src/app/+admin/users/user-edit/user-edit.component.html index 51db100e9..5303d6096 100644 --- a/client/src/app/+admin/users/user-edit/user-edit.component.html +++ b/client/src/app/+admin/users/user-edit/user-edit.component.html @@ -139,7 +139,7 @@
@@ -155,7 +155,7 @@
diff --git a/client/src/app/+admin/users/user-edit/user-edit.ts b/client/src/app/+admin/users/user-edit/user-edit.ts index a23cd9033..18ca5805f 100644 --- a/client/src/app/+admin/users/user-edit/user-edit.ts +++ b/client/src/app/+admin/users/user-edit/user-edit.ts @@ -8,8 +8,8 @@ import { User } from '@app/shared/users/user.model' import { ScreenService } from '@app/shared/misc/screen.service' export abstract class UserEdit extends FormReactive implements OnInit { - videoQuotaOptions: { value: string, label: string }[] = [] - videoQuotaDailyOptions: { value: string, label: string }[] = [] + videoQuotaOptions: { value: string, label: string, disabled?: boolean }[] = [] + videoQuotaDailyOptions: { value: string, label: string, disabled?: boolean }[] = [] username: string user: User @@ -94,9 +94,14 @@ export abstract class UserEdit extends FormReactive implements OnInit { protected buildQuotaOptions () { // These are used by a HTML select, so convert key into strings this.videoQuotaOptions = this.configService - .videoQuotaOptions.map(q => ({ value: q.value.toString(), label: q.label })) + .videoQuotaOptions.map(q => ({ value: q.value?.toString(), label: q.label, disabled: q.disabled })) this.videoQuotaDailyOptions = this.configService - .videoQuotaDailyOptions.map(q => ({ value: q.value.toString(), label: q.label })) + .videoQuotaDailyOptions.map(q => ({ value: q.value?.toString(), label: q.label, disabled: q.disabled })) + + console.log( + this.videoQuotaOptions, + this.videoQuotaDailyOptions + ) } } diff --git a/client/src/app/+admin/users/user-list/user-list.component.html b/client/src/app/+admin/users/user-list/user-list.component.html index 249883efc..15bdb6398 100644 --- a/client/src/app/+admin/users/user-list/user-list.component.html +++ b/client/src/app/+admin/users/user-list/user-list.component.html @@ -11,6 +11,8 @@ [value]="users" [lazy]="true" [paginator]="true" [totalRecords]="totalRecords" [rows]="rowsPerPage" [sortField]="sort.field" [sortOrder]="sort.order" (onLazyLoad)="loadLazy($event)" dataKey="id" [(selection)]="selectedUsers" + [showCurrentPageReport]="true" i18n-currentPageReportTemplate + currentPageReportTemplate="Showing {first} to {last} of {totalRecords} users" >
diff --git a/client/src/app/+admin/users/user-list/user-list.component.scss b/client/src/app/+admin/users/user-list/user-list.component.scss index 5274be01c..40f08027f 100644 --- a/client/src/app/+admin/users/user-list/user-list.component.scss +++ b/client/src/app/+admin/users/user-list/user-list.component.scss @@ -24,3 +24,8 @@ tr.banned { @include peertube-input-text(250px); } } + +p-tableCheckbox { + position: relative; + top: -2.5px; +} diff --git a/client/src/app/+my-account/my-account-blocklist/my-account-blocklist.component.html b/client/src/app/+my-account/my-account-blocklist/my-account-blocklist.component.html index a96a11f5e..8a93bc9b4 100644 --- a/client/src/app/+my-account/my-account-blocklist/my-account-blocklist.component.html +++ b/client/src/app/+my-account/my-account-blocklist/my-account-blocklist.component.html @@ -11,6 +11,7 @@ Account Muted at + diff --git a/client/src/app/+my-account/my-account-blocklist/my-account-server-blocklist.component.html b/client/src/app/+my-account/my-account-blocklist/my-account-server-blocklist.component.html index 329cfb08f..0f7ca1f85 100644 --- a/client/src/app/+my-account/my-account-blocklist/my-account-server-blocklist.component.html +++ b/client/src/app/+my-account/my-account-blocklist/my-account-server-blocklist.component.html @@ -11,7 +11,7 @@ Instance Muted at - + diff --git a/client/src/app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.html b/client/src/app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.html index a755c4d69..0dda33af2 100644 --- a/client/src/app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.html +++ b/client/src/app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.html @@ -11,6 +11,7 @@