Merge branch 'master' of github.com:diaspora/diaspora

app/views/aspects/manage.html.haml

@@ -38,7 +38,9 @@
     %li.aspect
       
       .aspect_name
-        %h1{:contenteditable => true}= aspect.name
+        %span.edit_name_field
+          %h1{:contenteditable => true}= aspect.name
+          %span.tip click to edit
 
         %ul.tools
           %li= link_to "add a new friend", "#add_request_pane_#{aspect.id}", :class => 'add_request_button'
@@ -56,7 +58,7 @@
             %li.person{:id => person.id, :from_aspect_id => aspect.id}
               = person_image_tag(person)
               .name
-                = person.real_name
+                = link_to person.real_name, person
         .yo{:style => 'display:none'}
           %div{:id => "add_request_pane_#{aspect.id}"}
             = render "requests/new_request", :aspect => aspect

app/views/shared/_sub_header.haml

@@ -9,7 +9,7 @@
           - if @aspect == :all
             = link_to "All Aspects", root_path
           - elsif @aspect == :manage
-            = link_to "Manage Aspects", root_path
+            = "Manage Aspects"
           - else
             = link_to @aspect.name, @aspect
 

public/stylesheets/application.css

@@ -520,6 +520,16 @@ h1.big_text {
   .requests h1,
   .remove h1 {
     display: inline-block; }
+  .aspect .tip,
+  .requests .tip,
+  .remove .tip {
+    display: none;
+    color: #999999;
+    margin-left: 0.5em; }
+  .aspect .edit_name_field:hover .tip,
+  .requests .edit_name_field:hover .tip,
+  .remove .edit_name_field:hover .tip {
+    display: inline; }
   .aspect .aspect_name,
   .requests .aspect_name,
   .remove .aspect_name {

public/stylesheets/sass/application.sass

@@ -694,6 +694,19 @@ h1.big_text
   h1
     :display inline-block
 
+  .tip
+    :display none
+    :color #999
+    :margin
+      :left 0.5em
+
+  .edit_name_field:hover
+    .tip
+      :display inline
+
+
+    
+
   .aspect_name
     :position relative