diff options
author | Rigel Kent <sendmemail@rigelk.eu> | 2020-04-13 17:03:01 +0200 |
---|---|---|
committer | Rigel Kent <sendmemail@rigelk.eu> | 2020-04-13 18:03:21 +0200 |
commit | 2bc9bd08cd121bdffbf56a0241c4decfb77bfdd5 (patch) | |
tree | 46ec5dab14adfd7e317fdc1c29d62fed89982f98 /client/src/app/+admin/moderation | |
parent | 92e4ca0d95f61994626233866c57b5b078ef9c5a (diff) | |
download | PeerTube-2bc9bd08cd121bdffbf56a0241c4decfb77bfdd5.tar.gz PeerTube-2bc9bd08cd121bdffbf56a0241c4decfb77bfdd5.tar.zst PeerTube-2bc9bd08cd121bdffbf56a0241c4decfb77bfdd5.zip |
Improving select displays, focus box-shadows for paginators, instructions for index url
Diffstat (limited to 'client/src/app/+admin/moderation')
6 files changed, 27 insertions, 17 deletions
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 @@ | |||
1 | <p-table | 1 | <p-table |
2 | [value]="blockedAccounts" [lazy]="true" [paginator]="true" [totalRecords]="totalRecords" [rows]="rowsPerPage" | 2 | [value]="blockedAccounts" [lazy]="true" [paginator]="true" [totalRecords]="totalRecords" [rows]="rowsPerPage" |
3 | [sortField]="sort.field" [sortOrder]="sort.order" (onLazyLoad)="loadLazy($event)" | 3 | [sortField]="sort.field" [sortOrder]="sort.order" (onLazyLoad)="loadLazy($event)" |
4 | [showCurrentPageReport]="true" i18n-currentPageReportTemplate | ||
5 | currentPageReportTemplate="Showing {first} to {last} of {totalRecords} muted accounts" | ||
4 | > | 6 | > |
5 | 7 | ||
6 | <ng-template pTemplate="header"> | 8 | <ng-template pTemplate="header"> |
7 | <tr> | 9 | <tr> |
8 | <th i18n>Account</th> | 10 | <th i18n>Account</th> |
9 | <th i18n pSortableColumn="createdAt">Muted at <p-sortIcon field="createdAt"></p-sortIcon></th> | 11 | <th i18n pSortableColumn="createdAt">Muted at <p-sortIcon field="createdAt"></p-sortIcon></th> |
12 | <th></th> <!-- column for action buttons --> | ||
10 | </tr> | 13 | </tr> |
11 | </ng-template> | 14 | </ng-template> |
12 | 15 | ||
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 @@ | |||
1 | <p-table | 1 | <p-table |
2 | [value]="blockedServers" [lazy]="true" [paginator]="true" [totalRecords]="totalRecords" [rows]="rowsPerPage" | 2 | [value]="blockedServers" [lazy]="true" [paginator]="true" [totalRecords]="totalRecords" [rows]="rowsPerPage" |
3 | [sortField]="sort.field" [sortOrder]="sort.order" (onLazyLoad)="loadLazy($event)" | 3 | [sortField]="sort.field" [sortOrder]="sort.order" (onLazyLoad)="loadLazy($event)" |
4 | [showCurrentPageReport]="true" i18n-currentPageReportTemplate | ||
5 | currentPageReportTemplate="Showing {first} to {last} of {totalRecords} muted instances" | ||
4 | > | 6 | > |
5 | 7 | ||
6 | <ng-template pTemplate="header"> | 8 | <ng-template pTemplate="header"> |
7 | <tr> | 9 | <tr> |
8 | <th i18n>Instance</th> | 10 | <th i18n>Instance</th> |
9 | <th i18n pSortableColumn="createdAt">Muted at <p-sortIcon field="createdAt"></p-sortIcon></th> | 11 | <th i18n pSortableColumn="createdAt">Muted at <p-sortIcon field="createdAt"></p-sortIcon></th> |
10 | <th></th> | 12 | <th></th> <!-- column for action buttons --> |
11 | </tr> | 13 | </tr> |
12 | </ng-template> | 14 | </ng-template> |
13 | 15 | ||
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 @@ | |||
8 | <div class="modal-body"> | 8 | <div class="modal-body"> |
9 | <form novalidate [formGroup]="form" (ngSubmit)="banUser()"> | 9 | <form novalidate [formGroup]="form" (ngSubmit)="banUser()"> |
10 | <div class="form-group"> | 10 | <div class="form-group"> |
11 | <textarea formControlName="moderationComment" [ngClass]="{ 'input-error': formErrors['moderationComment'] }"> | 11 | <textarea |
12 | formControlName="moderationComment" ngbAutofocus i18-placeholder placeholder="Comment this report…" | ||
13 | [ngClass]="{ 'input-error': formErrors['moderationComment'] }" class="form-control"> | ||
12 | </textarea> | 14 | </textarea> |
13 | <div *ngIf="formErrors.moderationComment" class="form-error"> | 15 | <div *ngIf="formErrors.moderationComment" class="form-error"> |
14 | {{ formErrors.moderationComment }} | 16 | {{ 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 | |||
32 | 32 | ||
33 | ngOnInit () { | 33 | ngOnInit () { |
34 | this.buildForm({ | 34 | this.buildForm({ |
35 | moderationComment: this.videoAbuseValidatorsService.VIDEO_ABUSE_REASON | 35 | moderationComment: this.videoAbuseValidatorsService.VIDEO_ABUSE_MODERATION_COMMENT |
36 | }) | 36 | }) |
37 | } | 37 | } |
38 | 38 | ||
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 @@ | |||
1 | <p-table | 1 | <p-table |
2 | [value]="videoAbuses" [lazy]="true" [paginator]="true" [totalRecords]="totalRecords" [rows]="rowsPerPage" | 2 | [value]="videoAbuses" [lazy]="true" [paginator]="true" [totalRecords]="totalRecords" [rows]="rowsPerPage" |
3 | [sortField]="sort.field" [sortOrder]="sort.order" (onLazyLoad)="loadLazy($event)" dataKey="id" | 3 | [sortField]="sort.field" [sortOrder]="sort.order" (onLazyLoad)="loadLazy($event)" dataKey="id" |
4 | [showCurrentPageReport]="true" i18n-currentPageReportTemplate | ||
5 | currentPageReportTemplate="Showing {first} to {last} of {totalRecords} reports" | ||
4 | > | 6 | > |
5 | <ng-template pTemplate="header"> | 7 | <ng-template pTemplate="header"> |
6 | <tr> | 8 | <tr> <!-- header --> |
7 | <th style="width: 40px"></th> | 9 | <th style="width: 40px;"></th> |
8 | <th i18n>Reporter</th> | 10 | <th i18n>Reporter</th> |
9 | <th i18n pSortableColumn="createdAt">Created <p-sortIcon field="createdAt"></p-sortIcon></th> | 11 | <th style="width: 200px;" i18n pSortableColumn="createdAt">Created <p-sortIcon field="createdAt"></p-sortIcon></th> |
10 | <th i18n>Video</th> | 12 | <th i18n>Video</th> |
11 | <th i18n pSortableColumn="state" style="width: 80px;">State <p-sortIcon field="state"></p-sortIcon></th> | 13 | <th i18n pSortableColumn="state" style="width: 80px;">State <p-sortIcon field="state"></p-sortIcon></th> |
12 | <th style="width: 120px;"></th> | 14 | <th style="width: 120px;"></th> |
@@ -15,9 +17,8 @@ | |||
15 | 17 | ||
16 | <ng-template pTemplate="body" let-expanded="expanded" let-videoAbuse> | 18 | <ng-template pTemplate="body" let-expanded="expanded" let-videoAbuse> |
17 | <tr> | 19 | <tr> |
18 | 20 | <td class="c-hand" [pRowToggler]="videoAbuse" i18n-ngbTooltip ngbTooltip="More information" placement="top-left" container="body"> | |
19 | <td class="expand-cell"> | 21 | <span class="expander"> |
20 | <span class="expander" i18n-ngbTooltip ngbTooltip="More information" [pRowToggler]="videoAbuse"> | ||
21 | <i [ngClass]="expanded ? 'glyphicon glyphicon-menu-down' : 'glyphicon glyphicon-menu-right'"></i> | 22 | <i [ngClass]="expanded ? 'glyphicon glyphicon-menu-down' : 'glyphicon glyphicon-menu-right'"></i> |
22 | </span> | 23 | </span> |
23 | </td> | 24 | </td> |
@@ -31,7 +32,7 @@ | |||
31 | <td>{{ videoAbuse.createdAt }}</td> | 32 | <td>{{ videoAbuse.createdAt }}</td> |
32 | 33 | ||
33 | <td> | 34 | <td> |
34 | <a [href]="getVideoUrl(videoAbuse)" i18n-title title="Go to the video" target="_blank" rel="noopener noreferrer"> | 35 | <a [href]="getVideoUrl(videoAbuse)" i18n-title title="Open video in a new tab" target="_blank" rel="noopener noreferrer"> |
35 | {{ videoAbuse.video.name }} | 36 | {{ videoAbuse.video.name }} |
36 | </a> | 37 | </a> |
37 | </td> | 38 | </td> |
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 @@ | |||
1 | <p-table | 1 | <p-table |
2 | [value]="blacklist" [lazy]="true" [paginator]="true" [totalRecords]="totalRecords" [rows]="rowsPerPage" | 2 | [value]="blacklist" [lazy]="true" [paginator]="true" [totalRecords]="totalRecords" [rows]="rowsPerPage" |
3 | [sortField]="sort.field" [sortOrder]="sort.order" (onLazyLoad)="loadLazy($event)" dataKey="id" | 3 | [sortField]="sort.field" [sortOrder]="sort.order" (onLazyLoad)="loadLazy($event)" dataKey="id" |
4 | [showCurrentPageReport]="true" i18n-currentPageReportTemplate | ||
5 | currentPageReportTemplate="Showing {first} to {last} of {totalRecords} blacklisted videos" | ||
4 | > | 6 | > |
5 | <ng-template pTemplate="header"> | 7 | <ng-template pTemplate="header"> |
6 | <tr> | 8 | <tr> |
7 | <th style="width: 40px"></th> | 9 | <th style="width: 40px"></th> |
8 | <th i18n pSortableColumn="name">Video name <p-sortIcon field="name"></p-sortIcon></th> | 10 | <th i18n pSortableColumn="name">Video <p-sortIcon field="name"></p-sortIcon></th> |
9 | <th i18n>Sensitive</th> | 11 | <th style="width: 120px;" i18n>Sensitive</th> |
10 | <th i18n>Unfederated</th> | 12 | <th style="width: 120px;" i18n>Unfederated</th> |
11 | <th i18n pSortableColumn="createdAt">Date <p-sortIcon field="createdAt"></p-sortIcon></th> | 13 | <th style="width: 200px;" i18n pSortableColumn="createdAt">Date <p-sortIcon field="createdAt"></p-sortIcon></th> |
12 | <th style="width: 120px;"></th> | 14 | <th style="width: 120px;"></th> |
13 | </tr> | 15 | </tr> |
14 | </ng-template> | 16 | </ng-template> |
15 | 17 | ||
16 | <ng-template pTemplate="body" let-videoBlacklist let-expanded="expanded"> | 18 | <ng-template pTemplate="body" let-videoBlacklist let-expanded="expanded"> |
17 | <tr> | 19 | <tr> |
18 | 20 | <td *ngIf="!videoBlacklist.reason"></td> | |
19 | <td class="expand-cell"> | 21 | <td *ngIf="videoBlacklist.reason" class="expand-cell c-hand" [pRowToggler]="videoBlacklist" i18n-ngbTooltip ngbTooltip="More information" placement="top-left" container="body"> |
20 | <span *ngIf="videoBlacklist.reason" class="expander" i18n-ngbTooltip ngbTooltip="More information" [pRowToggler]="videoBlacklist"> | 22 | <span class="expander"> |
21 | <i [ngClass]="expanded ? 'glyphicon glyphicon-menu-down' : 'glyphicon glyphicon-menu-right'"></i> | 23 | <i [ngClass]="expanded ? 'glyphicon glyphicon-menu-down' : 'glyphicon glyphicon-menu-right'"></i> |
22 | </span> | 24 | </span> |
23 | </td> | 25 | </td> |