X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/51195c450d16e35a62bff2bbf6c9dd0923bd0db4..c661bbf7dba69d265ebcd6431d0a4ab8c5d48430:/app/helpers/application_helper.rb?ds=inline diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 3d2c70a13..fcf253289 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,138 +1,78 @@ 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 + require "rexml/document" 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_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 - - 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 rss_link_to(args = {}) + link_to image_tag("RSS.png", :size => "16x16", :class => "align-text-bottom"), args end - def atom_link_to(*args) - return link_to(image_tag("RSS.gif", :size => "16x16", :border => 0), Hash[*args], { :class => "rsssmall" }); - end - - def javascript_strings - js = "" - - js << "\n" - - 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) + def atom_link_to(args = {}) + link_to image_tag("RSS.png", :size => "16x16", :class => "align-text-bottom"), args end - def if_logged_in(tag = :div, &block) - concat(content_tag(tag, capture(&block), :class => "hide_unless_logged_in")) + def dir + if dir = params[:dir] + dir == "rtl" ? "rtl" : "ltr" + else + I18n.t("html.dir") + end end - def if_not_logged_in(tag = :div, &block) - concat(content_tag(tag, capture(&block), :class => "hide_if_logged_in")) + def friendly_date(date) + tag.time(time_ago_in_words(date), :title => l(date, :format => :friendly), :datetime => date.xmlschema) end - def if_user(user, tag = :div, &block) - if user - concat(content_tag(tag, capture(&block), :class => "hidden show_if_user_#{user.id}")) - end + def friendly_date_ago(date) + tag.time(time_ago_in_words(date, :scope => :"datetime.distance_in_words_ago"), :title => l(date, :format => :friendly), :datetime => date.xmlschema) end - def unless_user(user, tag = :div, &block) - if user - concat(content_tag(tag, capture(&block), :class => "hide_if_user_#{user.id}")) + def body_class + if content_for? :body_class + content_for :body_class else - concat(content_tag(tag, capture(&block))) + "#{params[:controller]} #{params[:controller]}-#{params[:action]}" end end - def if_administrator(tag = :div, &block) - concat(content_tag(tag, capture(&block), :class => "hide_unless_administrator")) + def header_nav_link_class(path) + ["nav-link", current_page?(path) ? "text-secondary-emphasis" : "text-secondary"] 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 - else - "#{number_with_precision(lat, :precision => 3)}, #{number_with_precision(lon, :precision => 3)}" - end - end + def application_data + data = { + :locale => I18n.locale, + :preferred_editor => preferred_editor, + :preferred_languages => preferred_languages.expand.map(&:to_s) + } - def user_image(user, options = {}) - options[:class] ||= "user_image" + if current_user + data[:user] = current_user.id.to_json - if user.image - image_tag url_for_file_column(user, "image"), options - else - image_tag "anon_large.png", options + data[:user_home] = { :lat => current_user.home_lat, :lon => current_user.home_lon } if current_user.home_location? end - end - def user_thumbnail(user, options = {}) - options[:class] ||= "user_thumbnail" + data[:location] = session[:location] if session[:location] + data[:oauth_token] = oauth_token.token if oauth_token - if user.image - image_tag url_for_file_column(user, "image"), options - else - image_tag "anon_small.png", options - end + data end -private - - def javascript_strings_for_key(key) - js = "" - value = I18n.t(key, :locale => "en") - - 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