X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/664d02982cbaa8b1223ef03047b6134ff1ffbdac..9db1b47c1569a3c01eea7696cfe02baafd8bcedb:/app/views/changesets/show.html.erb diff --git a/app/views/changesets/show.html.erb b/app/views/changesets/show.html.erb index 57a3fdb56..5d2ca6ff6 100644 --- a/app/views/changesets/show.html.erb +++ b/app/views/changesets/show.html.erb @@ -31,13 +31,13 @@ <% @comments.each do |comment| %> <% next unless comment.visible || current_user&.moderator? %>
  • - + <%= t comment.visible ? ".comment_by_html" : ".hidden_comment_by_html", :time_ago => friendly_date_ago(comment.created_at), - :user => link_to(comment.author.display_name, user_path(comment.author)) %> + :user => link_to(comment.author.display_name, comment.author) %> <% if current_user&.moderator? %> — - <%= tag.button t("javascripts.changesets.show.#{comment.visible ? 'hide' : 'unhide'}_comment"), + <%= tag.button t(".#{comment.visible ? 'hide' : 'unhide'}_comment"), :class => "btn btn-sm small btn-link link-secondary p-0 align-baseline", :data => { :method => "POST", :url => comment.visible ? changeset_comment_hide_url(comment) : changeset_comment_unhide_url(comment) } %> @@ -66,7 +66,7 @@
    - +
    <% else %> @@ -80,11 +80,11 @@ <%= render :partial => "paging_nav", :locals => { :type => "way", :pages => @way_pages } %>
      <% @ways.each do |way| %> - <%= element_list_item "way", way do %> - <%= t "printable_name.current_and_old_links_html", + <%= element_list_item "way", way do + t "printable_name.current_and_old_links_html", :current_link => link_to(printable_element_name(way), way_path(way.way_id)), - :old_link => link_to(printable_element_version(way), old_way_path(way.way_id, way.version)) %> - <% end %> + :old_link => link_to(printable_element_version(way), old_way_path(way.way_id, way.version)) + end %> <% end %>
    <% end %> @@ -93,11 +93,11 @@ <%= render :partial => "paging_nav", :locals => { :type => "relation", :pages => @relation_pages } %>
      <% @relations.each do |relation| %> - <%= element_list_item "relation", relation do %> - <%= t "printable_name.current_and_old_links_html", + <%= element_list_item "relation", relation do + t "printable_name.current_and_old_links_html", :current_link => link_to(printable_element_name(relation), relation_path(relation.relation_id)), - :old_link => link_to(printable_element_version(relation), old_relation_path(relation.relation_id, relation.version)) %> - <% end %> + :old_link => link_to(printable_element_version(relation), old_relation_path(relation.relation_id, relation.version)) + end %> <% end %>
    <% end %> @@ -106,11 +106,11 @@ <%= render :partial => "paging_nav", :locals => { :type => "node", :pages => @node_pages } %>
      <% @nodes.each do |node| %> - <%= element_list_item "node", node do %> - <%= t "printable_name.current_and_old_links_html", + <%= element_list_item "node", node do + t "printable_name.current_and_old_links_html", :current_link => link_to(printable_element_name(node), node_path(node.node_id), { :rel => link_follow(node) }), - :old_link => link_to(printable_element_version(node), old_node_path(node.node_id, node.version), { :rel => link_follow(node) }) %> - <% end %> + :old_link => link_to(printable_element_version(node), old_node_path(node.node_id, node.version), { :rel => link_follow(node) }) + end %> <% end %>
    <% end %> @@ -125,7 +125,7 @@ <% if @next_by_user || @prev_by_user %>
    <% if @prev_by_user %> - <%= link_to({ :id => @prev_by_user.id }, :class => "icon-link") do %> + <%= link_to @prev_by_user, :class => "icon-link" do %> <%= previous_page_svg_tag :height => 11 %> <%= @prev_by_user.id %> <% end %> @@ -135,7 +135,7 @@ link_to tag.bdi(user), :controller => "changesets", :action => "index", :display_name => user %> <% if @next_by_user %> · - <%= link_to({ :id => @next_by_user.id }, :class => "icon-link") do %> + <%= link_to @next_by_user, :class => "icon-link" do %> <%= @next_by_user.id %> <%= next_page_svg_tag :height => 11 %> <% end %>