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 f0c0ccbd5e27d18c7441cc9b6d3758ae6457c19f..b91710b9c6f3dfa86df5cfc82532b00294adf1f7 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -26,6 +26,7 @@ module ApplicationHelper
     css << ".hide_if_user_#{@user.id} { display: none !important }" if @user;
     css << ".show_if_user_#{@user.id} { display: inline !important }" if @user;
     css << ".hide_unless_administrator { display: none !important }" unless @user and @user.administrator?;
     css << ".hide_if_user_#{@user.id} { display: none !important }" if @user;
     css << ".show_if_user_#{@user.id} { display: inline !important }" if @user;
     css << ".hide_unless_administrator { display: none !important }" unless @user and @user.administrator?;

+    css << ".hide_unless_moderator { display: none !important }" unless @user and @user.moderator?;

 
     return content_tag(:style, css, :type => "text/css")
   end
 
     return content_tag(:style, css, :type => "text/css")
   end


@@ -77,7 +78,7 @@ module ApplicationHelper
     content_tag(:div, :id => "#{id}_container", :class => "richtext_container") do
       output_buffer << content_tag(:div, :id => "#{id}_content", :class => "richtext_content") do
         output_buffer << text_area(object_name, method, options.merge("data-preview-url" => preview_url(:format => format)))
     content_tag(:div, :id => "#{id}_container", :class => "richtext_container") do
       output_buffer << content_tag(:div, :id => "#{id}_content", :class => "richtext_content") do
         output_buffer << text_area(object_name, method, options.merge("data-preview-url" => preview_url(:format => format)))

-        output_buffer << content_tag(:div, "", :id => "#{id}_preview", :class => "richtext_preview")
+        output_buffer << content_tag(:div, "", :id => "#{id}_preview", :class => "richtext_preview richtext")

       end
 
       output_buffer << content_tag(:div, :id => "#{id}_help", :class => "richtext_help") do
       end
 
       output_buffer << content_tag(:div, :id => "#{id}_help", :class => "richtext_help") do


@@ -95,4 +96,8 @@ module ApplicationHelper
       I18n.t("html.dir")
     end
   end
       I18n.t("html.dir")
     end
   end

+
+  def friendly_date(date)
+    content_tag(:span, time_ago_in_words(date), :title => l(date, :format => :friendly))
+  end

 end
 end