X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/633445b8173092fb9cbeef15122c88d0ba99ce9b..59fccd95f64a4aa44de022600c104c5c309ad8d0:/app/views/browse/_way.html.erb diff --git a/app/views/browse/_way.html.erb b/app/views/browse/_way.html.erb index 2788fdea9..9181a3e08 100644 --- a/app/views/browse/_way.html.erb +++ b/app/views/browse/_way.html.erb @@ -1,5 +1,5 @@ -<% if way.redacted? %> -
+<% if way.redacted? && !params[:show_redactions] %> +
<%= t "browse.redacted.message_html", :type => t("browse.redacted.type.way"), :version => way.version, @@ -7,35 +7,38 @@ :id => way.redaction.id), way.redaction) %>
<% else %> -
- <%= render :partial => "common_details", :object => way %> + <%= tag.div :class => ["browse-section", "browse-way", { "text-body-secondary" => way.redacted? }] do %> + <%= render :partial => "browse/common_details", :object => way %> <% unless way.containing_relation_members.empty? %>

<%= t "browse.part_of" %>

-
> - <%= t 'browse.part_of_relations', :count => way.containing_relation_members.count %> -
    - <%= render :partial => "containing_relation", :collection => way.containing_relation_members.uniq %> +
    > + <%= t "browse.part_of_relations", :count => way.containing_relation_members.uniq.count %> +
      + <%= render :partial => "browse/containing_relation", :collection => way.containing_relation_members.uniq %>
    <% end %> <% unless way.way_nodes.empty? %>

    <%= t ".nodes" %>

    -
    > - <%= t '.nodes_count', :count => way.way_nodes.count %> -
      +
      > + <%= t ".nodes_count", :count => way.way_nodes.count %> +
        <% way.way_nodes.each do |wn| %> -
      • - <%= link_to printable_name(wn.node), { :action => "node", :id => wn.node_id.to_s }, { :class => link_class("node", wn.node), :title => link_title(wn.node), :rel => link_follow(wn.node) } %> + <%= element_list_item "node", wn.node do %> + <%= element_single_current_link "node", wn.node %> <% related_ways = wn.node.ways.reject { |w| w.id == wn.way_id } %> + <% icon_connector = " " %> <% if related_ways.size > 0 then %> - (<%= t ".also_part_of_html", :count => related_ways.size, :related_ways => to_sentence(related_ways.map { |w| link_to(printable_name(w), { :action => "way", :id => w.id.to_s }, { :class => link_class("way", w), :title => link_title(w) }) }) %>) + (<%= t ".also_part_of_html", + :count => related_ways.size, + :related_ways => to_sentence(related_ways.map { |w| element_icon("way", w) + icon_connector + element_single_current_link("way", w) }) %>) <% end %> -
      • + <% end %> <% end %>
      <% end %> -
+ <% end %> <% end %>