X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/02ad2f5a5192404185d00ec1b53ae2982760c0ea..32104684f7fe70bac494ede1f7249a6cf19a63ec:/app/helpers/application_helper.rb?ds=sidebyside diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 5fa021bcf..bb09f3a49 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,99 +1,77 @@ module ApplicationHelper - require 'rexml/document' + require "rexml/document" - def sanitize(text) - Sanitize.clean(text, Sanitize::Config::OSM) + def linkify(text) + if text.html_safe? + Rinku.auto_link(text, :urls, tag_builder.tag_options(:rel => "nofollow")).html_safe + else + Rinku.auto_link(ERB::Util.h(text), :urls, tag_builder.tag_options(:rel => "nofollow")).html_safe + end end - def htmlize(text) - return linkify(sanitize(simple_format(text))) + def rss_link_to(args = {}) + link_to(image_tag("RSS.png", :size => "16x16", :border => 0), args, :class => "rsssmall") end - def linkify(text) - return auto_link(text, :link => :urls, :html => { :rel => "nofollow" }) + def atom_link_to(args = {}) + link_to(image_tag("RSS.png", :size => "16x16", :border => 0), args, :class => "rsssmall") end - def html_escape_unicode(text) - chars = ActiveSupport::Multibyte::Chars.u_unpack(text).map do |c| - c < 127 ? c.chr : "&##{c.to_s};" + def dir + if dir = params[:dir] + dir == "rtl" ? "rtl" : "ltr" + else + I18n.t("html.dir") end - - return chars.join("") end - def rss_link_to(*args) - return link_to(image_tag("RSS.gif", :size => "16x16", :border => 0), Hash[*args], { :class => "rsssmall" }); + def friendly_date(date) + tag.span(time_ago_in_words(date), :title => l(date, :format => :friendly)) end - def atom_link_to(*args) - return link_to(image_tag("RSS.gif", :size => "16x16", :border => 0), Hash[*args], { :class => "rsssmall" }); + def friendly_date_ago(date) + tag.span(time_ago_in_words(date, :scope => :"datetime.distance_in_words_ago"), :title => l(date, :format => :friendly)) end - def javascript_strings - js = "" - - js << "\n" - - return js - 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 - Timeout::timeout(4) do - response = 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 body_class + if content_for? :body_class + content_for :body_class else - "#{number_with_precision(lat, :precision => 3)}, #{number_with_precision(lon, :precision => 3)}" + "#{params[:controller]} #{params[:controller]}-#{params[:action]}" 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 current_page_class(path) + :current if current_page?(path) end - def user_thumbnail(user, options = {}) - options[:class] ||= "user_thumbnail" + def application_data + data = { + :locale => I18n.locale, + :preferred_editor => preferred_editor + } - if user.image - image_tag url_for_file_column(user, "image"), options - else - image_tag "anon_small.png", options + if current_user + data[:user] = current_user.id.to_json + + data[:user_home] = { :lat => current_user.home_lat, :lon => current_user.home_lon } unless current_user.home_lon.nil? || current_user.home_lat.nil? end - end -private + data[:location] = session[:location] if session[:location] + data[:oauth_token] = oauth_token.token if oauth_token - def javascript_strings_for_key(key) - js = "" - value = I18n.t(key, :locale => "en") + data + end - if value.is_a?(String) - js << "i18n_strings['#{key}'] = '" << escape_javascript(t(key)) << "';\n" + # If the flash is a hash, then it will be a partial with a hash of locals, so we can call `render` on that + # This allows us to render html into a flash message in a safe manner. + def render_flash(flash) + if flash.is_a?(Hash) + render flash.with_indifferent_access else - value.each_key do |k| - js << javascript_strings_for_key("#{key}.#{k}") - end + flash end - - return js + rescue StandardError + flash.inspect if Rails.env.development? end end