From 177061d1c5b4aa2d36112e50a70148bc6684301d Mon Sep 17 00:00:00 2001
From: danielgrippi <danielgrippi@gmail.com>
Date: Thu, 19 May 2011 13:13:08 -0700
Subject: [PATCH] added via links

---
 app/helpers/stream_helper.rb               | 8 ++++++++
 app/views/shared/_stream_element.html.haml | 9 +++++++--
 config/locales/diaspora/en.yml             | 1 +
 public/stylesheets/sass/application.sass   | 7 +++----
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/app/helpers/stream_helper.rb b/app/helpers/stream_helper.rb
index 3fe8aca2b..f51167ce8 100644
--- a/app/helpers/stream_helper.rb
+++ b/app/helpers/stream_helper.rb
@@ -20,4 +20,12 @@ module StreamHelper
       post.created_at
     end
   end
+
+  def show_link_for post
+    if post.activity_streams?
+      how_long_ago(post)
+    else
+      link_to(how_long_ago(post), status_message_path(post))
+    end
+  end
 end
diff --git a/app/views/shared/_stream_element.html.haml b/app/views/shared/_stream_element.html.haml
index a332c0af9..472a3d196 100644
--- a/app/views/shared/_stream_element.html.haml
+++ b/app/views/shared/_stream_element.html.haml
@@ -24,7 +24,7 @@
         %time.time.timeago{:datetime => post.created_at, :integer => time_for_sort(post).to_i}
 
       - if post.activity_streams?
-        = image_tag post.image_url
+        = link_to image_tag(post.image_url), post.object_url
       - else
         = render 'status_messages/status_message', :post => post, :photos => post.photos
 
@@ -38,8 +38,13 @@
             = aspect_badges(aspects_with_post(all_aspects, post), :link => true)
 
         %span.timeago
-          = link_to(how_long_ago(post), status_message_path(post))
+          = show_link_for post
 
+        %span.via
+          - if post.activity_streams?
+            = t('.via')
+            = link_to("#{post.provider_display_name}", post.actor_url)
+        
         - unless (defined?(@commenting_disabled) && @commenting_disabled)
           |
           %span.like_action
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index fe5df4d3e..7a3895e6b 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -577,6 +577,7 @@ en:
     contact_list:
       all_contacts: "All contacts"
     stream_element:
+      via: "via"
       like: "Like"
       unlike: "Unlike"
       dislike: "Dislike"
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 4fa43021a..c598cfa2e 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -449,12 +449,11 @@ ul.dropdown
         :color $blue
 
 .time,
-.timeago
+.timeago,
+.via
   :color #999
   a
-    :color #ccc
-  :margin
-    :right 1px
+    :color #999
   :text
     :decoration none
   :border none