diff options
| author | Emelia Smith <ThisIsMissEm@users.noreply.github.com> | 2018-04-19 15:39:54 +0200 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2018-04-19 15:39:54 +0200 |
| commit | b9c35785e2513ff5ea33c1247eb18e48aa70fc5f (patch) | |
| tree | 8db2f14a8cb936ed5c727fdd185d5ea0cb009b5e /app | |
| parent | ba917e15f66c7848fe943e571d1ec5eeb549b59d (diff) | |
Reports: Merge contents and comment columns (#7189)
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/admin/reports/_report.html.haml | 22 | ||||
| -rw-r--r-- | app/views/admin/reports/index.html.haml | 1 |
2 files changed, 11 insertions, 12 deletions
diff --git a/app/views/admin/reports/_report.html.haml b/app/views/admin/reports/_report.html.haml index d266f4840..84db00ad5 100644 --- a/app/views/admin/reports/_report.html.haml +++ b/app/views/admin/reports/_report.html.haml @@ -5,18 +5,18 @@ = link_to report.target_account.acct, admin_account_path(report.target_account.id) %td.reporter = link_to report.account.acct, admin_account_path(report.account.id) - %td.comment - %span{ title: report.comment } + %td + %div{ title: report.comment } = truncate(report.comment, length: 30, separator: ' ') - %td.stats - - unless report.statuses.empty? - %span{ title: t('admin.accounts.statuses') } - = fa_icon('comment') - = report.statuses.count - - unless report.media_attachments.empty? - %span{ title: t('admin.accounts.media_attachments') } - = fa_icon('camera') - = report.media_attachments.count + %div + - unless report.statuses.empty? + %span{ title: t('admin.accounts.statuses') } + = fa_icon('comment') + = report.statuses.count + - unless report.media_attachments.empty? + %span{ title: t('admin.accounts.media_attachments') } + = fa_icon('camera') + = report.media_attachments.count %td - if report.assigned_account.nil? \- diff --git a/app/views/admin/reports/index.html.haml b/app/views/admin/reports/index.html.haml index 3b127c4fc..c3baaf6be 100644 --- a/app/views/admin/reports/index.html.haml +++ b/app/views/admin/reports/index.html.haml @@ -18,7 +18,6 @@ %th= t('admin.reports.id') %th= t('admin.reports.target') %th= t('admin.reports.reported_by') - %th= t('admin.reports.comment.label') %th= t('admin.reports.report_contents') %th= t('admin.reports.assigned') %th |