Use boolean instead of string for hiding labels

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

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index c78c3ea46423227e62db5a69b01633c714f0cb68..db8b51f5cd9e7f7d30b904bf3cd227913c128113 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -5,7 +5,7 @@ module ApplicationHelper
     if text.html_safe?
       Rinku.auto_link(text, :urls, tag_builder.tag_options(:rel => "nofollow")).html_safe
     else
-      Rinku.auto_link(text, :urls, tag_builder.tag_options(:rel => "nofollow"))
+      Rinku.auto_link(ERB::Util.h(text), :urls, tag_builder.tag_options(:rel => "nofollow")).html_safe
     end
   end
 
@@ -21,15 +21,15 @@ module ApplicationHelper
     id = "#{object_name}_#{method}"
     type = options.delete(:format) || "markdown"
 
-    content_tag(:div, :id => "#{id}_container", :class => "richtext_container") do
-      output_buffer << content_tag(:div, :id => "#{id}_content", :class => "richtext_content") do
+    tag.div(:id => "#{id}_container", :class => "richtext_container") do
+      output_buffer << tag.div(:id => "#{id}_content", :class => "richtext_content") do
         output_buffer << text_area(object_name, method, options.merge("data-preview-url" => preview_url(:type => type)))
-        output_buffer << content_tag(:div, "", :id => "#{id}_preview", :class => "richtext_preview richtext")
+        output_buffer << tag.div("", :id => "#{id}_preview", :class => "richtext_preview richtext text-break")
       end
 
-      output_buffer << content_tag(:div, :id => "#{id}_help", :class => "richtext_help") do
+      output_buffer << tag.div(:id => "#{id}_help", :class => "richtext_help") do
         output_buffer << render("site/#{type}_help")
-        output_buffer << content_tag(:div, :class => "buttons") do
+        output_buffer << tag.div(:class => "buttons") do
           output_buffer << submit_tag(I18n.t("site.richtext_area.edit"), :id => "#{id}_doedit", :class => "richtext_doedit deemphasize", :disabled => true)
           output_buffer << submit_tag(I18n.t("site.richtext_area.preview"), :id => "#{id}_dopreview", :class => "richtext_dopreview deemphasize")
         end
@@ -46,7 +46,11 @@ module ApplicationHelper
   end
 
   def friendly_date(date)
-    content_tag(:span, time_ago_in_words(date), :title => l(date, :format => :friendly))
+    tag.span(time_ago_in_words(date), :title => l(date, :format => :friendly))
+  end
+
+  def friendly_date_ago(date)
+    tag.span(time_ago_in_words(date, :scope => :'datetime.distance_in_words_ago'), :title => l(date, :format => :friendly))
   end
 
   def body_class
@@ -75,11 +79,11 @@ module ApplicationHelper
 
     data[:location] = session[:location] if session[:location]
 
-    if @oauth
-      data[:token] = @oauth.token
-      data[:token_secret] = @oauth.secret
-      data[:consumer_key] = @oauth.client_application.key
-      data[:consumer_secret] = @oauth.client_application.secret
+    if oauth_token
+      data[:token] = oauth_token.token
+      data[:token_secret] = oauth_token.secret
+      data[:consumer_key] = oauth_token.client_application.key
+      data[:consumer_secret] = oauth_token.client_application.secret
     end
 
     data