diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-11-17 14:35:16 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-17 14:35:16 -0600 |
| commit | 6f8ccbfcdf7fd8ca651d1583a608e96b25a09e25 (patch) | |
| tree | 12b704c2db10feec59787cbeeba6fdc89d21e513 /app/views/admin/accounts | |
| parent | b006bb82afb360d64e9d2f7f12aa76d4a69a2397 (diff) | |
| parent | 94c5a11cdaebee605f379f66ab57306523b5f148 (diff) | |
Merge pull request #222 from yipdw/merge/tootsuite/master
Merge upstream (e28b33c.. 94c5a11)
Diffstat (limited to 'app/views/admin/accounts')
| -rw-r--r-- | app/views/admin/accounts/show.html.haml | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/app/views/admin/accounts/show.html.haml b/app/views/admin/accounts/show.html.haml index f49594828..ddb1cf15d 100644 --- a/app/views/admin/accounts/show.html.haml +++ b/app/views/admin/accounts/show.html.haml @@ -16,6 +16,12 @@ - if @account.local? %tr + %th= t('admin.accounts.role') + %td + = t("admin.accounts.roles.#{@account.user&.role}") + = table_link_to 'angle-double-up', t('admin.accounts.promote'), promote_admin_account_role_path(@account.id), method: :post, data: { confirm: t('admin.accounts.are_you_sure') } if can?(:promote, @account.user) + = table_link_to 'angle-double-down', t('admin.accounts.demote'), demote_admin_account_role_path(@account.id), method: :post, data: { confirm: t('admin.accounts.are_you_sure') } if can?(:demote, @account.user) + %tr %th= t('admin.accounts.email') %td = @account.user_email @@ -145,20 +151,6 @@ %th= t('admin.accounts.followers_url') %td= link_to @account.followers_url, @account.followers_url -- else - %hr - - .table-wrapper - %table.table - %tbody - %tr - %th= t('admin.accounts.role') - %td - = t("admin.accounts.roles.#{@account.user&.role}") - %td< - = table_link_to 'angle-double-up', t('admin.accounts.promote'), promote_admin_account_role_path(@account.id), method: :post, data: { confirm: t('admin.accounts.are_you_sure') } if can?(:promote, @account.user) - = table_link_to 'angle-double-down', t('admin.accounts.demote'), demote_admin_account_role_path(@account.id), method: :post, data: { confirm: t('admin.accounts.are_you_sure') } if can?(:demote, @account.user) - %hr %h3= t('admin.accounts.moderation_notes') |