about summary refs log tree commit diff
path: root/app/views/admin/domain_blocks/index.html.haml
diff options
context:
space:
mode:
authorEffy Elden <github@effy.is>2017-04-17 01:41:33 +1000
committerGitHub <noreply@github.com>2017-04-17 01:41:33 +1000
commitacd33101c50ba0cf09c1c41616f919d37760f3f7 (patch)
tree43564c181a7f58ce7471026bd0daa099344330e8 /app/views/admin/domain_blocks/index.html.haml
parentfd81916e8625e5de39855522300eaeffd85ee13d (diff)
parent99226aba9391535a20d3cc6dba0f45e5792c73d4 (diff)
Merge branch 'master' into fix/cache_blocking
Diffstat (limited to 'app/views/admin/domain_blocks/index.html.haml')
-rw-r--r--app/views/admin/domain_blocks/index.html.haml9
1 files changed, 8 insertions, 1 deletions
diff --git a/app/views/admin/domain_blocks/index.html.haml b/app/views/admin/domain_blocks/index.html.haml
index 6f4ba9b57..da9a07bbc 100644
--- a/app/views/admin/domain_blocks/index.html.haml
+++ b/app/views/admin/domain_blocks/index.html.haml
@@ -6,12 +6,19 @@
     %tr
       %th= t('admin.domain_block.domain')
       %th= t('admin.domain_block.severity')
+      %th= t('admin.domain_block.reject_media')
+      %th
   %tbody
     - @blocks.each do |block|
       %tr
         %td
           %samp= block.domain
-        %td= block.severity
+        %td= t("admin.domain_block.severities.#{block.severity}")
+        %td
+          - if block.reject_media? || block.suspend?
+            %i.fa.fa-check
+        %td
+          = table_link_to 'undo', t('admin.domain_block.undo'), admin_domain_block_path(block)
 
 = paginate @blocks
 = link_to t('admin.domain_block.add_new'), new_admin_domain_block_path, class: 'button'