added featured users, left nav, and search boxes into getting started

app/helpers/application_helper.rb

@@ -111,7 +111,11 @@ module ApplicationHelper
   end
 
   def controller_index_path
-    self.send((request.filtered_parameters["controller"] + "_path").to_sym)
+    kontroller = request.filtered_parameters["controller"]
+    if kontroller.downcase != "contacts"
+      kontroller = "aspects"
+    end
+    self.send((kontroller + "_path").to_sym)
   end
 
   def left_nav_root

app/views/aspect_memberships/_aspect_dropdown.html.haml

@@ -15,7 +15,7 @@
       - for aspect in all_aspects
         = aspect_dropdown_list_item(aspect, contact, person)
 
-      - if defined?(@aspect) && ( @aspect == :profile || @aspect == :tag || @aspect == :search || @aspect == :notification)
+      - if defined?(@aspect) && ( @aspect == :profile || @aspect == :getting_started || @aspect == :tag || @aspect == :search || @aspect == :notification)
         %li.newItem
           .add_aspect
             = link_to t('contacts.index.add_a_new_aspect'), new_aspect_path(:person_id => person.id), :rel => 'facebox', :class => 'new_aspect'

app/views/aspects/index.html.haml

@@ -13,7 +13,9 @@
       = current_user.first_name
 
   .section
-    = link_to "Get Started", getting_started_path
+    %ul.left_nav
+      %li
+        = link_to "Welcome", getting_started_path, :class => "home_selector"
 
   .section
     = render 'aspects/aspect_listings'

app/views/users/getting_started.html.haml

@@ -12,28 +12,30 @@
       = current_user.first_name
 
   .section
-    = link_to "Get Started", getting_started_path
+    %ul.left_nav
+      %li
+        = link_to "Welcome", getting_started_path, :class => "home_selector active"
 
-//.section
+  .section
-//  = render 'aspects/aspect_listings'
+    = render 'aspects/aspect_listings'
 
-//.section
+  .section
-//  = render 'tags/followed_tags_listings'
+    = render 'tags/followed_tags_listings'
 
 .span-13.append-1
   .stream_container
-    %h3
+    %h2
       = "Welcome, #{current_user.first_name}!"
 
     %ul#getting_started
       %li.profile
         .getting_started_number
-          %h4
+          %h3
             1
         .content
           #getting_started_profile_photo
             = person_image_link(current_user.person, :size => :thumb_medium)
-          %h4
+          %h3
             = t(".fill_out_your_profile")
           %p
             = t(".profile_description")
@@ -47,10 +49,10 @@
 
       %li.services
         .getting_started_number
-          %h4
+          %h3
             2
         .content
-          %h4
+          %h3
             = t('.connect_to_your_other_social_networks')
         #getting_started_service_icons
           - AppConfig.configured_services.each do |service|
@@ -59,44 +61,96 @@
 
       %li
         .getting_started_number
-          %h4
+          %h3
             3
         .content
-          %h4
+          %h3
             = t(".connect_with_people")
 
+          %p
+            Connect with people by placing them into one or more of your aspects.  Aspects are an intuative way to group new and familar faces, allowing you to filter down or share with subsets of your contacts easily.
+
           #diaspora_hq_pane
-            - person = Person.first
+            - person = Person.find_by_diaspora_handle("diasporahq@joindiaspora.com")
-            = person_image_link(Person.first)
+            = person_image_link(person, :size => :thumb_medium)
-            .add_to_aspect
-              = render :partial => 'people/relationship_action',
-                :locals => { :person => Person.first,
-                              :contact => current_user.contact_for(Person.first),
-                              :current_user => current_user }
 
             .name
               = person_link(person)
 
             .info
-              Get updates about the project.
+              Get updates about the project from the core team.
+
+            .add_to_aspect
+              = render :partial => 'people/relationship_action',
+                :locals => { :person => person,
+                              :contact => current_user.contact_for(person),
+                              :current_user => current_user }
+
+          #featured_users_pane 
+            %h4
+              Featured users
+
+            %div
+              - Person.featured_users[0..5].each do |person|
+                .featured_user_card_small
+                  = person_image_link(person)
+                  = link_to person.name, person_path(person)
+                  - person.profile.tags[0..2].each do |tg|
+                    = "##{tg}"
+
+            = link_to "See all featured users ->", "#"
+
+          %br
+          #find_friends_pane
+            %h4
+              Find friends
+            .span-5.append-1
+              #global_search
+                = form_tag(people_path, :method => 'get', :id => "global_search_form") do
+                  = text_field_tag 'q', nil, :placeholder => "Search for people", :type => 'search', :results => 5
+            .span-5.last
+              %p
+                or
+                = link_to "find friends from Facebook", "#"
+            .clearfix
+            %br
 
       %li
         .getting_started_number
-          %h4
+          %h3
             4
         .content
-          %h4
+          %h3
             = t(".follow_your_interests")
 
           %p
-            popular/curated tags?  person's tags?
+            Hashtags allow you to talk about and follow your interests.  They're also a great way to find new people on Diaspora.
+
+          .span-5.append-1
+            #global_search
+              = form_tag(people_path, :method => 'get', :id => "global_search_form") do
+                = text_field_tag 'q', nil, :placeholder => "Search for #hashtags", :type => 'search', :results => 5
+          .span-5.last
+            %h4
+              Featured tags
+            %p
+              = link_to "#diaspora", "#"
+              %br
+              = link_to "#kittens", "#"
+              %br
+              = link_to "#puppies", "#"
+              %br
+              = link_to "#maddog", "#"
+          .clearfix
+            %br
+          %br
 
       %li
         .getting_started_number
-          %h4
+          %h3
             5
         .content
-          %h4
+          %h3
             = t(".connect_to")
             = link_to "Cubbi.es", "http://cubbi.es/"
           %p

config/locales/diaspora/en.yml

@@ -787,10 +787,10 @@ en:
       save_and_continue: "Save and continue"
       could_not_find_anyone: "Could not find any friends on Diaspora*. Use the friend finder to invite them."
 
-      fill_out_your_profile: "Fill Out Your Profile"
+      fill_out_your_profile: "Fill out your profile"
       profile_description: "Description of why you'd want to do this"
       connect_to_your_other_social_networks: "Connect to your other social networks"
-      connect_with_people: "Connect with people"
+      connect_with_people: "Connect with cool people"
       follow_your_interests: "Follow your interests"
       connect_to: "Connect to"
 

public/stylesheets/sass/application.sass

@@ -1109,7 +1109,7 @@ img.scaled_full
     img
       :height 140px
 
-#global_search
+header #global_search
   :display inline
   :position relative
 
@@ -3188,7 +3188,7 @@ ul#getting_started
   :padding 0
   :margin 0
 
-  li
+  > li
     :position relative
     :border
       :bottom 1px solid #ddd
@@ -3200,6 +3200,9 @@ ul#getting_started
       :padding
         :left 30px
 
+    input[type='search']
+      :width 210px
+
   .profile
     :min-height 170px
 
@@ -3232,33 +3235,36 @@ ul#getting_started
 
 #diaspora_hq_pane
   :padding
-    :top 10px
+    :bottom 20px
   :min-height 70px
 
   .add_to_aspect
-    :float right
+    :padding 10px 0 
 
   .avatar
     :float left
     :margin
       :right 10px
 
+    :height 70px
+    :width 70px
+
   .name
     :font
       :weight bold
 
 .cubbies_images
-  :margin-left 50px
+  :margin-left 15px
 
 .cubbies_user_page_small
   :position absolute
-  :left 250px
+  :left 270px
 
 .getting_started_number
   :position absolute
   :left 0
 
-  h4
+  h3
     :display inline
     :background
       :color #eee
@@ -3267,12 +3273,42 @@ ul#getting_started
     :margin
       :right 8px
 
-.completed
+.profile .profile_field
   :background
-    :image url('/images/icons/check_yes_ok.png')
+    :image url('/images/icons/monotone_question.png')
-    :position center right
+    :position center left 
     :repeat no-repeat
 
-.profile .profile_field
   :padding
-    :right 20px
+    :left 20px
+
+.completed
+  :background
+    :image url('/images/icons/check_yes_ok.png') !important
+
+#featured_users_pane
+  :padding 10px 0
+
+  .featured_user_card_small
+    :display inline-block
+
+    :width 140px
+    :height 30px
+
+    :vertical-align top
+    :position relative
+
+    :padding 5px
+    :margin
+      :bottom 10px
+
+    a
+      :font
+        :weight bold
+
+    .avatar
+      :height 30px
+      :width 30px
+      :margin
+        :right 5px
+      :float left