Merge pull request #3 from tootsuite/master

Updating to current

2 files changed, 66 insertions, 2 deletions

diff --git a/app/views/about/index.html.haml b/app/views/about/index.html.haml
index 6dd182205..88bfe3d61 100644
--- a/app/views/about/index.html.haml
+++ b/app/views/about/index.html.haml
@@ -1,3 +1,6 @@
+- content_for :header_tags do
+  = javascript_include_tag 'application_public'
+
 - content_for :page_title do
   = Rails.configuration.x.local_domain
 
@@ -5,10 +8,11 @@
   %meta{ property: 'og:site_name', content: 'Mastodon' }/
   %meta{ property: 'og:type', content: 'website' }/
   %meta{ property: 'og:title', content: Rails.configuration.x.local_domain }/
-  %meta{ property: 'og:description', content: "Mastodon is a free, open-source social network server. A decentralized alternative to commercial platforms, it avoids the risks of a single company monopolizing your communication. Anyone can run Mastodon and participate in the social network seamlessly" }/
+  %meta{ property: 'og:description', content: @description.blank? ? "Mastodon is a free, open-source social network server. A decentralized alternative to commercial platforms, it avoids the risks of a single company monopolizing your communication. Anyone can run Mastodon and participate in the social network seamlessly" : strip_tags(@description) }/
   %meta{ property: 'og:image', content: asset_url('mastodon_small.jpg') }/
   %meta{ property: 'og:image:width', content: '400' }/
   %meta{ property: 'og:image:height', content: '400' }/
+  %meta{ property: 'twitter:card', content: 'summary' }/
 
 .wrapper
   %h1
@@ -20,10 +24,14 @@
 
   .screenshot= image_tag 'screenshot.png'
 
+  - unless @description.blank?
+    %p= @description.html_safe
+
   .actions
     .info
+      = link_to t('about.learn_more'), about_more_path
       = link_to t('about.terms'), terms_path
-      = link_to t('about.source_code'), 'https://github.com/Gargron/mastodon'
+      = link_to t('about.source_code'), 'https://github.com/tootsuite/mastodon'
 
     = link_to t('about.get_started'), new_user_registration_path, class: 'button webapp-btn'
     = link_to t('auth.login'), new_user_session_path, class: 'button webapp-btn'
diff --git a/app/views/about/more.html.haml b/app/views/about/more.html.haml
new file mode 100644
index 000000000..2de3bf986
--- /dev/null
+++ b/app/views/about/more.html.haml
@@ -0,0 +1,56 @@
+- content_for :page_title do
+  #{Rails.configuration.x.local_domain}
+
+.wrapper.thicc
+  .sidebar-layout
+    .main
+      .panel
+        %h2= Rails.configuration.x.local_domain
+
+        - unless @description.blank?
+          %p= @description.html_safe
+
+      .information-board
+        .section
+          %span= t 'about.user_count_before'
+          %strong= number_with_delimiter @user_count
+          %span= t 'about.user_count_after'
+        .section
+          %span= t 'about.status_count_before'
+          %strong= number_with_delimiter @status_count
+          %span= t 'about.status_count_after'
+        .section
+          %span= t 'about.domain_count_before'
+          %strong= number_with_delimiter @domain_count
+          %span= t 'about.domain_count_after'
+
+      - unless @extended_description.blank?
+        .panel= @extended_description.html_safe
+
+    .sidebar
+      .panel
+        .panel-header= t 'about.contact'
+        .panel-body
+          - if @contact_account
+            .owner
+              .avatar= image_tag @contact_account.avatar.url
+              .name
+                = link_to TagManager.instance.url_for(@contact_account) do
+                  %span.display_name.emojify= display_name(@contact_account)
+                  %span.username= "@#{@contact_account.acct}"
+
+          - unless @contact_email.blank?
+            .contact-email
+              = t 'about.business_email'
+              %strong= @contact_email
+      .panel
+        .panel-header= t 'about.links'
+        .panel-list
+          %ul
+            - if user_signed_in?
+              %li= link_to t('about.get_started'), root_path
+            - else
+              %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'