Fix missing "Administered by" when timeline preview disabled (#7161)
This commit is contained in:
parent
aab5581c43
commit
07a7d5959c
19
app/views/about/_administration.html.haml
Normal file
19
app/views/about/_administration.html.haml
Normal file
@ -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'
|
@ -110,26 +110,7 @@
|
|||||||
%p= t 'about.about_mastodon_html'
|
%p= t 'about.about_mastodon_html'
|
||||||
%div.contact
|
%div.contact
|
||||||
%h3= t 'about.administered_by'
|
%h3= t 'about.administered_by'
|
||||||
|
= render 'administration'
|
||||||
.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 'features'
|
= render 'features'
|
||||||
|
|
||||||
@ -144,8 +125,13 @@
|
|||||||
- else
|
- else
|
||||||
.column-4.non-preview.landing-page__information
|
.column-4.non-preview.landing-page__information
|
||||||
.landing-page__features
|
.landing-page__features
|
||||||
%h3= t 'about.what_is_mastodon'
|
.features-list
|
||||||
%p= t 'about.about_mastodon_html'
|
%div
|
||||||
|
%h3= t 'about.what_is_mastodon'
|
||||||
|
%p= t 'about.about_mastodon_html'
|
||||||
|
%div.contact
|
||||||
|
%h3= t 'about.administered_by'
|
||||||
|
= render 'administration'
|
||||||
|
|
||||||
= render 'features'
|
= render 'features'
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user