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

app/models/user.rb

@@ -64,7 +64,7 @@ class User
 
   #after_create :seed_aspects
 
-  before_destroy :unfriend_everyone, :remove_person, :remove_all_aspects
+  before_destroy :unfriend_everyone, :remove_person
 
   def strip_username
     if username.present?
@@ -436,8 +436,4 @@ class User
       end
     }
   end
-  
-  def remove_all_aspects
-    aspects.destroy_all
-  end
 end

app/views/layouts/application.html.haml

@@ -62,5 +62,5 @@
       .span-24.last
         = yield
 
-      .span-19.prepend-5.last
+      .span-24.last
         = render "posts/debug"

app/views/photos/_photo.haml

@@ -27,8 +27,7 @@
 
     %br
     %br
-    = render "albums/album", :post => post.album, :current_user => current_user
-    = link_to (image_tag post.url(:thumb_medium)), object_path(post)
+    = link_to (image_tag post.url(:thumb_large)), object_path(post)
 
     .info
       %span.time= link_to(how_long_ago(post), photo_path(post))

app/views/status_messages/show.html.haml

@@ -2,14 +2,22 @@
 -#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
-%h1
-  = link_to @status_message.person.real_name, @status_message.person
-  = @status_message.message
+.span-14.append-1.last
+  #stream
+    %h1.show_text
+      = person_image_link(@status_message.person)
+      = link_to @status_message.person.real_name, @status_message.person
+      = make_links(@status_message.message)
 
-%h4= "#{t('.comments')} (#{@status_message.comments.count})"
+  = "Posted #{how_long_ago(@status_message)} to"
+  - for aspect in current_user.aspects_with_post( @status_message.id )
+    = link_to aspect.name, aspect
 
-= render "comments/comments", :post => @status_message
-
-%p
   - if current_user.owns? @status_message
-    = link_to t('.destroy'), @status_message, :confirm => t('are_you_sure?'), :method => :delete
+    %p
+      = link_to t('.destroy'), @status_message, :confirm => t('.are_you_sure'), :method => :delete
+
+.span-9.last
+  #stream.show
+    %li.message{:id => @status_message.id}
+      = render "comments/comments", :post => @status_message

public/stylesheets/sass/application.sass

@@ -179,14 +179,13 @@ header
     :margin
       :left 425px
 
-ul#stream
+#stream
   :margin 0
   :padding 0
   > li
     :min-height 50px
     :list-style none
     :padding 12px 0
-      :right 12px
     :border
       :bottom 1px solid #eee
 
@@ -404,6 +403,20 @@ form
       :margin
         :right 1em
 
+#stream.show
+  div.comments
+    :display block
+    ul.comment_set
+      :margin
+        :top 0
+  > li
+    :border none
+    :padding 0
+  &:hover
+    > li
+      :background none
+      :border none
+    
 
 #stream div.comments
   :display none
@@ -1066,3 +1079,7 @@ header
     :font
       :size small
 
+.show_text
+  img
+    :height 27px
+    :width 27px