diff options
| author | ThibG <thib@sitedethib.com> | 2019-08-08 09:25:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-08 09:25:00 +0200 |
| commit | aa485d6f055b93fd7a9df8b47ed96122b38af39e (patch) | |
| tree | c0a0bab3b7006e00b2a0881460d14fb7bd24c4aa /app/views/admin/domain_blocks/show.html.haml | |
| parent | 86cfa2ea6cb94c9597b9fcda034c8b4d959c5e3e (diff) | |
| parent | 9b8edbea5b3f0e7690c645502a0f1dcd22fb8737 (diff) | |
Merge pull request #1194 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/admin/domain_blocks/show.html.haml')
| -rw-r--r-- | app/views/admin/domain_blocks/show.html.haml | 12 |
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?) |