diff options
author | Felix Ableitner <me@nutomic.com> | 2018-08-28 02:06:00 -0500 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-08-28 09:06:00 +0200 |
commit | 83b5fe9c5536ed11ef90bf821d38700607f39f82 (patch) | |
tree | 5237a56aaf279e9ce21f7769903e565e39485f2d /client/src/app/+admin/moderation/video-blacklist-list | |
parent | bee0abffff73804d816b90c7fd599e0a51c09d61 (diff) | |
download | PeerTube-83b5fe9c5536ed11ef90bf821d38700607f39f82.tar.gz PeerTube-83b5fe9c5536ed11ef90bf821d38700607f39f82.tar.zst PeerTube-83b5fe9c5536ed11ef90bf821d38700607f39f82.zip |
Display report reason in multiple lines (#957)
* Display report reason in multiple lines
* more adjustments:
- move report reason into dropdown
- allow line wrap in dropdown (also in video blacklist)
- fix colspan in blacklist dropdown
- merge css rules into moderation.component.scss
* use min-width for labels
Diffstat (limited to 'client/src/app/+admin/moderation/video-blacklist-list')
3 files changed, 5 insertions, 11 deletions
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 dafaeb1e2..0585e0490 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 | |||
@@ -36,10 +36,10 @@ | |||
36 | </ng-template> | 36 | </ng-template> |
37 | 37 | ||
38 | <ng-template pTemplate="rowexpansion" let-videoBlacklist> | 38 | <ng-template pTemplate="rowexpansion" let-videoBlacklist> |
39 | <tr class="blacklist-reason"> | 39 | <tr> |
40 | <td colspan="7"> | 40 | <td class="moderation-expanded" colspan="5"> |
41 | <span i18n class="blacklist-reason-label">Blacklist reason:</span> | 41 | <span i18n class="moderation-expanded-label">Blacklist reason:</span> |
42 | {{ videoBlacklist.reason }} | 42 | <span class="moderation-expanded-text">{{ videoBlacklist.reason }}</span> |
43 | </td> | 43 | </td> |
44 | </tr> | 44 | </tr> |
45 | </ng-template> | 45 | </ng-template> |
diff --git a/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.scss b/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.scss deleted file mode 100644 index 063f6324e..000000000 --- a/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.scss +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | @import 'variables'; | ||
2 | @import 'mixins'; | ||
3 | |||
4 | .blacklist-reason-label { | ||
5 | font-weight: $font-semibold; | ||
6 | } \ No newline at end of file | ||
diff --git a/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts b/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts index 9890d1f90..bb051d00f 100644 --- a/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts +++ b/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts | |||
@@ -11,7 +11,7 @@ import { Video } from '../../../shared/video/video.model' | |||
11 | @Component({ | 11 | @Component({ |
12 | selector: 'my-video-blacklist-list', | 12 | selector: 'my-video-blacklist-list', |
13 | templateUrl: './video-blacklist-list.component.html', | 13 | templateUrl: './video-blacklist-list.component.html', |
14 | styleUrls: [ './video-blacklist-list.component.scss' ] | 14 | styleUrls: [ '../moderation.component.scss' ] |
15 | }) | 15 | }) |
16 | export class VideoBlacklistListComponent extends RestTable implements OnInit { | 16 | export class VideoBlacklistListComponent extends RestTable implements OnInit { |
17 | blacklist: VideoBlacklist[] = [] | 17 | blacklist: VideoBlacklist[] = [] |