Merge branch 'master' of github.com:diaspora/diaspora

Conflicts:
	spec/fixtures/users.yaml

app/views/devise/sessions/new.haml

@@ -30,9 +30,10 @@
 
 .span-13.last
   %h1
-    This is a technology preview, do not provide any private information.
+  = t('.tech_preview')
   %h3
-    your account may be deleted until we move into a more stable development period.
+  = t('.account_deletion') 
   %h3
-    USE AT YOUR OWN RISK!!
+  = t('.risk') 
+    
 

app/views/home/show.haml

--#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3 or later.  See
--#   the COPYRIGHT file.
-
-.span-22.prepend-1.last
-
-  #landing_content
-
-    #diaspora_description.section
-      %p
-        = t('.share_what_you_want')
-
-    #why.span-22.prepend-1.last
-      .span-7
-        %h2
-          = t('.choice')
-        %p
-          = t('.choice_explanation')
-          
-      .span-7
-        %h2
-          = t('.ownership')
-        %p
-          = t('.ownership_explanation')
-      .span-7
-        %h2
-          = t('.simplicity')
-        %p
-          = t('.simplicity_explanation')
-
-
-    .span-22.prepend-1.last
-      #signup_field.section
-        = render 'shared/mail_signup_form'
-
-      #login_field.section
-        = t('.already_account')
-        = link_to t('.login_here'), new_user_session_path
-
-    #info_links.span-22.prepend-1.last          
-      .span-10
-        %h3
-          = t('.learn_about_host')
-
-
-      .span-11
-        %h3
-          = t('.learn_about_open_source')
-    
-
-.span-24.last{:style=>"text-align:center;"}
-  %ul#press_logos
-    %li= link_to image_tag("press_logos/nyt.png"), "http://www.nytimes.com/2010/05/12/nyregion/12about.html", :title => "The New York Times"
-    %li= link_to image_tag("press_logos/nymag.gif"), "http://nymag.com/news/features/establishments/68512/", :title => "New York Magazine"
-    %li= link_to image_tag("press_logos/mashable.jpeg"), "http://mashable.com/2010/08/26/facebook-alternative-diaspora-launches-september-15/", :title => "Mashable"
-    %li= link_to image_tag("press_logos/techcrunch.gif"), "http://techcrunch.com/2010/09/15/diaspora-revealed/", :title => "TechCrunch"

app/views/home/show.html.haml

+-#   Copyright (c) 2010, Diaspora Inc.  This file is
+-#   licensed under the Affero General Public License version 3 or later.  See
+-#   the COPYRIGHT file.
+
+#landing_content
+  .span-22.prepend-1.append-1.last
+
+    #diaspora_description.section
+      %p
+        = t('.share_what_you_want')
+
+  #why.span-24.last
+    .span-6.append-3
+      .info_pane
+        %h2
+          = t('.choice')
+        %p
+          = t('.choice_explanation')
+        
+    .span-6.append-3
+      .info_pane
+        %h2
+          = t('.ownership')
+        %p
+          = t('.ownership_explanation')
+    .span-6.last
+      .info_pane
+        %h2
+          = t('.simplicity')
+        %p
+          = t('.simplicity_explanation')
+
+
+  #signup.span-24.last
+    #signup_field.section
+      = render 'shared/mail_signup_form'
+
+    #login_field.section
+      = t('.already_account')
+      = link_to t('.login_here'), new_user_session_path
+
+  #info_links.prepend-1.span-22.append-1.last
+    %h3
+      = link_to t('.learn_about_host'), 'http://bit.ly/dZqyd3'
+      
+
+  .span-24.last{:style=>"text-align:center;"}
+    %ul#press_logos
+      %li= link_to image_tag("press_logos/the_new_york_times_logo.png"), "http://www.nytimes.com/2010/05/12/nyregion/12about.html", :title => "The New York Times"
+      %li= link_to image_tag("press_logos/nymag_logo.png"), "http://nymag.com/news/features/establishments/68512/", :title => "New York Magazine"
+      %li= link_to image_tag("press_logos/mashable_logo.png"), "http://mashable.com/2010/08/26/facebook-alternative-diaspora-launches-september-15/", :title => "Mashable"
+      %li= link_to image_tag("press_logos/techcrunch_logo.png"), "http://techcrunch.com/2010/09/15/diaspora-revealed/", :title => "TechCrunch"

app/views/layouts/_header.html.haml

@@ -4,16 +4,17 @@
 
 .container{:style => "position:relative;"}
   #diaspora_text
-    = link_to "DIASPORA*", (current_user ? root_path : new_user_session_path)
+    = link_to "DIASPORA*", root_path
     %span.sub_text
       ALPHA
 
   - unless current_user
     .right
       %ul#landing_nav
-        %li= link_to t('.blog'), "http://blog.joindiaspora.com"
+        %li= link_to '@joindiaspora', "http://twitter.com/joindiaspora"
         %li= link_to t('.developers'), "https://github.com/diaspora/diaspora"
-        %li= link_to t('.login'), new_user_session_path
+        %li= link_to t('.login'), new_user_session_path, :class => 'login'
+
   - else
     #global_search
       = form_tag(people_path, :method => 'get') do

app/views/layouts/application.html.haml

@@ -64,22 +64,20 @@
     - flash.each do |name, msg|
       = content_tag :div, msg, :id => "flash_#{name}"
 
-    %header
+    %header{:class=>('landing' unless current_user)}
       = render 'layouts/header'
 
     .container
       .span-24.last
         = yield
 
-      .span-24.last
-      = render "posts/debug"
     .clearfix
 
     %footer
       .container
         .brandon= t('.powered_by')
         %ul#footer_nav
-          %li= link_to t('layouts.header.blog'), "http://blog.joindiaspora.com"
+          %li= link_to '@joindiaspora', "http://twitter.com/joindiaspora"
           %li= link_to t('layouts.header.developers'), "https://github.com/diaspora/diaspora"
 
     :javascript    

app/views/shared/_aspect_contacts.haml

@@ -49,7 +49,7 @@
 
 - if (aspect == :all) && @request_count > 0
   #new_request_pane{:class => "everyone"}
-    %h1.new_request
+    %h1.new_request{:style => 'text-align:center'}
       - if @request_count > 1
         = link_to t('.new_requests', :count => @request_count), aspects_manage_path
       - else

app/views/users/getting_started/_step_4.html.haml

@@ -23,16 +23,10 @@
 
 %p
   = t('.change_profile')
-  %b #{t('layouts.header.edit_profile')}
-  = t('.user_menu')
-%p
-  = t('.connect_disconnect')
-  %b #{t('layouts.header.account_settings')}
   = t('.user_menu')
+
 %p
   = t('.manage_aspects')
-  %b #{t('.manage')}
-  = t('.tab_also_added')
 
 .submit_block
   = link_to "#{t('.finish')} →", root_url, :class => "button"

config/locales/devise/devise.en.yml

@@ -22,6 +22,9 @@ en:
         sign_in: 'Sign in'
         have_a_problem: "Have a problem? Find an answer here"
         remember_me: "Remember me"
+        tech_preview: "Important, please read: This is a technology preview; do not provide any private information."
+        account_deletion: "Also, be advised that your account may be deleted until we move into a more stable development period."
+        risk: "USE AT YOUR OWN RISK!!!"
       signed_in: 'Signed in successfully.'
       signed_out: 'Signed out successfully.'
     passwords:
@@ -83,4 +86,4 @@ en:
         sign_up: 'Sign up'
         forgot_your_password: 'Forgot your password?'
         receive_confirmation: "Didn't receive confirmation instructions?"
-        receive_unlock: "Didn't receive unlock instructions?"
+        receive_unlock: "Didn't receive unlock instructions?"
\ No newline at end of file

config/locales/diaspora/en.yml

@@ -121,7 +121,7 @@ en:
           contact: "contact"
           contacts: "contacts"
       no_contacts_message:
-          nobody: "We know you know people — bring them to Diaspora!"
+          nobody: "Bring the people that matter in your life to Diaspora!"
           nobody_in_aspect: "Your aspect '%{aspect_name}' is empty."
           add_contact: "Add a contact"
           add_contact_to: "Add someone to %{aspect_name}"
@@ -177,32 +177,30 @@ en:
       destroy: "Account successfully closed."
       getting_started:
           welcome: "Welcome to Diaspora!"
-          signup_steps: "Complete your sign-up by doing these things:"
+          signup_steps: "Finish your sign up by completing these three steps:"
           edit_profile: "Edit your profile"
           define_aspects: "Define your aspects"
-          connect_services: "Connect your services"
+          connect_services: "Connect your other services"
           finished: "Finished!"
           skip: "skip getting started"
           save_and_continue: "Save and continue"
           step_2:
               your_aspects: "Your aspects"
-              description: "Tell Diaspora what different aspects of you are seen by different contacts.  You can manage these later by clicking the manage tab on the top right.  Your aspects are unique to you, and not visible by others."
+              description: "Tell Diaspora what different aspects of you are seen by different contacts. You can manage these later through your account menu at the top right. Your aspects are unique to you and not visible by others."
               aspect_name: "Aspect name"
               add: "Add"
           step_3:
               your_services: "Your services"
-              description: 'Connect your existing social networks to your Diaspora account.  You will be able to post publically through your Everyone tab when you select "public."'
+              description: 'You are able to connect your existing social networks to your Diaspora account. You will be able to post publically through your Home page when you select “make public"'
           step_4:
               set_up: "You're all set up, %{name}!"
               ready_to_share: "You're now ready to start sharing with "
-              continue: "Continue on to your everyone page, an overview of all of your aspects."
-              change_profile: "You can change your profile any time by clicking"
-              user_menu: "in your user menu (top right)."
+              continue: "Continue on to your Home page, an overview of all of your aspects."
+              change_profile: "You can edit your profile and manage your connected services at any time through "
+              user_menu: "the user menu located at the top right."
               connect_disconnect: "You can connect/disconnect your services any time by clicking"
-              manage_aspects: "You can manage your aspects any time by clicking the"
-              tab_also_added: "tab.  Your contacts can also be added while on a particular aspect page, as well."
+              manage_aspects: "You can also add contacts while on any aspect page."
               finish: "Finish"
-              manage: "Manage"
       update:
           password_changed: "Password Changed"
           password_not_changed: "Password Change Failed"
@@ -381,5 +379,5 @@ en:
           ownership_explanation: "You own your pictures, and you shouldn’t have to give that up just to share them. You maintain ownership of everything you share on Diaspora, giving you full control over how it's distributed."
           simplicity: "Simplicity"
           simplicity_explanation: "Diaspora makes sharing clean and easy – and this goes for privacy too. Inherently private, Diaspora doesn’t make you wade through pages of settings and options just to keep your profile secure."
-          learn_about_host: "Learn about how to host your own Diaspora server"
+          learn_about_host: "Learn about how to host your own Diaspora server."
           learn_about_open_source: "Learn more about Diaspora as an open source project."

features/signs_up.feature

@@ -31,9 +31,9 @@ Feature: new user registration
     Then I should see "You're all set up, O!"
     And I should not see "skip getting started"
 
-    When I follow "Continue on to your everyone page, an overview of all of your aspects."
+    When I follow "Continue on to your Home page, an overview of all of your aspects."
     Then I should be on the aspects page
-    And I should see "bring them to Diaspora!"
+    And I should see "Bring the people that matter in your life to Diaspora!"
 
   Scenario: new user skips the setup wizard and returns to the setup wizard
     When I follow "skip getting started"
@@ -44,4 +44,4 @@ Feature: new user registration
     When I follow "skip getting started"
     And I wait for the aspects page to load
     Then I should be on the aspects page
-    And I should see "bring them to Diaspora!"
+    And I should see "Bring the people that matter in your life to Diaspora!"

public/stylesheets/sass/application.sass

@@ -138,6 +138,14 @@ header
     :margin
       :right 12px
 
+  &.landing
+    #diaspora_text
+      :font
+        :size 30px
+      :text-shadow 0 2px 3px #000
+    .right
+      :top 10px
+
   ul#user_menu
     :overflow hidden
     :white-space nowrap
@@ -716,7 +724,7 @@ li.message .from .right
     :color #333
 
 #debug_info
-  :margin-top 20px
+  :margin-top 50px
   :color #ccc
 
   h5
@@ -1771,6 +1779,8 @@ ul#landing_nav
   :list
     :style none
 
+  :top 30px
+
   :font
     :size 14px
   
@@ -1780,10 +1790,33 @@ ul#landing_nav
       :right 0.5em
     a
       :color #107FC9
+      
+      &.login
+        :padding 5px 8px
+
+        :-webkit-border-radius 5px
+        :-moz-border-radius 5px
+        :border-radius 5px
+
+        :background
+          :color #000
+
+        :border
+          :top 1px solid #000
+
+        :-webkit-box-shadow 0 1px 1px #666
+        :-moz-box-shadow 0 1px 1px #666
+        :box-shadow 0 1px 1px #666
+
+        &:hover
+          :background
+            :color #222
 
     :text-shadow 0 1px 0 #000
 
 
+
+
 #signup_field
   :margin
     :top -200px
@@ -1890,7 +1923,7 @@ ul#landing_nav
     :style italic
   :margin
     :top 14px
-    :left 500px
+    :left 540px
   :color #888
   
 
@@ -1918,6 +1951,19 @@ ul#press_logos
   :text
     :align center
 
+#why
+  :margin
+    :bottom 48px
+
+  h2
+    :text-shadow 0 1px #fff
+    :border
+      :bottom 3px solid #eee
+
+#signup
+  :margin
+    :bottom 48px
+
 
 h3,h4
   :padding
@@ -1998,3 +2044,4 @@ h3,h4
 #edit_aspect_trigger
   :font
     :size 12px
+