about summary refs log tree commit diff
path: root/app/views
diff options
context:
space:
mode:
authorAsh Furrow <ash@ashfurrow.com>2017-04-23 04:43:42 +0200
committerEugen <eugen@zeonfederated.com>2017-04-23 04:43:42 +0200
commit723f25a9999251b0c3f45c57aa88afa83f315b2d (patch)
tree9b25ee6b6dd7519a95302bbab57149b3263e083d /app/views
parent59b1de0bcf39473106e5380c129d7436be1ad89a (diff)
Admin UI for confirming users (#2245)
* Shows confirmed status in list.

* Adds ability to confirm users in admin UI.

* Added new english translations.

* Addresses feedback from #2245.

* More feedback.
Diffstat (limited to 'app/views')
-rw-r--r--app/views/admin/accounts/index.html.haml7
-rw-r--r--app/views/admin/accounts/show.html.haml3
2 files changed, 10 insertions, 0 deletions
diff --git a/app/views/admin/accounts/index.html.haml b/app/views/admin/accounts/index.html.haml
index bd1eb7ecd..c52b3ff74 100644
--- a/app/views/admin/accounts/index.html.haml
+++ b/app/views/admin/accounts/index.html.haml
@@ -25,6 +25,7 @@
     %tr
       %th= t('admin.accounts.username')
       %th= t('admin.accounts.domain')
+      %th= t('admin.accounts.confirmed')
       %th= fa_icon 'paper-plane-o'
       %th
   %tbody
@@ -36,6 +37,12 @@
             = link_to account.domain, admin_accounts_path(by_domain: account.domain)
         %td
           - if account.local?
+            - if account.user.present? && account.user.confirmed?
+              %i.fa.fa-check
+            - else 
+              %i.fa.fa-times
+        %td
+          - if account.local?
             = t('admin.accounts.location.local')
           - elsif account.subscribed?
             %i.fa.fa-check
diff --git a/app/views/admin/accounts/show.html.haml b/app/views/admin/accounts/show.html.haml
index 75b69b337..5dc3067cd 100644
--- a/app/views/admin/accounts/show.html.haml
+++ b/app/views/admin/accounts/show.html.haml
@@ -77,6 +77,9 @@
   - else
     = link_to t('admin.accounts.silence'), admin_account_silence_path(@account.id), method: :post, class: 'button'
 
+  - unless @account.user.confirmed?
+    = link_to t('admin.accounts.confirm'), admin_account_confirmation_path(@account.id), method: :post, class: 'button'
+
   - if @account.suspended?
     = link_to t('admin.accounts.undo_suspension'), admin_account_suspension_path(@account.id), method: :delete, class: 'button'
   - else