X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/452eabc941b9500d737956f698a88624fa86dc86..985b355d1c299d7a0730fc2c41d53943d054e0fc:/app/helpers/application_helper.rb?ds=sidebyside diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 160e25e35..fcf253289 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,109 +1,78 @@ module ApplicationHelper - require 'rexml/document' + require "rexml/document" def linkify(text) if text.html_safe? - Rinku.auto_link(text, :urls, tag_options(:rel => "nofollow")).html_safe + Rinku.auto_link(text, :urls, tag_builder.tag_options(:rel => "nofollow")).html_safe else - Rinku.auto_link(text, :urls, 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) - return 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", :class => "align-text-bottom"), args end - def atom_link_to(*args) - return link_to(image_tag("RSS.png", :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 style_rules - css = "" - - 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 and @user.administrator?; - css << ".hide_unless_moderator { display: none !important }" unless @user and @user.moderator?; - - return content_tag(:style, css, :type => "text/css") - end - - def if_logged_in(tag = :div, &block) - content_tag(tag, capture(&block), :class => "hide_unless_logged_in") - end - - def if_not_logged_in(tag = :div, &block) - content_tag(tag, capture(&block), :class => "hide_if_logged_in") - end - - def if_user(user, tag = :div, &block) - if user - content_tag(tag, capture(&block), :class => "hidden show_if_user_#{user.id}") + def dir + if dir = params[:dir] + dir == "rtl" ? "rtl" : "ltr" + else + I18n.t("html.dir") end end - def unless_user(user, tag = :div, &block) - if user - content_tag(tag, capture(&block), :class => "hide_if_user_#{user.id}") - else - content_tag(tag, capture(&block)) - end + def friendly_date(date) + tag.time(time_ago_in_words(date), :title => l(date, :format => :friendly), :datetime => date.xmlschema) end - def if_administrator(tag = :div, &block) - content_tag(tag, capture(&block), :class => "hide_unless_administrator") + 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 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 header_nav_link_class(path) + ["nav-link", current_page?(path) ? "text-secondary-emphasis" : "text-secondary"] end - def richtext_area(object_name, method, options = {}) - id = "#{object_name.to_s}_#{method.to_s}" - format = options.delete(:format) || "markdown" + def application_data + data = { + :locale => I18n.locale, + :preferred_editor => preferred_editor, + :preferred_languages => preferred_languages.expand.map(&:to_s) + } - 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 + if current_user + data[:user] = current_user.id.to_json - 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 + data[:user_home] = { :lat => current_user.home_lat, :lon => current_user.home_lon } if current_user.home_location? end - end - def dir - if dir = params[:dir] - dir == "rtl" ? "rtl" : "ltr" - else - I18n.t("html.dir") - end - end + data[:location] = session[:location] if session[:location] + data[:oauth_token] = oauth_token.token if oauth_token - def friendly_date(date) - content_tag(:span, time_ago_in_words(date), :title => l(date, :format => :friendly)) + data end - def body_class - [params[:controller], "#{params[:controller]}-#{params[:action]}", @extra_body_class].compact.join(" ") + # 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