Merge branch 'master' into notes

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

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 49608c4a0d42a9df70e3f2c6b7bbac4bb05d38b3..9676e6ee16a234d9255175367850e19381cf0481 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -95,4 +95,16 @@ module ApplicationHelper
       I18n.t("html.dir")
     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?
+      ""
+    else
+      link_to h(object.author.display_name), link_options.merge({:controller => "user", :action => "view", :display_name => object.author.display_name})
+    end
+  end
 end