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/instances/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/instances/show.html.haml')
| -rw-r--r-- | app/views/admin/instances/show.html.haml | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/app/views/admin/instances/show.html.haml b/app/views/admin/instances/show.html.haml index fbb49ba02..294c9495d 100644 --- a/app/views/admin/instances/show.html.haml +++ b/app/views/admin/instances/show.html.haml @@ -31,6 +31,18 @@ = fa_icon 'times' .dashboard__counters__label= t 'admin.instances.delivery_available' +- if @private_comment.present? + .speech-bubble + .speech-bubble__bubble + = simple_format(h(@private_comment)) + .speech-bubble__owner= t 'admin.instances.private_comment' + +- if @public_comment.present? + .speech-bubble + .speech-bubble__bubble + = simple_format(h(@public_comment)) + .speech-bubble__owner= t 'admin.instances.public_comment' + %hr.spacer/ %div{ style: 'overflow: hidden' } @@ -41,6 +53,7 @@ - if @domain_allow = link_to t('admin.domain_allows.undo'), admin_domain_allow_path(@domain_allow), class: 'button button--destructive', data: { confirm: t('admin.accounts.are_you_sure'), method: :delete } - elsif @domain_block + = link_to t('admin.domain_blocks.edit'), edit_admin_domain_block_path(@domain_block), class: 'button' = link_to t('admin.domain_blocks.undo'), admin_domain_block_path(@domain_block), class: 'button' - else = link_to t('admin.domain_blocks.add_new'), new_admin_domain_block_path(_domain: @instance.domain), class: 'button' |