aboutsummaryrefslogtreecommitdiffhomepage
path: root/client
diff options
context:
space:
mode:
authorRigel Kent <sendmemail@rigelk.eu>2020-04-16 14:22:27 +0200
committerRigel Kent <par@rigelk.eu>2020-05-01 16:41:02 +0200
commit68d19a0ace01cb7a3550da420d27663e2db1b98d (patch)
treefcdac5341001b9e6d15ddd0ca8239372ec2b3053 /client
parent165ee2929bc76fc7f9985ae81cc33736820c7865 (diff)
downloadPeerTube-68d19a0ace01cb7a3550da420d27663e2db1b98d.tar.gz
PeerTube-68d19a0ace01cb7a3550da420d27663e2db1b98d.tar.zst
PeerTube-68d19a0ace01cb7a3550da420d27663e2db1b98d.zip
Make sure a report doesn't get deleted upon the deletion of its video
Diffstat (limited to 'client')
-rw-r--r--client/src/app/+admin/follows/followers-list/followers-list.component.html8
-rw-r--r--client/src/app/+admin/follows/following-list/following-list.component.html8
-rw-r--r--client/src/app/+admin/follows/video-redundancies-list/video-redundancies-list.component.html6
-rw-r--r--client/src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.html4
-rw-r--r--client/src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.html4
-rw-r--r--client/src/app/+admin/moderation/moderation.component.scss17
-rw-r--r--client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html10
7 files changed, 40 insertions, 17 deletions
diff --git a/client/src/app/+admin/follows/followers-list/followers-list.component.html b/client/src/app/+admin/follows/followers-list/followers-list.component.html
index c532b5f32..7455cdf2b 100644
--- a/client/src/app/+admin/follows/followers-list/followers-list.component.html
+++ b/client/src/app/+admin/follows/followers-list/followers-list.component.html
@@ -14,10 +14,10 @@
14 <ng-template pTemplate="header"> 14 <ng-template pTemplate="header">
15 <tr> 15 <tr>
16 <th i18n>Follower handle</th> 16 <th i18n>Follower handle</th>
17 <th i18n pSortableColumn="state">State <p-sortIcon field="state"></p-sortIcon></th> 17 <th style="width: 100px;" i18n pSortableColumn="state">State <p-sortIcon field="state"></p-sortIcon></th>
18 <th i18n pSortableColumn="score">Score <p-sortIcon field="score"></p-sortIcon></th> 18 <th style="width: 100px;" i18n pSortableColumn="score">Score <p-sortIcon field="score"></p-sortIcon></th>
19 <th i18n pSortableColumn="createdAt">Created <p-sortIcon field="createdAt"></p-sortIcon></th> 19 <th style="width: 200px;" i18n pSortableColumn="createdAt">Created <p-sortIcon field="createdAt"></p-sortIcon></th>
20 <th></th> 20 <th style="width: 100px;"></th>
21 </tr> 21 </tr>
22 </ng-template> 22 </ng-template>
23 23
diff --git a/client/src/app/+admin/follows/following-list/following-list.component.html b/client/src/app/+admin/follows/following-list/following-list.component.html
index cb62d52dd..f3bb7216b 100644
--- a/client/src/app/+admin/follows/following-list/following-list.component.html
+++ b/client/src/app/+admin/follows/following-list/following-list.component.html
@@ -20,10 +20,10 @@
20 <ng-template pTemplate="header"> 20 <ng-template pTemplate="header">
21 <tr> 21 <tr>
22 <th i18n>Host</th> 22 <th i18n>Host</th>
23 <th i18n pSortableColumn="state">State <p-sortIcon field="state"></p-sortIcon></th> 23 <th style="width: 100px;" i18n pSortableColumn="state">State <p-sortIcon field="state"></p-sortIcon></th>
24 <th i18n pSortableColumn="createdAt">Created <p-sortIcon field="createdAt"></p-sortIcon></th> 24 <th style="width: 200px;" i18n pSortableColumn="createdAt">Created <p-sortIcon field="createdAt"></p-sortIcon></th>
25 <th i18n pSortableColumn="redundancyAllowed">Redundancy allowed <p-sortIcon field="redundancyAllowed"></p-sortIcon></th> 25 <th style="width: 160px;" i18n pSortableColumn="redundancyAllowed">Redundancy allowed <p-sortIcon field="redundancyAllowed"></p-sortIcon></th>
26 <th></th> 26 <th style="width: 100px;"></th>
27 </tr> 27 </tr>
28 </ng-template> 28 </ng-template>
29 29
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 07362b3b9..a8dcc69d2 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
@@ -17,11 +17,11 @@
17> 17>
18 <ng-template pTemplate="header"> 18 <ng-template pTemplate="header">
19 <tr> 19 <tr>
20 <th style="width: 40px"></th> 20 <th style="width: 40px;"></th>
21 <th i18n *ngIf="isDisplayingRemoteVideos()">Strategy</th> 21 <th style="width: 160px;" i18n *ngIf="isDisplayingRemoteVideos()">Strategy</th>
22 <th i18n pSortableColumn="name">Video name <p-sortIcon field="name"></p-sortIcon></th> 22 <th i18n pSortableColumn="name">Video name <p-sortIcon field="name"></p-sortIcon></th>
23 <th i18n>Video URL</th> 23 <th i18n>Video URL</th>
24 <th i18n *ngIf="isDisplayingRemoteVideos()">Total size</th> 24 <th style="width: 100px;" i18n *ngIf="isDisplayingRemoteVideos()">Total size</th>
25 <th style="width: 80px;"></th> 25 <th style="width: 80px;"></th>
26 </tr> 26 </tr>
27 </ng-template> 27 </ng-template>
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 2efdd2bc3..e40c29abf 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
@@ -8,8 +8,8 @@
8 <ng-template pTemplate="header"> 8 <ng-template pTemplate="header">
9 <tr> 9 <tr>
10 <th i18n>Account</th> 10 <th i18n>Account</th>
11 <th i18n pSortableColumn="createdAt">Muted at <p-sortIcon field="createdAt"></p-sortIcon></th> 11 <th style="width: 200px;" i18n pSortableColumn="createdAt">Muted at <p-sortIcon field="createdAt"></p-sortIcon></th>
12 <th></th> <!-- column for action buttons --> 12 <th style="width: 100px;"></th> <!-- column for action buttons -->
13 </tr> 13 </tr>
14 </ng-template> 14 </ng-template>
15 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 cec703289..bf5c00918 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
@@ -16,8 +16,8 @@
16 <ng-template pTemplate="header"> 16 <ng-template pTemplate="header">
17 <tr> 17 <tr>
18 <th i18n>Instance</th> 18 <th i18n>Instance</th>
19 <th i18n pSortableColumn="createdAt">Muted at <p-sortIcon field="createdAt"></p-sortIcon></th> 19 <th style="width: 200px;" i18n pSortableColumn="createdAt">Muted at <p-sortIcon field="createdAt"></p-sortIcon></th>
20 <th></th> <!-- column for action buttons --> 20 <th style="width: 100px;"></th> <!-- column for action buttons -->
21 </tr> 21 </tr>
22 </ng-template> 22 </ng-template>
23 23
diff --git a/client/src/app/+admin/moderation/moderation.component.scss b/client/src/app/+admin/moderation/moderation.component.scss
index 89e9b47d3..9af76d2dd 100644
--- a/client/src/app/+admin/moderation/moderation.component.scss
+++ b/client/src/app/+admin/moderation/moderation.component.scss
@@ -1,5 +1,6 @@
1@import 'variables'; 1@import 'variables';
2@import 'mixins'; 2@import 'mixins';
3@import 'miniature';
3 4
4.form-sub-title { 5.form-sub-title {
5 flex-grow: 0; 6 flex-grow: 0;
@@ -22,12 +23,28 @@
22 } 23 }
23} 24}
24 25
26.video-abuse-states {
27 & > :not(:first-child) {
28 margin-left: .4rem;
29 }
30}
31
25.screenratio { 32.screenratio {
26 position: relative; 33 position: relative;
27 width: 100%; 34 width: 100%;
28 height: 0; 35 height: 0;
29 padding-bottom: 56%; 36 padding-bottom: 56%;
30 37
38 div {
39 @include miniature-thumbnail;
40 position: absolute;
41 height: 100%;
42 width: 100%;
43 display: inline-flex;
44 justify-content: center;
45 align-items: center;
46 }
47
31 ::ng-deep iframe { 48 ::ng-deep iframe {
32 position: absolute; 49 position: absolute;
33 width: 100% !important; 50 width: 100% !important;
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 4ecb395f8..3d356dc7c 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
@@ -48,9 +48,10 @@
48 </a> 48 </a>
49 </td> 49 </td>
50 50
51 <td class="c-hand" [pRowToggler]="videoAbuse"> 51 <td class="c-hand video-abuse-states" [pRowToggler]="videoAbuse">
52 <span *ngIf="isVideoAbuseAccepted(videoAbuse)" [title]="videoAbuse.state.label" class="glyphicon glyphicon-ok"></span> 52 <span *ngIf="isVideoAbuseAccepted(videoAbuse)" [title]="videoAbuse.state.label" class="glyphicon glyphicon-ok"></span>
53 <span *ngIf="isVideoAbuseRejected(videoAbuse)" [title]="videoAbuse.state.label" class="glyphicon glyphicon-remove"></span> 53 <span *ngIf="isVideoAbuseRejected(videoAbuse)" [title]="videoAbuse.state.label" class="glyphicon glyphicon-remove"></span>
54 <span *ngIf="videoAbuse.moderationComment" [title]="videoAbuse.moderationComment" class="glyphicon glyphicon-comment"></span>
54 </td> 55 </td>
55 56
56 <td class="action-cell"> 57 <td class="action-cell">
@@ -75,7 +76,12 @@
75 </div> 76 </div>
76 77
77 <div class="col-4"> 78 <div class="col-4">
78 <div class="screenratio" [innerHTML]="videoAbuse.embedHtml"></div> 79 <div class="screenratio">
80 <div *ngIf="videoAbuse.video.deleted">
81 <span i18n>The video was {{ videoAbuse.video.deleted ? 'deleted' : 'blacklisted' }}</span>
82 </div>
83 <div *ngIf="!videoAbuse.video.deleted" [innerHTML]="videoAbuse.embedHtml"></div>
84 </div>
79 </div> 85 </div>
80 </div> 86 </div>
81 </td> 87 </td>