Merge branch 'pull/4985'

[rails.git] / app / helpers / application_helper.rb

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index b30129c5dd51233a6b66b1ebb44b11e0171df9d1..5558e69fbd6819f701a6baf3addcaf78ceee0bfa 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,172 +1,107 @@
 module ApplicationHelper
 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"
+  include SocialShareButtonHelper

 
   def linkify(text)
     if text.html_safe?
 
   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
     else

-      Rinku.auto_link(text, :urls, tag_options(:rel => "nofollow"))
-    end
-  end
-
-  def html_escape_unicode(text)
-    chars = ActiveSupport::Multibyte::Unicode.u_unpack(text).map do |c|
-      c < 127 ? c.chr : "&##{c.to_s};"
+      Rinku.auto_link(ERB::Util.h(text), :urls, tag_builder.tag_options(:rel => "nofollow")).html_safe

     end
     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" });

   end
 
   end
 

-  def atom_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
 
   end
 

-  def javascript_strings
-    js = ""
-
-    js << "<script type='text/javascript'>\n"
-    js << "i18n_strings = new Array();\n"
-    js << javascript_strings_for_key("javascripts")
-    js << "</script>\n"
-
-    return raw(js)
-  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?;
-
-    return content_tag(:style, css, :type => "text/css")
+  def atom_link_to(args = {})
+    link_to image_tag("RSS.png", :size => "16x16", :class => "align-text-bottom"), args

   end
 
   end
 

-  def if_logged_in(tag = :div, &block)
-    content_tag(tag, capture(&block), :class => "hide_unless_logged_in")
+  def dir
+    if dir = params[:dir]
+      dir == "rtl" ? "rtl" : "ltr"
+    else
+      I18n.t("html.dir")
+    end

   end
 
   end
 

-  def if_not_logged_in(tag = :div, &block)
-    content_tag(tag, capture(&block), :class => "hide_if_logged_in")
+  def friendly_date(date)
+    tag.time(time_ago_in_words(date), :title => l(date, :format => :friendly), :datetime => date.xmlschema)

   end
 
   end
 

-  def if_user(user, tag = :div, &block)
-    if user
-      content_tag(tag, capture(&block), :class => "hidden show_if_user_#{user.id}")
-    end
+  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
 
   end
 

-  def unless_user(user, tag = :div, &block)
-    if user
-      content_tag(tag, capture(&block), :class => "hide_if_user_#{user.id}")
+  def body_class
+    if content_for? :body_class
+      content_for :body_class

     else
     else

-      content_tag(tag, capture(&block))
+      "#{params[:controller]} #{params[:controller]}-#{params[:action]}"

     end
   end
 
     end
   end
 

-  def if_administrator(tag = :div, &block)
-    content_tag(tag, capture(&block), :class => "hide_unless_administrator")
+  def header_nav_link_class(path)
+    ["nav-link", current_page?(path) ? "text-secondary-emphasis" : "text-secondary"]

   end
 
   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}"
-
-    begin
-      response = Timeout::timeout(4) do
-        REXML::Document.new(Net::HTTP.get(URI.parse(url)))
-      end
-    rescue Exception
-      response = nil
-    end
-
-    if response and result = response.get_text("reversegeocode/result")
-      result.to_s
-    else
-      "#{number_with_precision(lat, :precision => 3)}, #{number_with_precision(lon, :precision => 3)}"
-    end
-  end
+  def application_data
+    data = {
+      :locale => I18n.locale,
+      :preferred_editor => preferred_editor,
+      :preferred_languages => preferred_languages.expand.map(&:to_s)
+    }

 
 

-  def user_image(user, options = {})
-    options[:class] ||= "user_image"
+    if current_user
+      data[:user] = current_user.id.to_json

 
 

-    if user.image
-      image_tag url_for_file_column(user, "image"), options
-    else
-      image_tag "anon_large.png", options
+      data[:user_home] = { :lat => current_user.home_lat, :lon => current_user.home_lon } if current_user.home_location?

     end
     end

-  end

 
 

-  def user_thumbnail(user, options = {})
-    options[:class] ||= "user_thumbnail"
+    data[:location] = session[:location] if session[:location]
+    data[:oauth_token] = oauth_token.token if oauth_token

 
 

-    if user.image
-      image_tag url_for_file_column(user, "image"), options
-    else
-      image_tag "anon_small.png", options
-    end
+    data

   end
 
   end
 

-  def preferred_editor
-    if params[:editor]
-      params[:editor]
-    elsif @user and @user.preferred_editor
-      @user.preferred_editor
+  # 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
     else

-      DEFAULT_EDITOR
+      flash

     end
     end

+  rescue StandardError
+    flash.inspect if Rails.env.development?

   end
 
   end
 

-  def friendly_date(date)
-    content_tag(:span, time_ago_in_words(date), :title => l(date, :format => :friendly))
-  end
+  # Generates a set of social share buttons based on the specified options.
+  def render_social_share_buttons(opts = {})
+    sites = opts.fetch(:allow_sites, [])
+    valid_sites, invalid_sites = SocialShareButtonHelper.filter_allowed_sites(sites)

 
 

-  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})
+    # Log invalid sites
+    invalid_sites.each do |invalid_site|
+      Rails.logger.error("Invalid site or icon not configured: #{invalid_site}")

     end
     end

-  end
-
-  def with_format(format, &block)
-    old_format = @template_format
-    @template_format = format
-    result = block.call
-    @template_format = old_format
-    return result
-  end

 
 

-private
-
-  def javascript_strings_for_key(key)
-    js = ""
-    value = I18n.t(key, :locale => "en")
-
-    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
+    tag.div(
+      :class => "social-share-button d-flex gap-1 align-items-end flex-wrap mb-3"
+    ) do
+      valid_sites.map do |site|
+        link_options = {
+          :rel => ["nofollow", opts[:rel]].compact,
+          :class => "ssb-icon rounded-circle",
+          :title => I18n.t("application.share.#{site}.title"),
+          :target => "_blank"
+        }
+
+        link_to SocialShareButtonHelper.generate_share_url(site, opts), link_options do
+          image_tag(SocialShareButtonHelper.icon_path(site), :alt => I18n.t("application.share.#{site}.alt"), :size => 28)
+        end
+      end.join.html_safe

     end
     end

-
-    return js

   end
 end
   end
 end