bootstrapped getting started page

1 files changed, 69 insertions, 77 deletions

diff --git a/app/views/users/getting_started.haml b/app/views/users/getting_started.haml
index 28c191c49..8a7d66639 100644
--- a/app/views/users/getting_started.haml
+++ b/app/views/users/getting_started.haml
@@ -34,84 +34,76 @@
       });
     });
 
-.span-5.leftNavBar
-  #home_user_badge
-    = owner_image_link
-    %h3
-      = current_user.first_name
-
-  - unless has_completed_getting_started?
-    .section
-      %ul.left_nav
-        %li
-          = link_to t(".welcome"), getting_started_path, :class => "home_selector active"
-
-  .section
-    = render 'aspects/aspect_listings'
-
-  .section
-    = render 'tags/followed_tags_listings'
-
-.span-13.append-1
-  .stream_container
-    %h2
-      = welcome_text
-    %h4
+%br
+
+%section#hello-there
+  .hero-unit
+    %h1.center
+      /= welcome_text
+      Well, hello there!
+    %p.center
       = t(".community_welcome")
 
-    %ul#getting_started
-      %li.profile
-        .getting_started_number
-          %h3
-            = @step += 1
-        .content
-          %h3
-            = t(".who_are_you")
-
-          .span-12
-            %p
-              We can speed things up a bit by 
-              = link_to "hooking up your Facebook account", "auth/facebook?callback_url=#{getting_started_url}"
-              to Diaspora. This will pull your name and photo, and enable cross-positng.
-
-          .span-12
-            /= form_for(current_user.person.profile, :remote => true) do |profile|
-
-            = form_tag profile_path, :method => :put, :remote => true, :id => 'edit_profile' do |profile|
-              .span-5
-                = text_field_tag 'profile[first_name]', current_user.person.profile.first_name, :placeholder => t('profiles.edit.your_name')
-                = image_tag 'ajax-loader.gif', :id => "form_spinner", :class => "hidden"
-                %span.saved{:class => "hidden"}
-                  = image_tag 'icons/check_yes_ok.png'
-                  = t(".saved")
-
-              .span-7.last
-                = render 'photos/new_profile_photo', :aspect => :getting_started, :person => current_user.person
-
-      %li.follow_interests
-        .getting_started_number
-          %h3
-            = @step += 1
-        .content
-          %h3
-            = t('.what_are_you_in_to')
-
-          %p
-            = t('.hashtag_explanation')
-
-          .span-9
-            = form_tag(multiple_tag_followings_path, :method => 'post', :class => "tag_input search_form") do
-              = text_field_tag 'follow_tags', nil
+    .clearfix
+      %br
+      %br
+
+    .clearfix
+      .row
+        %h2
+          = t(".who_are_you")
+
+      .row
+        %p
+          We can speed things up a bit by 
+          = link_to "hooking up your Facebook account", "auth/facebook?callback_url=#{getting_started_url}"
+          to Diaspora. This will pull your name and photo, and enable cross-positng.
+
+      .row
+        .span6
+          = form_tag profile_path, :method => :put, :remote => true, :id => 'edit_profile' do |profile|
+            %fieldset
+              .clearfix
+                = label_tag 'profile[first_name]', "Your name", :class => "bootstrapped"
+                .input
+                  = text_field_tag 'profile[first_name]', current_user.person.profile.first_name
+                  = image_tag 'ajax-loader.gif', :id => "form_spinner", :class => "hidden"
+
+              %span.saved{:class => "hidden"}
+                = image_tag 'icons/check_yes_ok.png'
+                = t(".saved")
+
+            .clearfix
+              = label_tag :your_photo, "Your photo", :class => "bootstrapped"
+              .input{:style => "position:relative;"}
 
-            %br
-
-            %div{:style => 'text-align:center; min-height: 58px'}
-              %p
-                = link_to t('.awesome_take_me_to_diaspora'), "#", :id => "awesome_button", :class => "button"
-              %p
-                = image_tag 'ajax-loader.gif', :id => "awesome_spinner", :class => "hidden"
-
-
-          .clearfix
-            %br
+                = render 'photos/new_profile_photo', :aspect => :getting_started, :person => current_user.person
+      %br
+      %br
+
+    .clearfix
+      .row
+        %h2
+          = t('.what_are_you_in_to')
+
+      .row
+        %p
+          = t('.hashtag_explanation')
+
+      .row
+        .span13
+          = form_tag(multiple_tag_followings_path, :method => 'post', :class => "tag_input search_form") do
+            %fieldset
+              .clearfix
+                = label_tag 'follow_tags', "Follow tags", :class => "bootstrapped"
+                .input
+                  = text_field_tag 'follow_tags', nil, :class => "nostrap"
+
+            .clearfix
+              %br
+              %br
+              %br
+              .input
+                = link_to "#{t('.awesome_take_me_to_diaspora')} »", "#", :id => "awesome_button", :class => "btn primary"
+      = image_tag 'ajax-loader.gif', :id => "awesome_spinner", :class => "hidden"