treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Show comments in the admin/instances page (#29240) 

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
main-rebase-security-fix
Jeong Arm 2024-02-28 21:07:06 +09:00 committed by GitHub
parent edfc53856f
commit deffb8ecb6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/javascript/styles/mastodon/admin.scss
View File

@ -324,6 +324,23 @@ $content-width: 840px;
padding-bottom: 0;
margin-bottom: 0;
border-bottom: 0;
.comment {
display: block;
overflow: hidden;
text-overflow: ellipsis;
margin-top: 4px;
&.private-comment {
display: block;
color: $darker-text-color;
}
&.public-comment {
display: block;
color: $secondary-text-color;
}
}
}
& > p {

4
app/views/admin/instances/_instance.html.haml
View File

@ -7,6 +7,10 @@
%small
- if instance.domain_block
= instance.domain_block.policies.map { |policy| t(policy, scope: 'admin.instances.content_policies.policies') }.join(' · ')
- if instance.domain_block.public_comment.present?
%span.comment.public-comment #{t('admin.domain_blocks.public_comment')}: #{instance.domain_block.public_comment}
- if instance.domain_block.private_comment.present?
%span.comment.private-comment #{t('admin.domain_blocks.private_comment')}: #{instance.domain_block.private_comment}
- elsif instance.domain_allow
= t('admin.accounts.whitelisted')
- else