Redesign /terms page (#4338)

* Redesign /terms page

* Fix tests

* Remove unused keys

4 files changed, 21 insertions, 22 deletions

diff --git a/app/views/about/_contact.html.haml b/app/views/about/_contact.html.haml
index 4394aebdd..822639962 100644
--- a/app/views/about/_contact.html.haml
+++ b/app/views/about/_contact.html.haml
@@ -13,7 +13,7 @@
             %span.username @#{contact.contact_account.acct}
     - else
       .owner
-        .avatar= image_tag full_asset_url('avatars/original/missing.png')
+        .avatar= image_tag full_asset_url('avatars/original/missing.png', skip_pipeline: true)
         .name
           %span.display_name= t 'about.contact_missing'
           %span.username= t 'about.contact_unavailable'
diff --git a/app/views/about/_links.html.haml b/app/views/about/_links.html.haml
deleted file mode 100644
index fb3350539..000000000
--- a/app/views/about/_links.html.haml
+++ /dev/null
@@ -1,12 +0,0 @@
-.panel
-  .panel-header= t 'about.links'
-  .panel-list
-    %ul
-      - if user_signed_in?
-        %li= link_to t('about.get_started'), root_path
-      - else
-        - if instance.open_registrations
-          %li= link_to t('about.get_started'), new_user_registration_path
-        %li= link_to t('auth.login'), new_user_session_path
-      %li= link_to t('about.terms'), terms_path
-      %li= link_to t('about.source_code'), 'https://github.com/tootsuite/mastodon'
diff --git a/app/views/about/_version.html.haml b/app/views/about/_version.html.haml
deleted file mode 100644
index f8ebc4c6d..000000000
--- a/app/views/about/_version.html.haml
+++ /dev/null
@@ -1,4 +0,0 @@
-.panel
-  .panel-header= t 'about.version'
-  .panel-body
-    %strong= version.version_number
diff --git a/app/views/about/terms.html.haml b/app/views/about/terms.html.haml
index 58064f0be..7004cb0b1 100644
--- a/app/views/about/terms.html.haml
+++ b/app/views/about/terms.html.haml
@@ -1,8 +1,23 @@
 - content_for :page_title do
   = t('terms.title', instance: site_hostname)
 
-.wrapper
-  - if @instance_presenter.site_terms.present?
-    = raw @instance_presenter.site_terms
-  - else
-    = t('terms.body_html')
+.landing-page
+  .header-wrapper.compact
+    .header
+      .container.links
+        .brand
+          = link_to root_url do
+            = image_tag asset_pack_path('logo_full.svg'), alt: 'Mastodon'
+
+        %ul.nav
+          %li
+            - if user_signed_in?
+              = link_to t('settings.back'), root_url, class: 'webapp-btn'
+            - else
+              = link_to t('auth.login'), new_user_session_path, class: 'webapp-btn'
+          %li= link_to t('about.about_this'), about_more_path
+          %li= link_to t('about.other_instances'), 'https://joinmastodon.org/'
+
+  .extended-description
+    .container
+      = @instance_presenter.site_terms.html_safe.presence || t('terms.body_html')