X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/81f5c72c76f36e7c712bac0ad54b37d945caa51f..605c700895e291fe88ba5821ab3c4ebbd829ad52:/app/helpers/application_helper.rb diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 5fa021bcf..e0c299ca5 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,24 +1,12 @@ 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 - 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 - - return chars.join("") end def rss_link_to(*args) @@ -29,71 +17,74 @@ module ApplicationHelper return link_to(image_tag("RSS.gif", :size => "16x16", :border => 0), Hash[*args], { :class => "rsssmall" }); end - def javascript_strings - js = "" + def style_rules + css = "" - js << "\n" + 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?; - return js + return content_tag(:style, css, :type => "text/css") 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 if_logged_in(tag = :div, &block) + content_tag(tag, capture(&block), :class => "hide_unless_logged_in") + end - begin - Timeout::timeout(4) do - response = REXML::Document.new(Net::HTTP.get(URI.parse(url))) - end - rescue Exception - response = nil - end + def if_not_logged_in(tag = :div, &block) + content_tag(tag, capture(&block), :class => "hide_if_logged_in") + 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)}" + def if_user(user, tag = :div, &block) + if user + content_tag(tag, capture(&block), :class => "hidden show_if_user_#{user.id}") end end - def user_image(user, options = {}) - options[:class] ||= "user_image" - - if user.image - image_tag url_for_file_column(user, "image"), options + def unless_user(user, tag = :div, &block) + if user + content_tag(tag, capture(&block), :class => "hide_if_user_#{user.id}") else - image_tag "anon_large.png", options + content_tag(tag, capture(&block)) end end - def user_thumbnail(user, options = {}) - options[:class] ||= "user_thumbnail" + def if_administrator(tag = :div, &block) + content_tag(tag, capture(&block), :class => "hide_unless_administrator") + end - if user.image - image_tag url_for_file_column(user, "image"), options + def preferred_editor + if params[:editor] + params[:editor] + elsif @user and @user.preferred_editor + @user.preferred_editor else - image_tag "anon_small.png", options + DEFAULT_EDITOR end end -private + def scale_to_zoom(scale) + Math.log(360.0 / (scale.to_f * 512.0)) / Math.log(2.0) + end - def javascript_strings_for_key(key) - js = "" - value = I18n.t(key, :locale => "en") + def richtext_area(object_name, method, options = {}) + id = "#{object_name.to_s}_#{method.to_s}" + format = options.delete(:format) || "markdown" - 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}") + 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 - end - return js + 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 end