X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/72984673067a37a1ea687709a33b18263f850633..0e7324839b2f1cd6a2d07be073ae14dfbf611beb:/app/helpers/application_helper.rb?ds=sidebyside

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 2ccfcca2b..59ba7d171 100644
--- 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)
@@ -119,6 +119,20 @@ module ApplicationHelper
     end
   end
 
+  def preferred_editor
+    if params[:editor]
+      params[:editor]
+    elsif @user and @user.preferred_editor
+      @user.preferred_editor
+    else
+      DEFAULT_EDITOR
+    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)