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 c24e7ff5be26b7a504c620ede19ea95d66ba30b5..59ba7d171afd76c190b95da4b465fd6ad3d2d4bd 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -50,7 +50,7 @@ module ApplicationHelper
     css << ".show_if_user_#{@user.id} { display: inline }" if @user;
     css << ".hide_unless_administrator { display: none }" unless @user and @user.administrator?;
 
-    return content_tag(:style, css)
+    return content_tag(:style, css, :type => "text/css")
   end
 
   def if_logged_in(tag = :div, &block)
@@ -129,6 +129,10 @@ module ApplicationHelper
     end
   end
 
+  def friendly_date(date)
+    content_tag(:span, time_ago_in_words(date), :title => l(date, :format => :friendly))
+  end
+
 private
 
   def javascript_strings_for_key(key)