X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/d4aa257524575b3baa454d69733a614f22485746..0425aeebbcf511b6b3627c5a3ba8f5066c80660b:/app/views/browse/_way.html.erb?ds=sidebyside diff --git a/app/views/browse/_way.html.erb b/app/views/browse/_way.html.erb index 0a3c86719..d04eff140 100644 --- a/app/views/browse/_way.html.erb +++ b/app/views/browse/_way.html.erb @@ -1,4 +1,4 @@ -<% if way.redacted? %> +<% if way.redacted? && !params[:show_redactions] %> <div class="browse-section browse-redacted"> <%= t "browse.redacted.message_html", :type => t("browse.redacted.type.way"), @@ -7,7 +7,7 @@ :id => way.redaction.id), way.redaction) %> </div> <% else %> - <div class="browse-section browse-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? %> @@ -15,7 +15,7 @@ <details <%= "open" if way.containing_relation_members.count < 10 %>> <summary><%= t "browse.part_of_relations", :count => way.containing_relation_members.uniq.count %></summary> <ul class="list-unstyled"> - <%= render :partial => "containing_relation", :collection => way.containing_relation_members.uniq %> + <%= render :partial => "browse/containing_relation", :collection => way.containing_relation_members.uniq %> </ul> </details> <% end %> @@ -27,15 +27,17 @@ <ul class="list-unstyled"> <% way.way_nodes.each do |wn| %> <li> - <%= link_to printable_name(wn.node), node_path(wn.node), { :class => element_class("node", wn.node), :title => link_title(wn.node), :rel => link_follow(wn.node) } %> + <%= element_single_current_link "node", wn.node %> <% related_ways = wn.node.ways.reject { |w| w.id == wn.way_id } %> <% 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), way_path(w), { :class => element_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_single_current_link "way", w }) %>) <% end %> </li> <% end %> </ul> </details> <% end %> - </div> + <% end %> <% end %>