diff options
author | Rigel Kent <sendmemail@rigelk.eu> | 2020-07-02 16:30:33 +0200 |
---|---|---|
committer | Chocobozzz <chocobozzz@cpy.re> | 2020-08-06 15:08:58 +0200 |
commit | 71ab65d02f359000f9ca6a00f163d66d56a33955 (patch) | |
tree | 0fb0460b05b90f151a8a24f1dc3a82c6c5697546 /client/src/app/shared | |
parent | a3b5e78af3696f807e54bc4b11e559bbd9b6ba1e (diff) | |
download | PeerTube-71ab65d02f359000f9ca6a00f163d66d56a33955.tar.gz PeerTube-71ab65d02f359000f9ca6a00f163d66d56a33955.tar.zst PeerTube-71ab65d02f359000f9ca6a00f163d66d56a33955.zip |
decouple video abuse details from embed, add embed to block list details
Diffstat (limited to 'client/src/app/shared')
5 files changed, 21 insertions, 25 deletions
diff --git a/client/src/app/shared/shared-abuse-list/abuse-details.component.html b/client/src/app/shared/shared-abuse-list/abuse-details.component.html index 431fdf5aa..fb8366f4c 100644 --- a/client/src/app/shared/shared-abuse-list/abuse-details.component.html +++ b/client/src/app/shared/shared-abuse-list/abuse-details.component.html | |||
@@ -96,12 +96,8 @@ | |||
96 | <!-- report right part (video/comment details) --> | 96 | <!-- report right part (video/comment details) --> |
97 | <div class="col-4"> | 97 | <div class="col-4"> |
98 | <div *ngIf="abuse.video" class="screenratio"> | 98 | <div *ngIf="abuse.video" class="screenratio"> |
99 | <div> | 99 | <div *ngIf="abuse.video.deleted" i18n>The video was deleted</div> |
100 | <span i18n *ngIf="abuse.video.deleted">The video was deleted</span> | 100 | <div *ngIf="!abuse.video.deleted" [innerHTML]="abuse.embedHtml"></div> |
101 | <span i18n *ngIf="!abuse.video.deleted">The video was blocked</span> | ||
102 | </div> | ||
103 | |||
104 | <div *ngIf="!abuse.video.deleted && !abuse.video.blacklisted" [innerHTML]="abuse.embedHtml"></div> | ||
105 | </div> | 101 | </div> |
106 | 102 | ||
107 | <div *ngIf="abuse.comment" class="comment-html"> | 103 | <div *ngIf="abuse.comment" class="comment-html"> |
diff --git a/client/src/app/shared/shared-abuse-list/abuse-details.component.scss b/client/src/app/shared/shared-abuse-list/abuse-details.component.scss index d83eb974d..8f8f3ac2e 100644 --- a/client/src/app/shared/shared-abuse-list/abuse-details.component.scss +++ b/client/src/app/shared/shared-abuse-list/abuse-details.component.scss | |||
@@ -2,23 +2,6 @@ | |||
2 | @import 'mixins'; | 2 | @import 'mixins'; |
3 | @import 'miniature'; | 3 | @import 'miniature'; |
4 | 4 | ||
5 | .screenratio { | ||
6 | div { | ||
7 | @include miniature-thumbnail; | ||
8 | |||
9 | display: inline-flex; | ||
10 | justify-content: center; | ||
11 | align-items: center; | ||
12 | color: pvar(--inputPlaceholderColor); | ||
13 | } | ||
14 | |||
15 | @include large-screen-ratio($selector: 'div, ::ng-deep iframe') { | ||
16 | width: 100% !important; | ||
17 | height: 100% !important; | ||
18 | left: 0; | ||
19 | }; | ||
20 | } | ||
21 | |||
22 | .comment-html { | 5 | .comment-html { |
23 | background-color: #ececec; | 6 | background-color: #ececec; |
24 | padding: 10px; | 7 | padding: 10px; |
diff --git a/client/src/app/shared/shared-abuse-list/abuse-list-table.component.html b/client/src/app/shared/shared-abuse-list/abuse-list-table.component.html index d90b93fff..d8fe8b2d3 100644 --- a/client/src/app/shared/shared-abuse-list/abuse-list-table.component.html +++ b/client/src/app/shared/shared-abuse-list/abuse-list-table.component.html | |||
@@ -175,7 +175,7 @@ | |||
175 | 175 | ||
176 | <ng-template pTemplate="rowexpansion" let-abuse> | 176 | <ng-template pTemplate="rowexpansion" let-abuse> |
177 | <tr> | 177 | <tr> |
178 | <td class="expand-cell" colspan="6"> | 178 | <td class="expand-cell" colspan="8"> |
179 | <my-abuse-details [abuse]="abuse" [baseRoute]="baseRoute" [isAdminView]="isAdminView()"></my-abuse-details> | 179 | <my-abuse-details [abuse]="abuse" [baseRoute]="baseRoute" [isAdminView]="isAdminView()"></my-abuse-details> |
180 | </td> | 180 | </td> |
181 | </tr> | 181 | </tr> |
diff --git a/client/src/app/shared/shared-main/feeds/feed.component.html b/client/src/app/shared/shared-main/feeds/feed.component.html index 6b8013a9b..13883fd9b 100644 --- a/client/src/app/shared/shared-main/feeds/feed.component.html +++ b/client/src/app/shared/shared-main/feeds/feed.component.html | |||
@@ -1,6 +1,6 @@ | |||
1 | <div class="video-feed"> | 1 | <div class="video-feed"> |
2 | <my-global-icon | 2 | <my-global-icon |
3 | *ngIf="syndicationItems.length !== 0" [ngbPopover]="feedsList" [autoClose]="true" placement="left auto" | 3 | *ngIf="syndicationItems.length !== 0" [ngbPopover]="feedsList" [autoClose]="true" placement="bottom left auto" |
4 | class="icon-syndication" role="button" iconName="syndication" | 4 | class="icon-syndication" role="button" iconName="syndication" |
5 | > | 5 | > |
6 | </my-global-icon> | 6 | </my-global-icon> |
diff --git a/client/src/app/shared/shared-moderation/moderation.scss b/client/src/app/shared/shared-moderation/moderation.scss index 260346dc5..c9f0d0c42 100644 --- a/client/src/app/shared/shared-moderation/moderation.scss +++ b/client/src/app/shared/shared-moderation/moderation.scss | |||
@@ -22,6 +22,23 @@ | |||
22 | } | 22 | } |
23 | } | 23 | } |
24 | 24 | ||
25 | .screenratio { | ||
26 | div { | ||
27 | @include miniature-thumbnail; | ||
28 | |||
29 | display: inline-flex; | ||
30 | justify-content: center; | ||
31 | align-items: center; | ||
32 | color: pvar(--inputPlaceholderColor); | ||
33 | } | ||
34 | |||
35 | @include large-screen-ratio($selector: 'div, ::ng-deep iframe') { | ||
36 | width: 100% !important; | ||
37 | height: 100% !important; | ||
38 | left: 0; | ||
39 | }; | ||
40 | } | ||
41 | |||
25 | .input-group { | 42 | .input-group { |
26 | @include peertube-input-group(300px); | 43 | @include peertube-input-group(300px); |
27 | 44 | ||