Don't try and fix the height of the search box

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

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index b77ac87215351fac98b7198179db05d9c4003e9d..37dcf90e09de1c97e4ae4d62dfa96fb79f0b3860 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,22 +1,6 @@
 module ApplicationHelper
   require 'rexml/document'
 
 module ApplicationHelper
   require 'rexml/document'
 

-  def sanitize(text)
-    Sanitize.clean(text, Sanitize::Config::OSM)
-  end
-
-  def htmlize(text)
-    logger.info "text safety is #{text.html_safe?}"
-    r = simple_format(text)
-    logger.info "formatted text safety is #{r.html_safe?}"
-    r = sanitize(r)
-    logger.info "sanitised text safety is #{r.html_safe?}"
-    r = linkify(r)
-    logger.info "linkified text safety is #{r.html_safe?}"
-    return r
-#    return linkify(sanitize(simple_format(text)))
-  end
-

   def linkify(text)
     if text.html_safe?
       Rinku.auto_link(text, :urls, tag_options(:rel => "nofollow")).html_safe
   def linkify(text)
     if text.html_safe?
       Rinku.auto_link(text, :urls, tag_options(:rel => "nofollow")).html_safe


@@ -97,7 +81,7 @@ module ApplicationHelper
     url = "http://nominatim.openstreetmap.org/reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{language}"
 
     begin
     url = "http://nominatim.openstreetmap.org/reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{language}"
 
     begin

-      response = Timeout::timeout(4) do
+      response = OSM::Timer.timeout(4) do

         REXML::Document.new(Net::HTTP.get(URI.parse(url)))
       end
     rescue Exception
         REXML::Document.new(Net::HTTP.get(URI.parse(url)))
       end
     rescue Exception


@@ -114,21 +98,13 @@ module ApplicationHelper
   def user_image(user, options = {})
     options[:class] ||= "user_image"
 
   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
+    image_tag user.image.url(:large), options

   end
 
   def user_thumbnail(user, options = {})
     options[:class] ||= "user_thumbnail"
 
   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
-    end
+    image_tag user.image.url(:small), options

   end
 
   def preferred_editor
   end
 
   def preferred_editor


@@ -141,6 +117,28 @@ module ApplicationHelper
     end
   end
 
     end
   end
 

+  def scale_to_zoom(scale)
+    Math.log(360.0 / (scale.to_f * 512.0)) / Math.log(2.0)
+  end
+
+  def richtext_area(object_name, method, options = {})
+    id = "#{object_name.to_s}_#{method.to_s}"
+    format = 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(:format => format)))
+        output_buffer << content_tag(:div, "", :id => "#{id}_preview", :class => "richtext_preview")
+      end
+
+      output_buffer << content_tag(:div, :id => "#{id}_help", :class => "richtext_help") do
+        output_buffer << render("site/#{format}_help")
+        output_buffer << submit_tag(I18n.t("site.richtext_area.edit"), :id => "#{id}_doedit", :class => "richtext_doedit", :disabled => true)
+        output_buffer << submit_tag(I18n.t("site.richtext_area.preview"), :id => "#{id}_dopreview", :class => "richtext_dopreview")
+      end
+    end
+  end
+

 private
 
   def javascript_strings_for_key(key)
 private
 
   def javascript_strings_for_key(key)