diff --git a/app/views/users/getting_started.haml b/app/views/users/getting_started.haml index ee42fdc35..6e95836d7 100644 --- a/app/views/users/getting_started.haml +++ b/app/views/users/getting_started.haml @@ -57,10 +57,24 @@ .content %h3 = t('.connect_to_your_other_social_networks') + + %p + = t('.connect_to_your_other_social_networks_explanation_p1') + - if AppConfig[:configured_services].detect{|s| s == "facebook"} + = t('.connect_to_your_other_social_networks_explanation_p2') + #getting_started_service_icons - AppConfig.configured_services.each do |service| - unless current_user.services.any?{|x| x.provider == service} - = link_to(image_tag("social_media_logos/#{service.to_s.downcase}-48x48.png", :title => service.to_s.titleize), "/auth/#{service}") + %span.service + %span.service_image + = link_to(image_tag("social_media_logos/#{service.to_s.downcase}-48x48.png", :title => service.to_s.titleize), "/auth/#{service}") + - else + %span.service + %span.service_image + = image_tag( "social_media_logos/#{service.to_s.downcase}-48x48.png", :title => service.to_s.titleize, :class => "dim") + %span.checkmark + = image_tag( "icons/check_yes_ok.png") %li.connect_with_people{:class => ("completed" if has_few_contacts?)} .getting_started_number diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index a8f04bca5..33aab9bca 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -864,6 +864,10 @@ en: location: "Location" connect_to_your_other_social_networks: "Connect to your other social networks" + connect_to_your_other_social_networks_explanation_p1: "Connecting to services will allow you to publish out to these services." + connect_to_your_other_social_networks_explanation_p2: "With Facebook, you also be able to find friends already on Diaspora and invite others." + + connect_with_people: "Connect with cool people" connect_with_people_explanation_pt1: "Connect with people by placing them into one or more of your %{bold}." bold: "aspects" diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 3c46ce70f..dbdfa59d2 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -3230,14 +3230,26 @@ ul#getting_started #getting_started_service_icons :text-align center - img - :margin - :right 48px - :padding :bottom 20px :top 10px + .service + :margin + :right 48px + :position relative + + .service_image + :position relative + + .checkmark + :position absolute + img + :height 36px + :width 36px + :left 25px + :top -15px + #right_service_icons :text-align center :padding 10px