diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-06-08 14:58:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-08 14:58:22 +0200 |
| commit | 8902e265b4efea68cafef790ee0e2870f62985cd (patch) | |
| tree | e52d74efc1074e800ed31b188bfd66962b814ee1 /app/views | |
| parent | b8ea28d6d0bd5701cf35d6f633b0aa36ceb5ca9c (diff) | |
Add explit admin actions to (re)subscribe/unsubscribe remote accounts (#3640)
* Add explit admin actions to (re)subscribe/unsubscribe remote accounts and re-download avatar/header * Improve how admin NSFW toggle looks
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/admin/accounts/show.html.haml | 10 | ||||
| -rw-r--r-- | app/views/admin/reports/show.html.haml | 4 |
2 files changed, 10 insertions, 4 deletions
diff --git a/app/views/admin/accounts/show.html.haml b/app/views/admin/accounts/show.html.haml index 1a9bd2c48..d91ba9c78 100644 --- a/app/views/admin/accounts/show.html.haml +++ b/app/views/admin/accounts/show.html.haml @@ -67,11 +67,17 @@ %th= t('.targeted_reports') %td= link_to pluralize(@account.targeted_reports.count, t('.report')), admin_reports_path(target_account_id: @account.id) -- if @account.local? - %div{ style: 'float: right' } + +%div{ style: 'float: right' } + - if @account.local? = link_to t('admin.accounts.reset_password'), admin_account_reset_path(@account.id), method: :create, class: 'button' - if @account.user&.otp_required_for_login? = link_to t('admin.accounts.disable_two_factor_authentication'), admin_user_two_factor_authentication_path(@account.user.id), method: :delete, class: 'button' + - else + = link_to @account.subscribed? ? t('admin.accounts.resubscribe') : t('admin.accounts.subscribe'), subscribe_admin_account_path(@account.id), method: :post, class: 'button' + - if @account.subscribed? + = link_to t('admin.accounts.unsubscribe'), unsubscribe_admin_account_path(@account.id), method: :post, class: 'button negative' + = link_to t('admin.accounts.redownload'), redownload_admin_account_path(@account.id), method: :post, class: 'button' %div{ style: 'float: left' } - if @account.silenced? diff --git a/app/views/admin/reports/show.html.haml b/app/views/admin/reports/show.html.haml index 560031079..7db5927ab 100644 --- a/app/views/admin/reports/show.html.haml +++ b/app/views/admin/reports/show.html.haml @@ -25,8 +25,8 @@ .entry= render partial: 'stream_entries/simple_status', locals: { status: status } .report-status__actions - unless status.media_attachments.empty? - = link_to admin_report_reported_status_path(@report, status, status: { sensitive: !status.sensitive }), method: :patch, class: 'nsfw-button', title: t("admin.reports.nsfw.#{!status.sensitive}") do - = t("admin.reports.nsfw.#{!status.sensitive}") + = link_to admin_report_reported_status_path(@report, status, status: { sensitive: !status.sensitive }), method: :patch, class: 'icon-button nsfw-button', title: t("admin.reports.nsfw.#{!status.sensitive}") do + = fa_icon status.sensitive? ? 'eye' : 'eye-slash' = link_to admin_report_reported_status_path(@report, status), method: :delete, class: 'icon-button trash-button', title: t('admin.reports.delete'), data: { confirm: t('admin.reports.are_you_sure') } do = fa_icon 'trash' |