From 050964b7ec93a08a9124d2116f7723a681a29c23 Mon Sep 17 00:00:00 2001
From: Ilya Zhitomirskiy <iz268@nyu.edu>
Date: Wed, 19 Oct 2011 13:54:50 -0700
Subject: [PATCH] photo upload position, active input, spinny on complete

---
 app/views/users/getting_started.haml              | 13 +++++++++----
 config/locales/diaspora/en.yml                    |  2 +-
 public/javascripts/pages/users-getting-started.js | 14 ++++++++++++++
 public/stylesheets/sass/application.sass          | 13 ++++++++++++-
 4 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/app/views/users/getting_started.haml b/app/views/users/getting_started.haml
index b678a8808..8716aa5dc 100644
--- a/app/views/users/getting_started.haml
+++ b/app/views/users/getting_started.haml
@@ -103,10 +103,15 @@
             = form_tag(multiple_tag_followings_path, :method => 'post', :class => "tag_input search_form") do
               = text_field_tag 'follow_tags', nil
 
+            %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
 
-      %li{:style => 'text-align:center;'}
-        %p
-          = link_to t('.awesome_take_me_to_diaspora'), "#", :class => "button", :onClick => "$('.tag_input').submit();"
-
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 1333da7f8..527f7b0c8 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -900,7 +900,7 @@ en:
 
       who_are_you: "Who are you?"
 
-      what_are_you_in_to: "What are you in to?"
+      what_are_you_in_to: "What are you into?"
       hashtag_explanation: "Hashtags allow you to talk about and follow your interests.  They're also a great way to find new people on Diaspora."
 
       saved: "Saved!"
diff --git a/public/javascripts/pages/users-getting-started.js b/public/javascripts/pages/users-getting-started.js
index 8f1edf9a7..08fada146 100644
--- a/public/javascripts/pages/users-getting-started.js
+++ b/public/javascripts/pages/users-getting-started.js
@@ -25,5 +25,19 @@ Diaspora.Pages.UsersGettingStarted = function() {
       $('#form_spinner').removeClass("hidden");
 
     });
+
+    $("#profile_first_name").bind("blur", function(){
+      $(this).removeClass("active_input");
+    });
+
+    $("#profile_first_name").bind("focus", function(){
+      $(this).addClass("active_input");
+    });
+
+    $("#awesome_button").bind("click", function(evt){
+      evt.preventDefault();
+      $('#awesome_spinner').removeClass("hidden");
+      $('.tag_input').submit();
+    });
   });
 };
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 9a7bdfa0d..50fc35fe7 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -3221,12 +3221,19 @@ ul#getting_started
     #profile_photo_upload
       :padding
         :left 30px
-      img
+      .avatar
         :position relative
         :float right
+
+      #file-upload-spinner
+        :position relative
+        :top -120px
+        :left 140px
+
       .button
         :top 10px
         :left 69px
+    
     .button
       :top 20px
 
@@ -3235,6 +3242,10 @@ ul#getting_started
         :position relative
         :top 4px
         :right 2px
+
+    input.active_input 
+      :background
+        :color lighten(#FFD700, 40%)
         
 
 #right_service_icons