Merge remote-tracking branch 'upstream/pull/4842'

[rails.git] / app / views / changesets / show.html.erb

diff --git a/app/views/changesets/show.html.erb b/app/views/changesets/show.html.erb
index 57a3fdb56b61f2b280597037f93f3eab8f2c1d88..d44ccfc075934a552ea4fc5c0ccf557de937ec15 100644 (file)
--- a/app/views/changesets/show.html.erb
+++ b/app/views/changesets/show.html.erb
@@ -31,10 +31,10 @@
       <% @comments.each do |comment| %>
         <% next unless comment.visible || current_user&.moderator? %>
         <li id="c<%= comment.id %>">
       <% @comments.each do |comment| %>
         <% next unless comment.visible || current_user&.moderator? %>
         <li id="c<%= comment.id %>">

-          <small class='text-muted'>
+          <small class='text-body-secondary'>

             <%= t comment.visible ? ".comment_by_html" : ".hidden_comment_by_html",
                   :time_ago => friendly_date_ago(comment.created_at),
             <%= 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"),
             <% if current_user&.moderator? %>
               —
               <%= tag.button t("javascripts.changesets.show.#{comment.visible ? 'hide' : 'unhide'}_comment"),


@@ -80,11 +80,11 @@
     <%= render :partial => "paging_nav", :locals => { :type => "way", :pages => @way_pages } %>
     <ul class="list-unstyled">
       <% @ways.each do |way| %>
     <%= render :partial => "paging_nav", :locals => { :type => "way", :pages => @way_pages } %>
     <ul class="list-unstyled">
       <% @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)),
                 :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 %>
     </ul>
   <% end %>
       <% end %>
     </ul>
   <% end %>


@@ -93,11 +93,11 @@
     <%= render :partial => "paging_nav", :locals => { :type => "relation", :pages => @relation_pages } %>
     <ul class="list-unstyled">
       <% @relations.each do |relation| %>
     <%= render :partial => "paging_nav", :locals => { :type => "relation", :pages => @relation_pages } %>
     <ul class="list-unstyled">
       <% @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)),
                 :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 %>
     </ul>
   <% end %>
       <% end %>
     </ul>
   <% end %>


@@ -106,11 +106,11 @@
     <%= render :partial => "paging_nav", :locals => { :type => "node", :pages => @node_pages } %>
     <ul class="list-unstyled">
       <% @nodes.each do |node| %>
     <%= render :partial => "paging_nav", :locals => { :type => "node", :pages => @node_pages } %>
     <ul class="list-unstyled">
       <% @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) }),
                 :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 %>
     </ul>
   <% end %>
       <% end %>
     </ul>
   <% end %>


@@ -125,7 +125,7 @@
 <% if @next_by_user || @prev_by_user %>
   <div class='secondary-actions'>
     <% if @prev_by_user %>
 <% if @next_by_user || @prev_by_user %>
   <div class='secondary-actions'>
     <% 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 %>
         <%= 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 %>
       &middot;
         link_to tag.bdi(user), :controller => "changesets", :action => "index", :display_name => user %>
     <% if @next_by_user %>
       &middot;

-      <%= 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 %>
         <%= @next_by_user.id %>
         <%= next_page_svg_tag :height => 11 %>
       <% end %>