X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3e8d8092500a3713e8dfbb4fd61fd8a95d067d20..9e6e6c2e231514e7b2eb96dacb0e5cc88fdd2abb:/app/helpers/application_helper.rb?ds=inline diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 7a4953f0f..c24e7ff5b 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,6 +1,10 @@ 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 @@ -36,13 +40,59 @@ module ApplicationHelper return js 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?; + + return content_tag(:style, css) + end + + def if_logged_in(tag = :div, &block) + concat(content_tag(tag, capture(&block), :class => "hide_unless_logged_in")) + end + + def if_not_logged_in(tag = :div, &block) + concat(content_tag(tag, capture(&block), :class => "hide_if_logged_in")) + end + + def if_user(user, tag = :div, &block) + if user + concat(content_tag(tag, capture(&block), :class => "hidden show_if_user_#{user.id}")) + end + end + + def unless_user(user, tag = :div, &block) + if user + concat(content_tag(tag, capture(&block), :class => "hide_if_user_#{user.id}")) + else + concat(content_tag(tag, capture(&block))) + end + end + + def if_administrator(tag = :div, &block) + concat(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}" - response = REXML::Document.new(Net::HTTP.get(URI.parse(url))) - if result = response.get_text("reversegeocode/result") + 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 else "#{number_with_precision(lat, :precision => 3)}, #{number_with_precision(lon, :precision => 3)}" @@ -69,11 +119,21 @@ module ApplicationHelper end end + def preferred_editor + if params[:editor] + params[:editor] + elsif @user and @user.preferred_editor + @user.preferred_editor + else + DEFAULT_EDITOR + end + end + private def javascript_strings_for_key(key) js = "" - value = t(key, :locale => "en") + value = I18n.t(key, :locale => "en") if value.is_a?(String) js << "i18n_strings['#{key}'] = '" << escape_javascript(t(key)) << "';\n"