Merge remote-tracking branch 'upstream/pull/3217'

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

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index adcf5c6c011ec6fdcc31821b2c0af3b74065c083..ae90d980e81bc3de61da28000617f6103af3551d 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -5,74 +5,16 @@ 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
 
-  def rss_link_to(*args)
-    link_to(image_tag("RSS.png", :size => "16x16", :border => 0), Hash[*args], :class => "rsssmall")
+  def rss_link_to(args = {})
+    link_to(image_tag("RSS.png", :size => "16x16", :border => 0), args, :class => "rsssmall")
   end
 
-  def atom_link_to(*args)
-    link_to(image_tag("RSS.png", :size => "16x16", :border => 0), Hash[*args], :class => "rsssmall")
-  end
-
-  def style_rules
-    css = ""
-
-    css << ".hidden { display: none !important }"
-    css << ".hide_unless_logged_in { display: none !important }" unless current_user
-    css << ".hide_if_logged_in { display: none !important }" if current_user
-    css << ".hide_if_user_#{current_user.id} { display: none !important }" if current_user
-    css << ".show_if_user_#{current_user.id} { display: inline !important }" if current_user
-    css << ".hide_unless_administrator { display: none !important }" unless current_user && current_user.administrator?
-    css << ".hide_unless_moderator { display: none !important }" unless current_user && current_user.moderator?
-
-    content_tag(:style, css, :type => "text/css")
-  end
-
-  def if_logged_in(tag = :div, &block)
-    content_tag(tag, capture(&block), :class => "hide_unless_logged_in")
-  end
-
-  def if_not_logged_in(tag = :div, &block)
-    content_tag(tag, capture(&block), :class => "hide_if_logged_in")
-  end
-
-  def if_user(user, tag = :div, &block)
-    content_tag(tag, capture(&block), :class => "hidden show_if_user_#{user.id}") if user
-  end
-
-  def unless_user(user, tag = :div, &block)
-    if user
-      content_tag(tag, capture(&block), :class => "hide_if_user_#{user.id}")
-    else
-      content_tag(tag, capture(&block))
-    end
-  end
-
-  def if_administrator(tag = :div, &block)
-    content_tag(tag, capture(&block), :class => "hide_unless_administrator")
-  end
-
-  def richtext_area(object_name, method, options = {})
-    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
-        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")
-      end
-
-      output_buffer << content_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 << 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
-      end
-    end
+  def atom_link_to(args = {})
+    link_to(image_tag("RSS.png", :size => "16x16", :border => 0), args, :class => "rsssmall")
   end
 
   def dir
@@ -84,7 +26,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
@@ -113,11 +59,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