button for adding photos works again. pulled _aspect_nav into _header. fixed all but one cucumber test.

app/views/layouts/_header.html.haml

@@ -30,4 +30,18 @@
       %li= link_to t('.account_settings'), edit_user_path(current_user)
       %li= link_to t('.logout'), destroy_user_session_path
 
-    = render "shared/aspect_nav"
+    #aspect_nav
+      %ul
+        %li{:class => ("selected" if @aspect == :all)}
+          = link_to ((@request_count == 0)? "Home" : "Home (#{@request_count})"), root_path, :class => new_request(@request_count)
+
+        - for aspect in @aspects
+          %li{:class => ("selected" if current_aspect?(aspect))}
+            = link_for_aspect aspect
+        %li
+          = link_to '+', '#add_aspect_pane', :class => "add_aspect_button", :title => t('.add_a_new_aspect')
+
+      .fancybox_content
+        #add_aspect_pane
+          = render "aspects/new_aspect"
+

app/views/shared/_aspect_nav.haml

@@ -1,18 +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.
-
-#aspect_nav
-  %ul
-    %li{:class => ("selected" if @aspect == :all)}
-      = link_to "Home", root_url
-    - for aspect in @aspects
-      %li{:class => ("selected" if current_aspect?(aspect))}
-        = link_for_aspect aspect
-    %li
-      = link_to '+', '#add_aspect_pane', :class => "add_aspect_button", :title => t('.add_a_new_aspect')
-
-  .fancybox_content
-    #add_aspect_pane
-      = render "aspects/new_aspect"
-

app/views/shared/_publisher.haml

@@ -49,7 +49,7 @@
         .public_toggle
           %p.checkbox_select
             = status.check_box( :public, {}, true, false )
-            = status.label :public, "publish to services"
+            = status.label :public, "make public"
             = link_to (image_tag "social_media_logos/feed-16x16.png", :title => "RSS"), current_user.public_url 
             - if current_user.services
               - for service in current_user.services      

config/locales/diaspora/en.yml

@@ -60,16 +60,15 @@ en:
         blog: "blog"
         developers: "developers"
         login: "login"
+        add_a_new_aspect: "add a new aspect"
+        manage: "Manage"
+        manage_your_aspects: "Manage your Aspects"
+        everyone: "Everyone"
       application:
         powered_by: "POWERED BY DIASPORA*"
   shared:
       stream_element:
           show_comments: "show comments"
-      aspect_nav:
-          manage: "Manage"
-          manage_your_aspects: "Manage your Aspects"
-          everyone: "Everyone"
-          add_a_new_aspect: "add a new aspect"
       publisher:
           posting: "Posting..."
           share: "Share"

features/manages_aspects.feature

@@ -6,8 +6,8 @@ Feature: User manages aspects
 
   Scenario: creating an aspect
     Given I am signed in
-    When I follow "Manage" in the header
+    When I follow "Home" in the header
-    And I follow "Add a new aspect"
+    And I follow "add aspect"
     And I fill in "Name" with "Dorm Mates" in the modal window
     And I press "Create" in the modal window
     Then I should see "Dorm Mates" in the header

features/manages_contact_requests.feature

@@ -7,16 +7,18 @@ Feature: managing contact requests
     
   Scenario: seeing contact requests
     When I am on the home page
-    Then I should see "Manage (1)" in the header
+    Then I should see "Home (1)" in the header
 
   @javascript
   Scenario: accepting a contact request
     When I am on the home page
-    And I follow "Manage (1)"
+    And I follow "Home (1)"
     Then I should see 1 contact request
     And I should see 0 contacts in "Family"    
 
-    When I drag the contact request to the "Family" aspect
+    When I am on the home page
+    Then I follow "1 new request!"
+		And I drag the contact request to the "Family" aspect
     And I wait for the ajax to finish
     Then I should see 1 contact in "Family"
 

public/stylesheets/sass/application.sass

@@ -748,6 +748,7 @@ label
     :shadow 0 1px 1px #eee
 
 #file-upload
+  :z-index 3
   :float right
   :height 34px
   :width 70px
@@ -755,9 +756,9 @@ label
   :background
     :color #107FC9
 
-  :-webkit-border-radius 0 5px 5px 0
+  :-webkit-border-radius 5px
-  :-moz-border-radius 0 5px 5px 0
+  :-moz-border-radius 5px
-  :border-radius 0 5px 5px 0
+  :border-radius 5px 
 
   :background -webkit-gradient( linear, left bottom, left top, color-stop(0, rgb(0,123,194)), color-stop(1, rgb(65,182,250)))
   :background -moz-linear-gradient( center bottom, rgb(0,123,194) 0%, rgb(65,182,250) 100%)
@@ -1910,3 +1911,4 @@ h3,h4
 .big_buttons
   input
     :width 100%
+