diff options
author | Robert Speicher <rspeicher@gmail.com> | 2016-01-04 18:35:05 -0500 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2016-01-04 18:36:38 -0500 |
commit | b807a23b4b8fdf1deff120bc9c0bb762991cef3d (patch) | |
tree | d6044f7c31151fdef6dbab3b239628e53f451bb5 | |
parent | 6f4ea679d9ac18509df9216cef14f5d74ad19212 (diff) | |
download | gitlab-ce-b807a23b4b8fdf1deff120bc9c0bb762991cef3d.tar.gz |
Redesign the AbuseReports indexrs-abuse-reports
- Shows when the reported user joined
- Show relative timestamp for when the report was created
- Parse message with restricted Markdown pipeline to autolink URLs
-rw-r--r-- | app/views/admin/abuse_reports/_abuse_report.html.haml | 18 | ||||
-rw-r--r-- | app/views/admin/abuse_reports/index.html.haml | 3 |
2 files changed, 11 insertions, 10 deletions
diff --git a/app/views/admin/abuse_reports/_abuse_report.html.haml b/app/views/admin/abuse_reports/_abuse_report.html.haml index d3afc658cd6..cf50a376e11 100644 --- a/app/views/admin/abuse_reports/_abuse_report.html.haml +++ b/app/views/admin/abuse_reports/_abuse_report.html.haml @@ -2,19 +2,21 @@ - user = abuse_report.user %tr %td - - if reporter - = link_to reporter.name, reporter + - if user + = link_to user.name, [:admin, user] + .light.small + Joined #{time_ago_with_tooltip(user.created_at)} - else (removed) %td - = abuse_report.created_at.to_s(:short) - %td - = abuse_report.message - %td - - if user - = link_to user.name, user + - if reporter + = link_to reporter.name, [:admin, reporter] - else (removed) + .light.small + = time_ago_with_tooltip(abuse_report.created_at) + %td + = markdown(abuse_report.message.squish!, pipeline: :single_line) %td - if user = link_to 'Remove user & report', admin_abuse_report_path(abuse_report, remove_user: true), diff --git a/app/views/admin/abuse_reports/index.html.haml b/app/views/admin/abuse_reports/index.html.haml index 40a5fe4628b..bc4a9cedb2c 100644 --- a/app/views/admin/abuse_reports/index.html.haml +++ b/app/views/admin/abuse_reports/index.html.haml @@ -6,10 +6,9 @@ %table.table %thead %tr + %th User %th Reported by - %th Reported at %th Message - %th User %th Primary action %th = render @abuse_reports |