Get the note browse pages into a vaguely working state

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

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index ca26cfd4846aa59dfd258164146372302daf7afc..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?;
 
     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)
   end
 
   def if_logged_in(tag = :div, &block)


@@ -120,13 +120,19 @@ module ApplicationHelper
   end
 
   def preferred_editor
   end
 
   def preferred_editor

-    if @user and @user.preferred_editor
+    if params[:editor]
+      params[:editor]
+    elsif @user and @user.preferred_editor

       @user.preferred_editor
     else
       DEFAULT_EDITOR
     end
   end
 
       @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)
 private
 
   def javascript_strings_for_key(key)