Unverified Commit e04ddd0b authored by David Moseler's avatar David Moseler Committed by Benjamin Neff
Browse files

Clarify pod is part of diaspora in splash screen

parent 4d02aee3

app/assets/stylesheets/home.scss

+10 −0
Original line number Diff line number Diff line
@@ -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; }

app/views/home/default.haml

+2 −0
Original line number Diff line number Diff line
@@ -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}

config/locales/diaspora/en.yml

+1 −0
Original line number Diff line number Diff line
@@ -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."