diff options
| author | Raphael Sofaer <raphael@joindiaspora.com> | 2011-07-29 00:03:06 +0400 |
|---|---|---|
| committer | Raphael Sofaer <raphael@joindiaspora.com> | 2011-07-29 00:03:06 +0400 |
| commit | 37bb64122765dda83b08212a8d0c743272e4a51f (patch) | |
| tree | 37bb99194589aeb9a4923a0a4e764223910a0e29 /app | |
| parent | 4fa5731d5eac0d7abd7d3347bc6f1a93fd29dbe9 (diff) | |
| parent | bbf28f9072261cdc58308adab267cea408da1207 (diff) | |
Merge branch 'master' of github.com:diaspora/diaspora
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/reshares/_reshare.mobile.haml | 23 | ||||
| -rw-r--r-- | app/views/shared/_stream_element.mobile.haml | 2 |
2 files changed, 25 insertions, 0 deletions
diff --git a/app/views/reshares/_reshare.mobile.haml b/app/views/reshares/_reshare.mobile.haml new file mode 100644 index 000000000..77b0abd3a --- /dev/null +++ b/app/views/reshares/_reshare.mobile.haml @@ -0,0 +1,23 @@ +-# 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') diff --git a/app/views/shared/_stream_element.mobile.haml b/app/views/shared/_stream_element.mobile.haml index 1dedad9e6..b7dfc0f30 100644 --- a/app/views/shared/_stream_element.mobile.haml +++ b/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 |