X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2c397321c9309eb9cd4dfed21375fc821a8d2d37..4988801dc6c1175bde14b8001dbc91638c316f70:/app/helpers/application_helper.rb diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 4aec9f5c1..3d0a97243 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,13 +1,5 @@ module ApplicationHelper - require 'rexml/document' - - def sanitize(text) - Sanitize.clean(text, Sanitize::Config::OSM).html_safe - end - - def htmlize(text) - return linkify(sanitize(simple_format(text))) - end + require "rexml/document" def linkify(text) if text.html_safe? @@ -17,44 +9,26 @@ module ApplicationHelper end end - def html_escape_unicode(text) - chars = ActiveSupport::Multibyte::Unicode.u_unpack(text).map do |c| - c < 127 ? c.chr : "&##{c.to_s};" - 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" }); + link_to(image_tag("RSS.png", :size => "16x16", :border => 0), Hash[*args], :class => "rsssmall") 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 raw(js) + link_to(image_tag("RSS.png", :size => "16x16", :border => 0), Hash[*args], :class => "rsssmall") 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?; + css << ".hidden { display: none !important }" + css << ".hide_unless_logged_in { display: none !important }" unless @user + css << ".hide_if_logged_in { display: none !important }" if @user + css << ".hide_if_user_#{@user.id} { display: none !important }" if @user + css << ".show_if_user_#{@user.id} { display: inline !important }" if @user + css << ".hide_unless_administrator { display: none !important }" unless @user && @user.administrator? + css << ".hide_unless_moderator { display: none !important }" unless @user && @user.moderator? - return content_tag(:style, css, :type => "text/css") + content_tag(:style, css, :type => "text/css") end def if_logged_in(tag = :div, &block) @@ -83,66 +57,73 @@ module ApplicationHelper 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}" + def richtext_area(object_name, method, options = {}) + id = "#{object_name}_#{method}" + format = options.delete(:format) || "markdown" - begin - response = OSM::Timer.timeout(4) do - REXML::Document.new(Net::HTTP.get(URI.parse(url))) + 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 richtext") + end + + output_buffer << content_tag(:div, :id => "#{id}_help", :class => "richtext_help") do + output_buffer << render("site/#{format}_help") + output_buffer << content_tag(:div, :class => "buttons") do + output_buffer << submit_tag(I18n.t("site.richtext_area.edit"), :id => "#{id}_doedit", :class => "richtext_doedit deemphasize", :disabled => true) + output_buffer << submit_tag(I18n.t("site.richtext_area.preview"), :id => "#{id}_dopreview", :class => "richtext_dopreview deemphasize") + end end - rescue Exception - response = nil end + end - if response and result = response.get_text("reversegeocode/result") - result.to_s + def dir + if dir = params[:dir] + dir == "rtl" ? "rtl" : "ltr" else - "#{number_with_precision(lat, :precision => 3)}, #{number_with_precision(lon, :precision => 3)}" + I18n.t("html.dir") end end - def user_image(user, options = {}) - options[:class] ||= "user_image" - - image_tag user.image.url(:large), options + def friendly_date(date) + content_tag(:span, time_ago_in_words(date), :title => l(date, :format => :friendly)) end - def user_thumbnail(user, options = {}) - options[:class] ||= "user_thumbnail" - - image_tag user.image.url(:small), options - end - - def preferred_editor - if params[:editor] - params[:editor] - elsif @user and @user.preferred_editor - @user.preferred_editor + def body_class + if content_for? :body_class + content_for :body_class else - DEFAULT_EDITOR + "#{params[:controller]} #{params[:controller]}-#{params[:action]}" end end - def scale_to_zoom(scale) - Math.log(360.0 / (scale.to_f * 512.0)) / Math.log(2.0) + def current_page_class(path) + :current if current_page?(path) end -private + def application_data + data = { + :locale => I18n.locale, + :preferred_editor => preferred_editor + } - def javascript_strings_for_key(key) - js = "" - value = I18n.t(key, :locale => "en") + if @user + data[:user] = @user.id.to_json - 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}") + unless @user.home_lon.nil? || @user.home_lat.nil? + data[:user_home] = { :lat => @user.home_lat, :lon => @user.home_lon } end end - return js + data[:location] = session[:location] if session[:location] + + if @oauth + data[:token] = @oauth.token + data[:token_secret] = @oauth.secret + data[:consumer_key] = @oauth.client_application.key + data[:consumer_secret] = @oauth.client_application.secret + end + + data end end