Merge remote-tracking branch 'upstream/pull/5387'

[rails.git] / app / helpers / trace_helper.rb

diff --git a/app/helpers/trace_helper.rb b/app/helpers/trace_helper.rb
index e5397b0de244528212e8e38b34c7e59c7ae70156..fbbeb3dffb48e376c1aeef5053ef39c166b2950b 100644 (file)
--- a/app/helpers/trace_helper.rb
+++ b/app/helpers/trace_helper.rb
@@ -1,17 +1,21 @@
 module TraceHelper
   def link_to_tag(tag)
-    if @action == "mine"
-      return link_to(tag, :tag => tag, :page => nil)
-    else
-      return link_to(tag, :tag => tag, :display_name => @display_name, :page => nil)
-    end
+    link_to(tag, :tag => tag, :page => nil)
   end
 
-  def link_to_page(page)
-    if @action == "mine"
-      return link_to(page, :tag => @tag, :page => page)
-    else
-      return link_to(page, :tag => @tag, :display_name => @display_name, :page => page)
-    end
+  def trace_icon(trace, options = {})
+    options[:class] ||= "trace_image"
+    options[:alt] ||= ""
+
+    image_tag trace_icon_path(trace.user, trace),
+              options.merge(:size => 50)
+  end
+
+  def trace_picture(trace, options = {})
+    options[:class] ||= "trace_image"
+    options[:alt] ||= ""
+
+    image_tag trace_picture_path(trace.user, trace),
+              options.merge(:size => 250)
   end
 end