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

app/views/reshares/_reshare.mobile.haml

+-#   Copyright (c) 2010, Diaspora Inc.  This file is
+-#   licensed under the Affero General Public License version 3 or later.  See
+-#   the COPYRIGHT file.
+
+
+.reshare
+  - if post
+    .content
+      .from
+        = person_link(post.author, :class => "hovercardable")
+             
+
+      - if post.activity_streams?
+        = link_to image_tag(post.image_url, 'data-small-photo' => post.image_url, 'data-full-photo' => post.image_url, :class => 'stream-photo'), post.object_url, :class => "stream-photo-link"
+      - else
+        = render 'status_messages/status_message', :post => post, :photos => post.photos
+      - if defined?(current_user) && current_user && (post.author_id != current_user.person.id) && (post.public?) && !reshare?(post)
+        .reshare_action
+          = reshare_link(post)
+          = link_to t(".show_original"), post_path(post)
+
+  - else
+    = t('.deleted')

app/views/shared/_stream_element.mobile.haml

@@ -11,6 +11,8 @@
 
     - if post.activity_streams?
       = image_tag post.image_url
+    - elsif reshare?(post)
+      = render 'reshares/reshare', :reshare => post, :post => post.root
     - else
       = render 'status_messages/status_message', :post => post, :photos => post.photos
 

public/stylesheets/sass/mobile.sass

@@ -125,6 +125,18 @@ a
   p
     :margin 0 auto
     :line-height 1.4em
+    
+.reshare
+  .content
+    :padding
+      :left 15px
+      :top 10px
+    .from
+      :font
+        :style italic
+  .reshare_action
+    :font
+      :size 0.8em
 
 .comment
   :padding