From 0cdf4567c731705056b438cf632aaad014584eab Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 17 Apr 2018 13:51:14 +0200
Subject: [PATCH] Fix missing "Administered by" when timeline preview disabled
 (#7161)

---
 app/views/about/_administration.html.haml | 19 ++++++++++++++
 app/views/about/show.html.haml            | 30 ++++++-----------------
 2 files changed, 27 insertions(+), 22 deletions(-)
 create mode 100644 app/views/about/_administration.html.haml

diff --git a/app/views/about/_administration.html.haml b/app/views/about/_administration.html.haml
new file mode 100644
index 0000000000..ec5834f9cb
--- /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 12213cda29..870dafdf52 100644
--- a/app/views/about/show.html.haml
+++ b/app/views/about/show.html.haml
@@ -110,26 +110,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'
 
@@ -144,8 +125,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'