diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2017-10-19 19:38:20 -0400 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2017-10-19 19:38:20 -0400 |
| commit | 587c612540b5473e14e91e849b209fb405965298 (patch) | |
| tree | ffb502c553fd26b4aff91136abbe552a21bbf404 | |
| parent | bd39b441a1525b5cbc9b69170b3d0748c51dd851 (diff) | |
| download | gitlab-ce-587c612540b5473e14e91e849b209fb405965298.tar.gz | |
Fix abuse page.
| -rw-r--r-- | app/views/abuse_reports/new.html.haml | 2 | ||||
| -rw-r--r-- | app/views/admin/abuse_reports/_abuse_report.html.haml | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/app/views/abuse_reports/new.html.haml b/app/views/abuse_reports/new.html.haml index 06be1a53318..204e1237c9f 100644 --- a/app/views/abuse_reports/new.html.haml +++ b/app/views/abuse_reports/new.html.haml @@ -19,4 +19,4 @@ Explain the problem with this user. If appropriate, provide a link to the relevant issue or comment. .form-actions - = f.submit "Send report", class: "btn btn-create" + = f.submit "Send report", class: "btn btn-success" diff --git a/app/views/admin/abuse_reports/_abuse_report.html.haml b/app/views/admin/abuse_reports/_abuse_report.html.haml index 18c6c559049..522f272daec 100644 --- a/app/views/admin/abuse_reports/_abuse_report.html.haml +++ b/app/views/admin/abuse_reports/_abuse_report.html.haml @@ -24,11 +24,11 @@ = markdown_field(abuse_report, :message) %td - if user - = link_to 'Remove user & report', admin_abuse_report_path(abuse_report, remove_user: true), - data: { confirm: "USER #{user.name} WILL BE REMOVED! Are you sure?" }, remote: true, method: :delete, class: "btn btn-sm btn-block btn-remove js-remove-tr" + = link_to 'Remove & report', admin_abuse_report_path(abuse_report, remove_user: true), + data: { confirm: "#{user.name} will be removed! Are you sure you want to remove this user?" }, remote: true, method: :delete, class: "btn btn-block btn-danger js-remove-tr" - if user && !user.blocked? - = link_to 'Block user', block_admin_user_path(user), data: {confirm: 'USER WILL BE BLOCKED! Are you sure?'}, method: :put, class: "btn btn-sm btn-block" + = link_to 'Block user', block_admin_user_path(user), data: {confirm: 'USER WILL BE BLOCKED! Are you sure?'}, method: :put, class: "btn btn-default btn-block" - else - .btn.btn-sm.disabled.btn-block + .btn.btn-default.disabled.btn-block Already blocked - = link_to 'Remove report', [:admin, abuse_report], remote: true, method: :delete, class: "btn btn-sm btn-block btn-close js-remove-tr" + = link_to 'Remove report', [:admin, abuse_report], remote: true, method: :delete, class: "btn btn-default btn-block js-remove-tr" |