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

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

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 0107372459a7e0a4a98f450b556178e818259392..2c8b00c17460504ddb49319b6506992a25e2be20 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,41 +1,91 @@
 module ApplicationHelper
 module ApplicationHelper

-  def htmlize(text)
-    return sanitize(auto_link(simple_format(text), :urls))
+  require "rexml/document"
+
+  def linkify(text)
+    if text.html_safe?
+      Rinku.auto_link(text, :urls, tag_builder.tag_options(:rel => "nofollow")).html_safe
+    else
+      Rinku.auto_link(ERB::Util.h(text), :urls, tag_builder.tag_options(:rel => "nofollow")).html_safe
+    end

   end
 
   def rss_link_to(*args)
   end
 
   def rss_link_to(*args)

-    return link_to(image_tag("RSS.gif", :size => "16x16", :border => 0), Hash[*args], { :class => "rsssmall" });
+    link_to(image_tag("RSS.png", :size => "16x16", :border => 0), Hash[*args], :class => "rsssmall")

   end
 
   def atom_link_to(*args)
   end
 
   def atom_link_to(*args)

-    return link_to(image_tag("RSS.gif", :size => "16x16", :border => 0), Hash[*args], { :class => "rsssmall" });
+    link_to(image_tag("RSS.png", :size => "16x16", :border => 0), Hash[*args], :class => "rsssmall")

   end
 
   end
 

-  def javascript_strings
-    js = ""
+  def richtext_area(object_name, method, options = {})
+    id = "#{object_name}_#{method}"
+    type = options.delete(:format) || "markdown"

 
 

-    js << "<script type='text/javascript'>\n"
-    js << "rails_i18n = new Array();\n"
-    js << javascript_strings_for_key("javascripts")
-    js << "</script>\n"
+    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 << tag.div("", :id => "#{id}_preview", :class => "richtext_preview richtext")
+      end
+
+      output_buffer << tag.div(:id => "#{id}_help", :class => "richtext_help") do
+        output_buffer << render("site/#{type}_help")
+        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
+      end
+    end
+  end

 
 

-    return js
+  def dir
+    if dir = params[:dir]
+      dir == "rtl" ? "rtl" : "ltr"
+    else
+      I18n.t("html.dir")
+    end

   end
 
   end
 

-private
+  def friendly_date(date)
+    tag.span(time_ago_in_words(date), :title => l(date, :format => :friendly))
+  end

 
 

-  def javascript_strings_for_key(key)
-    js = ""
-    value = t(key)
+  def friendly_date_ago(date)
+    tag.span(time_ago_in_words(date, :scope => :'datetime.distance_in_words_ago'), :title => l(date, :format => :friendly))
+  end

 
 

-    if value.is_a?(String)
-      js << "rails_i18n['#{key}'] = '" << escape_javascript(value) << "';\n"
+  def body_class
+    if content_for? :body_class
+      content_for :body_class

     else
     else

-      value.each_key do |k|
-        js << javascript_strings_for_key("#{key}.#{k}")
-      end
+      "#{params[:controller]} #{params[:controller]}-#{params[:action]}"
+    end
+  end
+
+  def current_page_class(path)
+    :current if current_page?(path)
+  end
+
+  def application_data
+    data = {
+      :locale => I18n.locale,
+      :preferred_editor => preferred_editor
+    }
+
+    if current_user
+      data[:user] = current_user.id.to_json
+
+      data[:user_home] = { :lat => current_user.home_lat, :lon => current_user.home_lon } unless current_user.home_lon.nil? || current_user.home_lat.nil?
+    end
+
+    data[:location] = session[:location] if session[:location]
+
+    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
 
     end
 

-    return js
+    data

   end
 end
   end
 end