landing page fix

app/views/home/show.haml

@@ -1,56 +0,0 @@
--#   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

@@ -0,0 +1,52 @@
+-#   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

@@ -11,9 +11,10 @@
   - 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    

config/locales/diaspora/en.yml

@@ -379,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."

public/stylesheets/sass/application.sass

@@ -138,6 +138,13 @@ header
     :margin
       :right 12px
 
+  &.landing
+    #diaspora_text
+      :font
+        :size 30px
+    .right
+      :top 10px
+
   ul#user_menu
     :overflow hidden
     :white-space nowrap
@@ -716,7 +723,7 @@ li.message .from .right
     :color #333
 
 #debug_info
-  :margin-top 20px
+  :margin-top 50px
   :color #ccc
 
   h5
@@ -1771,6 +1778,8 @@ ul#landing_nav
   :list
     :style none
 
+  :top 30px
+
   :font
     :size 14px
   
@@ -1780,10 +1789,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 +1922,7 @@ ul#landing_nav
     :style italic
   :margin
     :top 14px
-    :left 500px
+    :left 540px
   :color #888
   
 
@@ -1918,6 +1950,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 +2043,4 @@ h3,h4
 #edit_aspect_trigger
   :font
     :size 12px
+