about summary refs log tree commit diff
path: root/app/views/admin/domain_blocks/show.html.haml
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-08-07 20:20:23 +0200
committerEugen Rochko <eugen@zeonfederated.com>2019-08-07 20:20:23 +0200
commitbced70469a6c4aecdb3c71055f329a0f579eb14c (patch)
tree39028440b4ddc2e775369a41b86da5657a40c347 /app/views/admin/domain_blocks/show.html.haml
parent94c54997cf6dc3bef2af67a070a61cc10595339c (diff)
Add domain block notes (#11515)
* Add database columns for adding notes to domain blocks/restrctions

* Add admin UI to set private and public comments when blocking a domain

* Add text for private and public comments on domain blocks

* Show domain block comments in admin UI

* Add comments to the domain block undo page

* Make UnblockDomainService more robust regarding upgraded domain blocks

* Allow editing domain blocks

* Rename button from “undo domain block” to “view domain block” in account admin UI

* Change test to unsilence silenced users from upgraded blocks
Diffstat (limited to 'app/views/admin/domain_blocks/show.html.haml')
-rw-r--r--app/views/admin/domain_blocks/show.html.haml12
1 files changed, 12 insertions, 0 deletions
diff --git a/app/views/admin/domain_blocks/show.html.haml b/app/views/admin/domain_blocks/show.html.haml
index dca4dbac7..e64aaa629 100644
--- a/app/views/admin/domain_blocks/show.html.haml
+++ b/app/views/admin/domain_blocks/show.html.haml
@@ -1,6 +1,18 @@
 - content_for :page_title do
   = t('admin.domain_blocks.show.title', domain: @domain_block.domain)
 
+- if @domain_block.private_comment.present?
+  .speech-bubble
+    .speech-bubble__bubble
+      = simple_format(h(@domain_block.private_comment))
+    .speech-bubble__owner= t 'admin.instances.private_comment'
+
+- if @domain_block.public_comment.present?
+  .speech-bubble
+    .speech-bubble__bubble
+      = simple_format(h(@domain_block.public_comment))
+    .speech-bubble__owner= t 'admin.instances.public_comment'
+
 = simple_form_for @domain_block, url: admin_domain_block_path(@domain_block), method: :delete do |f|
 
   - unless (@domain_block.noop?)