From e04ddd0bccba2b54912af59ae27b88653f9d3ad0 Mon Sep 17 00:00:00 2001 From: David Moseler Date: Sun, 20 Jan 2019 22:42:47 -0200 Subject: [PATCH] Clarify pod is part of diaspora in splash screen --- app/assets/stylesheets/home.scss | 10 ++++++++++ app/views/home/default.haml | 2 ++ config/locales/diaspora/en.yml | 1 + 3 files changed, 13 insertions(+) diff --git a/app/assets/stylesheets/home.scss b/app/assets/stylesheets/home.scss index 1dd6555ad..71795fa70 100644 --- a/app/assets/stylesheets/home.scss +++ b/app/assets/stylesheets/home.scss @@ -42,6 +42,16 @@ 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; + } + .login-form { fieldset { background: none; } diff --git a/app/views/home/default.haml b/app/views/home/default.haml index 2a7a789c7..177b4d048 100644 --- a/app/views/home/default.haml +++ b/app/views/home/default.haml @@ -4,6 +4,8 @@ .row .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= 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 6e8a8a096..101925fcd 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -553,6 +553,7 @@ en: home: default: headline: "Welcome to %{pod_name}" + clarify: "Part of the 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."