X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5ff9f2d21c82a9ebe06be748a37de764d0861514..85d17f257c338f668a1d17d9fc62a2f48ec84230:/app/helpers/application_helper.rb?ds=sidebyside diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 6e2ecd323..f4b900017 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -2,7 +2,7 @@ module ApplicationHelper require 'rexml/document' def sanitize(text) - Sanitize.clean(text, Sanitize::Config::OSM) + Sanitize.clean(text, Sanitize::Config::OSM).html_safe end def htmlize(text) @@ -10,11 +10,15 @@ module ApplicationHelper end def linkify(text) - return auto_link(text, :link => :urls, :html => { :rel => "nofollow" }) + 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 end def html_escape_unicode(text) - chars = ActiveSupport::Multibyte::Chars.u_unpack(text).map do |c| + chars = ActiveSupport::Multibyte::Unicode.u_unpack(text).map do |c| c < 127 ? c.chr : "&##{c.to_s};" end @@ -37,7 +41,7 @@ module ApplicationHelper js << javascript_strings_for_key("javascripts") js << "\n" - return js + return raw(js) end def style_rules @@ -54,29 +58,29 @@ module ApplicationHelper end def if_logged_in(tag = :div, &block) - concat(content_tag(tag, capture(&block), :class => "hide_unless_logged_in")) + 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")) + 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}")) + 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}")) + content_tag(tag, capture(&block), :class => "hide_if_user_#{user.id}") else - concat(content_tag(tag, capture(&block))) + content_tag(tag, capture(&block)) end end def if_administrator(tag = :div, &block) - concat(content_tag(tag, capture(&block), :class => "hide_unless_administrator")) + content_tag(tag, capture(&block), :class => "hide_unless_administrator") end def describe_location(lat, lon, zoom = nil, language = nil) @@ -85,7 +89,7 @@ module ApplicationHelper url = "http://nominatim.openstreetmap.org/reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{language}" begin - response = Timeout::timeout(4) do + response = OSM::Timer.timeout(4) do REXML::Document.new(Net::HTTP.get(URI.parse(url))) end rescue Exception @@ -102,21 +106,13 @@ module ApplicationHelper 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 + image_tag user.image.url(:large), options end def user_thumbnail(user, options = {}) options[:class] ||= "user_thumbnail" - if user.image - image_tag url_for_file_column(user, "image"), options - else - image_tag "anon_small.png", options - end + image_tag user.image.url(:small), options end def preferred_editor @@ -129,6 +125,18 @@ module ApplicationHelper end end + def friendly_date(date) + content_tag(:span, time_ago_in_words(date), :title => l(date, :format => :friendly)) + end + + def note_author(object, link_options = {}) + if object.author.nil? + h(object.author_name) + else + link_to h(object.author_name), link_options.merge({:controller => "user", :action => "view", :display_name => object.author_name}) + end + end + private def javascript_strings_for_key(key)