From 6826e89a95f5ab6e3e6c0bffce0d68a1daf6594a Mon Sep 17 00:00:00 2001
From: flaburgan <flaburgan@geexxx.fr>
Date: Wed, 8 May 2019 22:42:08 +0200
Subject: [PATCH] Change design, add a link to the official website

fixes #7910

closes #7966
---
 Changelog.md                     |  1 +
 app/assets/stylesheets/home.scss | 14 ++++++--------
 app/views/home/default.haml      |  4 +++-
 config/locales/diaspora/en.yml   |  3 ++-
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 30e39af59..b0818162a 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -5,6 +5,7 @@
 ## Bug fixes
 
 ## Features
+* Add line mentioning diaspora\* on the splash page [#7966](https://github.com/diaspora/diaspora/pull/7966)
 
 # 0.7.11.0
 
diff --git a/app/assets/stylesheets/home.scss b/app/assets/stylesheets/home.scss
index 71795fa70..147f4386a 100644
--- a/app/assets/stylesheets/home.scss
+++ b/app/assets/stylesheets/home.scss
@@ -42,14 +42,12 @@
     padding: 15px;
   }
 
-  .clarification-header {
-    background-color: $grey;
-    border: 1px solid $border-grey;
-    display: inline-block;
-    margin-bottom: 10px;
-    margin-top: 10px;
-    padding: 5px;
-    text-align: center;
+  .part-of-diaspora {
+    font-style: italic;
+
+    a {
+      color: $white;
+    }
   }
 
   .login-form {
diff --git a/app/views/home/default.haml b/app/views/home/default.haml
index 177b4d048..bf948f68a 100644
--- a/app/views/home/default.haml
+++ b/app/views/home/default.haml
@@ -5,7 +5,9 @@
         .col-md-8.text-center
           %h1= t("home.default.headline", pod_name: pod_name)
           - if pod_name != "diaspora*"
-            %h2.clarification-header= t("home.default.clarify")
+            %h2.part-of-diaspora
+              != t("home.default.part_of_diaspora",
+                diaspora_site_link: link_to(t("home.default.diaspora_site_link"), "https://diasporafoundation.org/"))
           %h2= t("home.default.byline")
         .col-md-4.login-form
           = render partial: "sessions/form", locals: {mobile: false, resource: User.new, resource_name: :user}
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 101925fcd..f6434e66e 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -553,7 +553,8 @@ en:
   home:
     default:
       headline: "Welcome to %{pod_name}"
-      clarify: "Part of the diaspora* federated network"
+      part_of_diaspora: "Part of the %{diaspora_site_link}"
+      diaspora_site_link: "diaspora* federated network"
       byline: "The online social world where you are in control"
       be_who_you_want_to_be: "Be who you want to be"
       be_who_you_want_to_be_info: "A lot of networks insist that you use your real identity. Not diaspora*. Here you can choose who you want to be, and share as much or as little about yourself as you want. It really is up to you how you want to interact with other people."