X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ef40b61ff40881966ae4280cfdcb9f92965e9d10..98b4d62462040deb0d3564808917f69cc723c3a3:/app/helpers/application_helper.rb diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index bee4f9ce2..fcf253289 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,41 +1,78 @@ module ApplicationHelper - def htmlize(text) - return sanitize(auto_link(simple_format(text), :urls)) + require "rexml/document" + + 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 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" }); + def atom_link_to(args = {}) + link_to image_tag("RSS.png", :size => "16x16", :class => "align-text-bottom"), args end - def javascript_strings - js = "" + def dir + if dir = params[:dir] + dir == "rtl" ? "rtl" : "ltr" + else + I18n.t("html.dir") + end + end - js << "\n" + def friendly_date(date) + tag.time(time_ago_in_words(date), :title => l(date, :format => :friendly), :datetime => date.xmlschema) + end - return js + 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 -private + def body_class + if content_for? :body_class + content_for :body_class + else + "#{params[:controller]} #{params[:controller]}-#{params[:action]}" + end + end - def javascript_strings_for_key(key) - js = "" - value = t(key, :locale => "en") + def header_nav_link_class(path) + ["nav-link", current_page?(path) ? "text-secondary-emphasis" : "text-secondary"] + end - 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}") - end + def application_data + data = { + :locale => I18n.locale, + :preferred_editor => preferred_editor, + :preferred_languages => preferred_languages.expand.map(&:to_s) + } + + if current_user + data[:user] = current_user.id.to_json + + data[:user_home] = { :lat => current_user.home_lat, :lon => current_user.home_lon } if current_user.home_location? end - return js + data[:location] = session[:location] if session[:location] + 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