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

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

diff --git a/app/views/changesets/history.html.erb b/app/views/changesets/history.html.erb
index 1117f01b3b46229282c09d4545d6ad70896d0355..a536677b08b727fc304414ba8b5571c29e2618b7 100644 (file)
--- a/app/views/changesets/history.html.erb
+++ b/app/views/changesets/history.html.erb
@@ -1,23 +1,22 @@
 <% content_for :auto_discovery_link_tag do -%>
   <% unless params[:friends] or params[:nearby] -%>
-    <%= auto_discovery_link_tag :atom, @params.merge(:max_id => nil, :xhr => nil, :action => :feed) %>
+    <%= auto_discovery_link_tag :atom, @params.to_h.merge(:max_id => nil, :xhr => nil, :action => :feed) %>
   <% end -%>
 <% end -%>
 
-<%
-   set_title(changeset_index_title(params, current_user))
-   if params[:display_name]
-     @heading = t('changesets.index.title_user', :user => link_to(params[:display_name], user_path(:display_name => params[:display_name]))).html_safe
-   else
-     @heading = @title
-   end
-%>
+<% set_title(changeset_index_title(params, current_user))
+   @heading = if params[:display_name]
+                t("changesets.index.title_user_link_html", :user_link => link_to(params[:display_name], user_path(params[:display_name])))
+              else
+                @title
+              end %>
 
-<h2>
-  <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
-  <%= @heading %>
-</h2>
+<%= render "sidebar_header", :title => @heading %>
 
-<div class="changesets">
-  <%= image_tag "searching.gif", :class => "loader" %>
+<div class="changesets mx-n3">
+  <div class="text-center loader">
+    <div class="spinner-border" role="status">
+      <span class="visually-hidden"><%= t("browse.start_rjs.loading") %></span>
+    </div>
+  </div>
 </div>