Merge remote-tracking branch 'upstream/pull/5405'

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

diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb
index d3e8f10f900174119adf34a9b023774fe734c4dc..482503e8ae66b3c48e5be261e5974c5d66aba821 100644 (file)
--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -1,15 +1,38 @@
 module BrowseHelper
 module BrowseHelper

+  def element_icon(type, object)
+    selected_icon_data = { :filename => "#{type}.svg", :priority => 1 }
+
+    unless object.redacted?
+      target_tags = object.tags.find_all { |k, _v| BROWSE_ICONS.key? k }.sort
+      title = target_tags.map { |k, v| "#{k}=#{v}" }.to_sentence unless target_tags.empty?
+
+      target_tags.each do |k, v|
+        icon_data = BROWSE_ICONS[k][v] || BROWSE_ICONS[k][:*]
+        selected_icon_data = icon_data if icon_data && icon_data[:priority] > selected_icon_data[:priority]
+      end
+    end
+
+    image_tag "browse/#{selected_icon_data[:filename]}",
+              :size => 20,
+              :class => ["align-bottom object-fit-none browse-icon", { "browse-icon-invertible" => selected_icon_data[:invert] }],
+              :title => title
+  end
+

   def element_single_current_link(type, object)
   def element_single_current_link(type, object)

-    link_to object, { :class => element_class(type, object), :title => element_title(object), :rel => (link_follow(object) if type == "node") } do
+    link_to object, { :rel => (link_follow(object) if type == "node") } do

       element_strikethrough object do
         printable_element_name object
       end
     end
   end
 
       element_strikethrough object do
         printable_element_name object
       end
     end
   end
 

-  def element_list_item(type, object, &block)
-    tag.li :class => element_class(type, object), :title => element_title(object) do
-      element_strikethrough object, &block
+  def element_list_item(type, object, &)
+    tag.li(tag.div(element_icon(type, object) + tag.div(:class => "align-self-center", &), :class => "d-flex gap-1"))
+  end
+
+  def element_list_item_with_strikethrough(type, object, &)
+    element_list_item type, object do
+      element_strikethrough object, &

     end
   end
 
     end
   end
 


@@ -44,40 +67,26 @@ module BrowseHelper
     t "printable_name.version", :version => object.version
   end
 
     t "printable_name.version", :version => object.version
   end
 

-  def element_strikethrough(object, &block)
+  def element_strikethrough(object, &)

     if object.redacted? || !object.visible?
     if object.redacted? || !object.visible?

-      tag.s(&block)
+      tag.s(&)

     else
       yield
     end
   end
 
     else
       yield
     end
   end
 

-  def element_class(type, object)
-    classes = [type]
-    classes += icon_tags(object).flatten.map { |t| h(t) } unless object.redacted?
-    classes.join(" ")
-  end
-
-  def element_title(object)
-    if object.redacted?
-      ""
-    else
-      h(icon_tags(object).map { |k, v| "#{k}=#{v}" }.to_sentence)
-    end
-  end
-

   def link_follow(object)
     "nofollow" if object.tags.empty?
   end
 
   def link_follow(object)
     "nofollow" if object.tags.empty?
   end
 

-  def type_and_paginated_count(type, pages)
+  def type_and_paginated_count(type, pages, selected_page = pages.current_page)

     if pages.page_count == 1
       t ".#{type.pluralize}",
         :count => pages.item_count
     else
       t ".#{type.pluralize}_paginated",
     if pages.page_count == 1
       t ".#{type.pluralize}",
         :count => pages.item_count
     else
       t ".#{type.pluralize}_paginated",

-        :x => pages.current_page.first_item,
-        :y => pages.current_page.last_item,
+        :x => selected_page.first_item,
+        :y => selected_page.last_item,

         :count => pages.item_count
     end
   end
         :count => pages.item_count
     end
   end


@@ -86,33 +95,27 @@ module BrowseHelper
     max_width_for_default_padding = 35
 
     width = 0
     max_width_for_default_padding = 35
 
     width = 0

-    pagination_items(pages, {}).each do |body|
+    pagination_items(pages, {}).each do |(body)|

       width += 2 # padding width
       width += body.length
     end
     link_classes = ["page-link", { "px-1" => width > max_width_for_default_padding }]
 
       width += 2 # padding width
       width += body.length
     end
     link_classes = ["page-link", { "px-1" => width > max_width_for_default_padding }]
 

-    tag.ul :class => "pagination pagination-sm mb-1 ms-auto" do
-      pagination_items(pages, {}).each do |body, n|
-        linked = !(n.is_a? String)
+    tag.ul :class => "pagination pagination-sm mb-2" do
+      pagination_items(pages, {}).each do |body, page_or_class|
+        linked = !(page_or_class.is_a? String)

         link = if linked
         link = if linked

-                 link_to body, url_for(page_param => n), :class => link_classes
+                 link_to body, url_for(page_param => page_or_class.number), :class => link_classes, **yield(page_or_class)

                else
                  tag.span body, :class => link_classes
                end
                else
                  tag.span body, :class => link_classes
                end

-        concat tag.li link, :class => ["page-item", { n => !linked }]
+        concat tag.li link, :class => ["page-item", { page_or_class => !linked }]

       end
     end
   end
 
   private
 
       end
     end
   end
 
   private
 

-  ICON_TAGS = %w[aeroway amenity barrier building highway historic landuse leisure man_made natural railway shop tourism waterway].freeze
-
-  def icon_tags(object)
-    object.tags.find_all { |k, _v| ICON_TAGS.include? k }.sort
-  end
-

   def name_locales(object)
     object.tags.keys.map { |k| Regexp.last_match(1) if k =~ /^name:(.*)$/ }.flatten
   end
   def name_locales(object)
     object.tags.keys.map { |k| Regexp.last_match(1) if k =~ /^name:(.*)$/ }.flatten
   end