Merge branch 'master' into openstreetbugs

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

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index b256dac4c8fca11a91a95c16658138b5bb20fa55..b30129c5dd51233a6b66b1ebb44b11e0171df9d1 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -133,6 +133,26 @@ module ApplicationHelper
     end
   end
 
     end
   end
 

+  def friendly_date(date)
+    content_tag(:span, time_ago_in_words(date), :title => l(date, :format => :friendly))
+  end
+
+  def note_author(object, link_options = {})
+    if object.author.nil?
+      h(object.author_name)
+    else
+      link_to h(object.author_name), link_options.merge({:controller => "user", :action => "view", :display_name => object.author_name})
+    end
+  end
+
+  def with_format(format, &block)
+    old_format = @template_format
+    @template_format = format
+    result = block.call
+    @template_format = old_format
+    return result
+  end
+

 private
 
   def javascript_strings_for_key(key)
 private
 
   def javascript_strings_for_key(key)