Merge pull request #4106 from tomhughes/diary-paging

[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 e3df87490379368f9eb051780c19ad1463d72b20..a9970e652dae24da2542bf32fddfc9e15a2f9035 100644 (file)
--- a/app/views/changesets/history.html.erb
+++ b/app/views/changesets/history.html.erb
@@ -1,21 +1,22 @@
 <% content_for :auto_discovery_link_tag do -%>
   <% unless params[:friends] or params[:nearby] -%>
 <% 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))
    @heading = if params[:display_name]
   <% end -%>
 <% end -%>
 
 <% set_title(changeset_index_title(params, current_user))
    @heading = if params[:display_name]

-                t("changesets.index.title_user", :user => link_to(params[:display_name], user_path(:display_name => params[:display_name]))).html_safe
+                t("changesets.index.title_user_link_html", :user_link => link_to(params[:display_name], user_path(:display_name => params[:display_name])))

               else
                 @title
               end %>
 
               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>
 </div>