Merge branch 'master' into moderation

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

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index ec6c455b3dcfb24d9ce6fa145e6c731390a01669..d27b47f275f815397cd7315d578bc9c960e51d9d 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,131 +1,87 @@
 module ApplicationHelper
 module ApplicationHelper

-  require 'rexml/document'
-
-  def sanitize(text)
-    Sanitize.clean(text, Sanitize::Config::OSM)
-  end
-
-  def htmlize(text)
-    return linkify(sanitize(simple_format(text)))
-  end
+  require "rexml/document"

 
   def linkify(text)
 
   def linkify(text)

-    return auto_link(text, :link => :urls, :html => { :rel => "nofollow" })
-  end
-
-  def html_escape_unicode(text)
-    chars = ActiveSupport::Multibyte::Chars.u_unpack(text).map do |c|
-      c < 127 ? c.chr : "&##{c.to_s};"
+    if text.html_safe?
+      Rinku.auto_link(text, :urls, tag_options(:rel => "nofollow")).html_safe
+    else
+      Rinku.auto_link(text, :urls, tag_options(:rel => "nofollow"))

     end
     end

-
-    return chars.join("")

   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" });
-  end
-
-  def javascript_strings
-    js = ""
-
-    js << "<script type='text/javascript'>\n"
-    js << "i18n_strings = new Array();\n"
-    js << javascript_strings_for_key("javascripts")
-    js << "</script>\n"
-
-    return js
+    link_to(image_tag("RSS.png", :size => "16x16", :border => 0), Hash[*args], :class => "rsssmall")

   end
 
   def style_rules
     css = ""
 
   end
 
   def style_rules
     css = ""
 

-    css << ".hidden { display: none }";
-    css << ".hide_unless_logged_in { display: none }" unless @user;
-    css << ".hide_if_logged_in { display: none }" if @user;
-    css << ".hide_if_user_#{@user.id} { display: none }" if @user;
-    css << ".show_if_user_#{@user.id} { display: inline }" if @user;
-    css << ".hide_unless_administrator { display: none }" unless @user and @user.administrator?;
+    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?

 
 

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

   end
 
   def if_logged_in(tag = :div, &block)
   end
 
   def if_logged_in(tag = :div, &block)

-    concat(content_tag(tag, capture(&block), :class => "hide_unless_logged_in"))
+    content_tag(tag, capture(&block), :class => "hide_unless_logged_in")

   end
 
   def if_not_logged_in(tag = :div, &block)
   end
 
   def if_not_logged_in(tag = :div, &block)

-    concat(content_tag(tag, capture(&block), :class => "hide_if_logged_in"))
+    content_tag(tag, capture(&block), :class => "hide_if_logged_in")

   end
 
   def if_user(user, tag = :div, &block)
     if user
   end
 
   def if_user(user, tag = :div, &block)
     if user

-      concat(content_tag(tag, capture(&block), :class => "hidden show_if_user_#{user.id}"))
+      content_tag(tag, capture(&block), :class => "hidden show_if_user_#{user.id}")

     end
   end
 
   def unless_user(user, tag = :div, &block)
     if user
     end
   end
 
   def unless_user(user, tag = :div, &block)
     if user

-      concat(content_tag(tag, capture(&block), :class => "hide_if_user_#{user.id}"))
+      content_tag(tag, capture(&block), :class => "hide_if_user_#{user.id}")

     else
     else

-      concat(content_tag(tag, capture(&block)))
+      content_tag(tag, capture(&block))

     end
   end
 
   def if_administrator(tag = :div, &block)
     end
   end
 
   def if_administrator(tag = :div, &block)

-    concat(content_tag(tag, capture(&block), :class => "hide_unless_administrator"))
+    content_tag(tag, capture(&block), :class => "hide_unless_administrator")

   end
 
   end
 

-  def describe_location(lat, lon, zoom = nil, language = nil)
-    zoom = zoom || 14
-    language = language || request.user_preferred_languages.join(',')
-    url = "http://nominatim.openstreetmap.org/reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{language}"
+  def richtext_area(object_name, method, options = {})
+    id = "#{object_name}_#{method}"
+    type = options.delete(:format) || "markdown"

 
 

-    begin
-      response = Timeout::timeout(4) do
-        REXML::Document.new(Net::HTTP.get(URI.parse(url)))
+    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
       end

-    rescue Exception
-      response = nil
-    end

 
 

-    if response and result = response.get_text("reversegeocode/result")
-      result.to_s
-    else
-      "#{number_with_precision(lat, :precision => 3)}, #{number_with_precision(lon, :precision => 3)}"
-    end
-  end
-
-  def user_image(user, options = {})
-    options[:class] ||= "user_image"
-
-    if user.image
-      image_tag url_for_file_column(user, "image"), options
-    else
-      image_tag "anon_large.png", options
-    end
-  end
-
-  def user_thumbnail(user, options = {})
-    options[:class] ||= "user_thumbnail"
-
-    if user.image
-      image_tag url_for_file_column(user, "image"), options
-    else
-      image_tag "anon_small.png", options
+      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
   end
 
     end
   end
 

-  def preferred_editor
-    if params[:editor]
-      params[:editor]
-    elsif @user and @user.preferred_editor
-      @user.preferred_editor
+  def dir
+    if dir = params[:dir]
+      dir == "rtl" ? "rtl" : "ltr"

     else
     else

-      DEFAULT_EDITOR
+      I18n.t("html.dir")

     end
   end
 
     end
   end
 


@@ -133,36 +89,41 @@ module ApplicationHelper
     content_tag(:span, time_ago_in_words(date), :title => l(date, :format => :friendly))
   end
 
     content_tag(:span, time_ago_in_words(date), :title => l(date, :format => :friendly))
   end
 

-  def note_author(object, link_options = {})
-    if object.author.nil?
-      h(object.author_name)
+  def body_class
+    if content_for? :body_class
+      content_for :body_class

     else
     else

-      link_to h(object.author_name), link_options.merge({:controller => "user", :action => "view", :display_name => object.author_name})
+      "#{params[:controller]} #{params[:controller]}-#{params[:action]}"

     end
   end
 
     end
   end
 

-  def with_format(format, &block)
-    old_format = @template_format
-    @template_format = format
-    result = block.call
-    @template_format = old_format
-    return result
+  def current_page_class(path)
+    :current if current_page?(path)

   end
 
   end
 

-private
+  def application_data
+    data = {
+      :locale => I18n.locale,
+      :preferred_editor => preferred_editor
+    }

 
 

-  def javascript_strings_for_key(key)
-    js = ""
-    value = I18n.t(key, :locale => "en")
+    if current_user
+      data[:user] = current_user.id.to_json

 
 

-    if value.is_a?(String)
-      js << "i18n_strings['#{key}'] = '" << escape_javascript(t(key)) << "';\n"
-    else
-      value.each_key do |k|
-        js << javascript_strings_for_key("#{key}.#{k}")
+      unless current_user.home_lon.nil? || current_user.home_lat.nil?
+        data[:user_home] = { :lat => current_user.home_lat, :lon => current_user.home_lon }

       end
     end
 
       end
     end
 

-    return js
+    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
+    end
+
+    data

   end
 end
   end
 end