X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/63221710a4b9ce4c282aab751b35581908e45852..7af9a60eccf55806a452186995b87ebab1b5b230:/app/helpers/browse_helper.rb diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb index 0f533770b..9ea384811 100644 --- a/app/helpers/browse_helper.rb +++ b/app/helpers/browse_helper.rb @@ -1,12 +1,25 @@ module BrowseHelper - def printable_name(object, version: false) + 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 + 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 + end + end + + def printable_element_name(object) id = if object.id.is_a?(Array) object.id[0] else object.id end - name = t "printable_name.with_id", :id => id.to_s - name = t "printable_name.with_version", :id => name, :version => object.version.to_s if version + name = id.to_s # don't look at object tags if redacted, so as to avoid giving # away redacted version tag information. @@ -27,20 +40,25 @@ module BrowseHelper name end - def link_class(type, object) - classes = [type] + def printable_element_version(object) + t "printable_name.version", :version => object.version + end - if object.redacted? - classes << "deleted" + def element_strikethrough(object, &block) + if object.redacted? || !object.visible? + tag.s(&block) else - classes += icon_tags(object).flatten.map { |t| h(t) } - classes << "deleted" unless object.visible? + 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 link_title(object) + def element_title(object) if object.redacted? "" else @@ -52,21 +70,44 @@ module BrowseHelper "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 "browse.changeset.#{type}", + t ".#{type.pluralize}", :count => pages.item_count else - t "browse.changeset.#{type}_paginated", - :x => pages.current_page.first_item, - :y => pages.current_page.last_item, + t ".#{type.pluralize}_paginated", + :x => selected_page.first_item, + :y => selected_page.last_item, :count => pages.item_count end end + def sidebar_classic_pagination(pages, page_param) + max_width_for_default_padding = 35 + + width = 0 + 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 }] + + 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_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 + concat tag.li link, :class => ["page-item", { page_or_class => !linked }] + end + end + end + private - ICON_TAGS = %w[aeroway amenity barrier building highway historic landuse leisure man_made natural railway shop tourism waterway].freeze + ICON_TAGS = %w[aeroway amenity barrier building highway historic landuse leisure man_made natural office railway shop tourism waterway].freeze def icon_tags(object) object.tags.find_all { |k, _v| ICON_TAGS.include? k }.sort