diff options
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/about/_administration.html.haml | 19 | ||||
| -rw-r--r-- | app/views/about/show.html.haml | 30 | ||||
| -rw-r--r-- | app/views/accounts/_header.html.haml | 4 | ||||
| -rw-r--r-- | app/views/admin/accounts/_card.html.haml | 17 | ||||
| -rw-r--r-- | app/views/admin/reports/_account_details.html.haml | 20 | ||||
| -rw-r--r-- | app/views/admin/reports/show.html.haml | 4 | ||||
| -rw-r--r-- | app/views/invites/_invite.html.haml | 2 |
7 files changed, 52 insertions, 44 deletions
diff --git a/app/views/about/_administration.html.haml b/app/views/about/_administration.html.haml new file mode 100644 index 000000000..ec5834f9c --- /dev/null +++ b/app/views/about/_administration.html.haml @@ -0,0 +1,19 @@ +.account + .account__wrapper + - if @instance_presenter.contact_account + = link_to TagManager.instance.url_for(@instance_presenter.contact_account), class: 'account__display-name' do + .account__avatar-wrapper + .account__avatar{ style: "background-image: url(#{@instance_presenter.contact_account.avatar.url})" } + %span.display-name + %bdi + %strong.display-name__html.emojify= display_name(@instance_presenter.contact_account) + %span.display-name__account @#{@instance_presenter.contact_account.acct} + - else + .account__display-name + .account__avatar-wrapper + .account__avatar{ style: "background-image: url(#{full_asset_url('avatars/original/missing.png', skip_pipeline: true)})" } + %span.display-name + %strong= t 'about.contact_missing' + %span.display-name__account= t 'about.contact_unavailable' + + = link_to t('about.learn_more'), about_more_path, class: 'button button-alternative' diff --git a/app/views/about/show.html.haml b/app/views/about/show.html.haml index 674771cbc..e264c8574 100644 --- a/app/views/about/show.html.haml +++ b/app/views/about/show.html.haml @@ -109,26 +109,7 @@ %p= t 'about.about_mastodon_html' %div.contact %h3= t 'about.administered_by' - - .account - .account__wrapper - - if @instance_presenter.contact_account - = link_to TagManager.instance.url_for(@instance_presenter.contact_account), class: 'account__display-name' do - .account__avatar-wrapper - .account__avatar{ style: "background-image: url(#{@instance_presenter.contact_account.avatar.url})" } - %span.display-name - %bdi - %strong.display-name__html.emojify= display_name(@instance_presenter.contact_account) - %span.display-name__account @#{@instance_presenter.contact_account.acct} - - else - .account__display-name - .account__avatar-wrapper - .account__avatar{ style: "background-image: url(#{full_asset_url('avatars/original/missing.png', skip_pipeline: true)})" } - %span.display-name - %strong= t 'about.contact_missing' - %span.display-name__account= t 'about.contact_unavailable' - - = link_to t('about.learn_more'), about_more_path, class: 'button button-alternative' + = render 'administration' = render 'features' @@ -143,8 +124,13 @@ - else .column-4.non-preview.landing-page__information .landing-page__features - %h3= t 'about.what_is_mastodon' - %p= t 'about.about_mastodon_html' + .features-list + %div + %h3= t 'about.what_is_mastodon' + %p= t 'about.about_mastodon_html' + %div.contact + %h3= t 'about.administered_by' + = render 'administration' = render 'features' diff --git a/app/views/accounts/_header.html.haml b/app/views/accounts/_header.html.haml index 617443e84..76f29d591 100644 --- a/app/views/accounts/_header.html.haml +++ b/app/views/accounts/_header.html.haml @@ -7,8 +7,8 @@ .card__bio %h1.name %span.p-name.emojify= display_name(account) - %small - %span @#{account.local_username_and_domain} + %small< + %span>< @#{account.local_username_and_domain} = fa_icon('lock') if account.locked? - if Setting.show_staff_badge - if account.user_admin? diff --git a/app/views/admin/accounts/_card.html.haml b/app/views/admin/accounts/_card.html.haml deleted file mode 100644 index 2f5955011..000000000 --- a/app/views/admin/accounts/_card.html.haml +++ /dev/null @@ -1,17 +0,0 @@ -.table-wrapper - %table.table - %tbody - %tr - %td= t('admin.accounts.show.created_reports') - %td= link_to pluralize(account.reports.count, t('admin.accounts.show.report')), admin_reports_path(account_id: account.id) - %tr - %td= t('admin.accounts.show.targeted_reports') - %td= link_to pluralize(account.targeted_reports.count, t('admin.accounts.show.report')), admin_reports_path(target_account_id: account.id) - - if account.silenced? || account.suspended? - %tr - %td= t('admin.accounts.moderation.title') - %td - - if account.silenced? - %p= t('admin.accounts.moderation.silenced') - - if account.suspended? - %p= t('admin.accounts.moderation.suspended') diff --git a/app/views/admin/reports/_account_details.html.haml b/app/views/admin/reports/_account_details.html.haml new file mode 100644 index 000000000..a8af39bef --- /dev/null +++ b/app/views/admin/reports/_account_details.html.haml @@ -0,0 +1,20 @@ +.table-wrapper + %table.table + %tbody + %tr + %td= t('admin.reports.account.created_reports') + %td= link_to pluralize(account.reports.count, t('admin.reports.account.report')), admin_reports_path(account_id: account.id) + %tr + %td= t('admin.reports.account.targeted_reports') + %td= link_to pluralize(account.targeted_reports.count, t('admin.reports.account.report')), admin_reports_path(target_account_id: account.id) + %tr + %td= t('admin.reports.account.moderation_notes') + %td= link_to pluralize(account.targeted_moderation_notes.count, t('admin.reports.account.note')), admin_reports_path(target_account_id: account.id) + - if account.silenced? || account.suspended? + %tr + %td= t('admin.reports.account.moderation.title') + %td + - if account.silenced? + %p= t('admin.reports.account.moderation.silenced') + - if account.suspended? + %p= t('admin.reports.account.moderation.suspended') diff --git a/app/views/admin/reports/show.html.haml b/app/views/admin/reports/show.html.haml index a0c1ca283..60a8cab8e 100644 --- a/app/views/admin/reports/show.html.haml +++ b/app/views/admin/reports/show.html.haml @@ -57,11 +57,11 @@ .report-accounts__item %h3= t('admin.reports.reported_account') = render 'authorize_follows/card', account: @report.target_account, admin: true - = render 'admin/accounts/card', account: @report.target_account + = render 'admin/reports/account_details', account: @report.target_account .report-accounts__item %h3= t('admin.reports.reported_by') = render 'authorize_follows/card', account: @report.account, admin: true - = render 'admin/accounts/card', account: @report.account + = render 'admin/reports/account_details', account: @report.account %h3= t('admin.reports.comment.label') diff --git a/app/views/invites/_invite.html.haml b/app/views/invites/_invite.html.haml index 81d67eb7d..1c7ec311d 100644 --- a/app/views/invites/_invite.html.haml +++ b/app/views/invites/_invite.html.haml @@ -13,5 +13,5 @@ = l invite.expires_at %td= table_link_to 'link', public_invite_url(invite_code: invite.code), public_invite_url(invite_code: invite.code) %td - - if invite.expired? && policy(invite).destroy? + - if !invite.expired? && policy(invite).destroy? = table_link_to 'times', t('invites.delete'), invite_path(invite), method: :delete |