X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/75f12f5b18d6965f767b5a4d5195c35901ed5c68..31af63f273277a66d11488cdf9cde17f896682d7:/app/helpers/application_helper.rb diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index b256dac4c..3213c5e4c 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,14 +1,6 @@ module ApplicationHelper require 'rexml/document' - def sanitize(text) - Sanitize.clean(text, Sanitize::Config::OSM).html_safe - end - - def htmlize(text) - 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 @@ -83,53 +75,35 @@ module ApplicationHelper content_tag(tag, capture(&block), :class => "hide_unless_administrator") 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}" - - begin - response = Timeout::timeout(4) do - REXML::Document.new(Net::HTTP.get(URI.parse(url))) - end - rescue Exception - response = nil - end - - if response and result = response.get_text("reversegeocode/result") - result.to_s + def preferred_editor + if params[:editor] + params[:editor] + elsif @user and @user.preferred_editor + @user.preferred_editor else - "#{number_with_precision(lat, :precision => 3)}, #{number_with_precision(lon, :precision => 3)}" + DEFAULT_EDITOR 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 + def scale_to_zoom(scale) + Math.log(360.0 / (scale.to_f * 512.0)) / Math.log(2.0) end - def user_thumbnail(user, options = {}) - options[:class] ||= "user_thumbnail" + def richtext_area(object_name, method, options = {}) + id = "#{object_name.to_s}_#{method.to_s}" + format = options.delete(:format) || "markdown" - if user.image - image_tag url_for_file_column(user, "image"), options - else - image_tag "anon_small.png", options - end - end + 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 - def preferred_editor - if params[:editor] - params[:editor] - elsif @user and @user.preferred_editor - @user.preferred_editor - else - DEFAULT_EDITOR + 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