about summary refs log tree commit diff
path: root/app/views/admin
diff options
context:
space:
mode:
authorJenkins <jenkins@jenkins.ninjawedding.org>2017-11-17 20:17:12 +0000
committerJenkins <jenkins@jenkins.ninjawedding.org>2017-11-17 20:17:12 +0000
commit94c5a11cdaebee605f379f66ab57306523b5f148 (patch)
treeff74cb98b87270b709dd8d67759a068933b1e475 /app/views/admin
parent45f18b8f494153fd63871d60782da992e847ec16 (diff)
parent4a2fc2d444a80050ad9ba5e83aa5e69d3148ab95 (diff)
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/views/admin')
-rw-r--r--app/views/admin/accounts/show.html.haml20
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')