X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2f9291ba5764fe104264ae7e3b6a361e11212e8b..48fff2bfeabb9a9bafd78c9cd4a0077e6569b631:/app/helpers/application_helper.rb?ds=sidebyside diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index c78c3ea46..bb09f3a49 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -5,36 +5,16 @@ module ApplicationHelper if text.html_safe? Rinku.auto_link(text, :urls, tag_builder.tag_options(:rel => "nofollow")).html_safe else - Rinku.auto_link(text, :urls, tag_builder.tag_options(:rel => "nofollow")) + Rinku.auto_link(ERB::Util.h(text), :urls, tag_builder.tag_options(:rel => "nofollow")).html_safe end end - def rss_link_to(*args) - link_to(image_tag("RSS.png", :size => "16x16", :border => 0), Hash[*args], :class => "rsssmall") + def rss_link_to(args = {}) + link_to(image_tag("RSS.png", :size => "16x16", :border => 0), args, :class => "rsssmall") end - def atom_link_to(*args) - link_to(image_tag("RSS.png", :size => "16x16", :border => 0), Hash[*args], :class => "rsssmall") - end - - def richtext_area(object_name, method, options = {}) - id = "#{object_name}_#{method}" - type = options.delete(:format) || "markdown" - - 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(:type => type))) - 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/#{type}_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 - end + def atom_link_to(args = {}) + link_to(image_tag("RSS.png", :size => "16x16", :border => 0), args, :class => "rsssmall") end def dir @@ -46,7 +26,11 @@ module ApplicationHelper end def friendly_date(date) - content_tag(:span, time_ago_in_words(date), :title => l(date, :format => :friendly)) + tag.span(time_ago_in_words(date), :title => l(date, :format => :friendly)) + end + + 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 body_class @@ -74,14 +58,20 @@ module ApplicationHelper end 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[:oauth_token] = oauth_token.token if oauth_token data end + + # 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 + flash + end + rescue StandardError + flash.inspect if Rails.env.development? + end end