cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Separate element strikethrough from classes

Browse source
This commit is contained in:
Anton Khorev 2024-02-18 21:04:04 +03:00
parent d4aa257524
commit a8f14fb509
7 changed files with 56 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/browse/_node.html.erb
View file

@ -17,7 +17,7 @@
<summary><%= t "browse.part_of_ways", :count => node.ways.uniq.count %></summary>
<ul class="list-unstyled">
<% node.ways.uniq.each do |way| %>
<li><%= link_to printable_name(way), way_path(way), { :class => element_class("way", way), :title => link_title(way) } %></li>
<li><%= element_single_current_link "way", way, way_path(way) %></li>
<% end %>
</ul>
</details>

12
app/views/browse/_relation_member.html.erb
View file

@ -2,9 +2,11 @@
linked_name = link_to printable_name(relation_member.member), { :controller => :browse, :action => relation_member.member_type.downcase, :id => relation_member.member_id.to_s }, { :title => link_title(relation_member.member), :rel => link_follow(relation_member.member) }
type_str = t ".type.#{relation_member.member_type.downcase}" %>
<li class="<%= member_class %>">
<%= if relation_member.member_role.blank?
t ".entry_html", :type => type_str, :name => linked_name
else
t ".entry_role_html", :type => type_str, :name => linked_name, :role => relation_member.member_role
end %>
<%= element_strikethrough relation_member.member do %>
<%= if relation_member.member_role.blank?
t ".entry_html", :type => type_str, :name => linked_name
else
t ".entry_role_html", :type => type_str, :name => linked_name, :role => relation_member.member_role
end %>
<% end %>
</li>

6
app/views/browse/_way.html.erb
View file

@ -27,10 +27,12 @@
<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, node_path(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, way_path(w) }) %>)
<% end %>
</li>
<% end %>

12
app/views/browse/changeset.html.erb
View file

@ -94,7 +94,9 @@
<ul class="list-unstyled">
<% @ways.each do |way| %>
<li class="<%= element_class("way", way) %>">
<%= link_to printable_name(way, :version => true), { :action => "way", :id => way.way_id.to_s }, { :title => link_title(way) } %>
<%= element_strikethrough way do %>
<%= link_to printable_name(way, :version => true), { :action => "way", :id => way.way_id.to_s }, { :title => link_title(way) } %>
<% end %>
</li>
<% end %>
</ul>
@ -105,7 +107,9 @@
<ul class="list-unstyled">
<% @relations.each do |relation| %>
<li class="<%= element_class("relation", relation) %>">
<%= link_to printable_name(relation, :version => true), { :action => "relation", :id => relation.relation_id.to_s }, { :title => link_title(relation) } %>
<%= element_strikethrough relation do %>
<%= link_to printable_name(relation, :version => true), { :action => "relation", :id => relation.relation_id.to_s }, { :title => link_title(relation) } %>
<% end %>
</li>
<% end %>
</ul>
@ -116,7 +120,9 @@
<ul class="list-unstyled">
<% @nodes.each do |node| %>
<li class="<%= element_class("node", node) %>">
<%= link_to printable_name(node, :version => true), { :action => "node", :id => node.node_id.to_s }, { :title => link_title(node), :rel => link_follow(node) } %>
<%= element_strikethrough node do %>
<%= link_to printable_name(node, :version => true), { :action => "node", :id => node.node_id.to_s }, { :title => link_title(node), :rel => link_follow(node) } %>
<% end %>
</li>
<% end %>
</ul>