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

app/views/js/_websocket_js.haml

@@ -37,7 +37,7 @@
 
   });
   function processRetraction(post_id){
-    $('#' + post_id ).fadeOut(500).remove();
+    $("*[data-guid='"+post_id+"']").fadeOut(400, function(){$(this).remove()});
     if($("#stream")[0].childElementCount == 0){
       $("#no_posts").fadeIn(200);
     }

app/views/photos/_photo.haml

@@ -2,7 +2,7 @@
 -#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
-%li.message{:id => post.id}
+%li.message{:data=>{:guid=>post.id}}
 
   = person_image_tag(post.person)
 
@@ -20,7 +20,7 @@
 
       - if current_user.owns?(post)
         .right
-          = link_to t('.delete'), status_message_path(post), :confirm => t('.are_you_sure'), :method => :delete, :remote => true, :class => "delete"
+          = link_to t('.delete'), photo_path(post), :confirm => t('.are_you_sure'), :method => :delete, :remote => true, :class => "delete"
 
     =t('.posted_a_new_photo_to')
     = link_to post.album.name, object_path(post.album)

app/views/photos/show.html.haml

@@ -76,9 +76,13 @@
 
   %div{:id => @photo.id}
     #show_photo
-      .edit_pane
-        .controls{:data=>{:actor=>"#{@photo.person.owner.id}",:actor_person=>"#{@photo.person.id}",:image_url=>"#{@photo.url(:thumb_medium)}"}}
-          = link_to 'make profile photo', '#', :class => "make_profile_photo"
+
+      -if current_user.owns? @photo
+        .edit_pane
+          .controls{:data=>{:actor=>"#{@photo.person.owner.id}",:actor_person=>"#{@photo.person.id}",:image_url=>"#{@photo.url(:thumb_medium)}"}}
+            = link_to 'make profile photo', '#', :class => "make_profile_photo"
+          = linked_scaled_photo @photo, @album
+      -else
         = linked_scaled_photo @photo, @album
       .caption
         -if current_user.owns? @photo

app/views/status_messages/_status_message.html.haml

@@ -2,7 +2,7 @@
 -#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
-%li.message{:id => post.id, :class => ("mine" if current_user.owns?(post))}
+%li.message{ :data=>{:guid=>post.id}, :class => ("mine" if current_user.owns?(post))}
 
   = person_image_link(post.person)
 

public/stylesheets/sass/application.sass

@@ -108,6 +108,7 @@ header
     :color #333
   :padding 0
     :top 5px
+  :color #CCC
 
   a
     :color #CCC
@@ -125,8 +126,10 @@ header
     :color #fff
 
   ul#user_menu
-    a
-      :text-shadow 0 1px 0 #000
+    :overflow hidden
+    :white-space nowrap
+    :text-overflow ellipsis
+    :text-shadow 0 1px 0 #000
 
     :width 100px