gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'parent/main' into upstream-20240424

Browse source
This commit is contained in:
KMY 2024-04-24 08:57:07 +09:00
commit 32a8f367a3
91 changed files with 1073 additions and 446 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/views/admin/accounts/_remote_account.html.haml
View file

@ -2,14 +2,14 @@
%th= t('admin.accounts.inbox_url')
%td
= account.inbox_url
= fa_icon DeliveryFailureTracker.available?(account.inbox_url) ? 'check' : 'times'
= material_symbol DeliveryFailureTracker.available?(account.inbox_url) ? 'check' : 'close'
%td
= table_link_to 'search', domain_block.present? ? t('admin.domain_blocks.view') : t('admin.accounts.view_domain'), admin_instance_path(account.domain)
%tr
%th= t('admin.accounts.shared_inbox_url')
%td
= account.shared_inbox_url
= fa_icon DeliveryFailureTracker.available?(account.shared_inbox_url) ? 'check' : 'times'
= material_symbol DeliveryFailureTracker.available?(account.shared_inbox_url) ? 'check' : 'close'
%td
- if domain_block.nil?
= table_link_to 'ban', t('admin.domain_blocks.add_new'), new_admin_domain_block_path(_domain: account.domain)

12
app/views/admin/accounts/index.html.haml
View file

@ -53,38 +53,38 @@
= check_box_tag :batch_checkbox_all, nil, false
.batch-table__toolbar__actions
- if @accounts.any?(&:user_pending?)
= f.button safe_join([fa_icon('check'), t('admin.accounts.approve')]),
= f.button safe_join([material_symbol('check'), t('admin.accounts.approve')]),
class: 'table-action-link',
data: { confirm: t('admin.reports.are_you_sure') },
name: :approve,
type: :submit
= f.button safe_join([fa_icon('times'), t('admin.accounts.reject')]),
= f.button safe_join([material_symbol('close'), t('admin.accounts.reject')]),
class: 'table-action-link',
data: { confirm: t('admin.reports.are_you_sure') },
name: :reject,
type: :submit
- elsif @accounts.any?(&:remote_pending)
= f.button safe_join([fa_icon('check'), t('admin.accounts.approve')]),
= f.button safe_join([material_symbol('check'), t('admin.accounts.approve')]),
class: 'table-action-link',
data: { confirm: t('admin.reports.are_you_sure') },
name: :approve_remote,
type: :submit
= f.button safe_join([fa_icon('check'), t('admin.accounts.approve_domain')]),
= f.button safe_join([material_symbol('check'), t('admin.accounts.approve_domain')]),
class: 'table-action-link',
data: { confirm: t('admin.reports.are_you_sure') },
name: :approve_remote_domain,
type: :submit
= f.button safe_join([fa_icon('times'), t('admin.accounts.reject')]),
= f.button safe_join([material_symbol('times'), t('admin.accounts.reject')]),
class: 'table-action-link',
data: { confirm: t('admin.reports.are_you_sure') },
name: :reject_remote,
type: :submit
= f.button safe_join([fa_icon('lock'), t('admin.accounts.perform_full_suspension')]),
= f.button safe_join([material_symbol('lock'), t('admin.accounts.perform_full_suspension')]),
class: 'table-action-link',
data: { confirm: t('admin.reports.are_you_sure') },
name: :suspend,

2
app/views/admin/accounts/show.html.haml
View file

@ -20,7 +20,7 @@
%dd{ title: field.value, class: custom_field_classes(field) }
- if field.verified?
%span.verified__mark{ title: t('accounts.link_verified_on', date: l(field.verified_at)) }
= fa_icon 'check'
= material_symbol 'check'
= prerender_custom_emojis(account_field_value_format(field, with_rel_me: false), account.emojis)
- if account.note.present?