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

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

diff --git a/app/views/changeset/history.html.erb b/app/views/changeset/history.html.erb
index 022523efadee0a715a568c0282494d1340864c45..17faf7f8d8e80956d8ba655b2cdf7b367460801b 100644 (file)
--- a/app/views/changeset/history.html.erb
+++ b/app/views/changeset/history.html.erb
@@ -1,22 +1,15 @@
-<% content_for :head do -%>
+<% content_for :auto_discovery_link_tag do -%>

   <% unless params[:friends] or params[:nearby] -%>
   <% unless params[:friends] or params[:nearby] -%>

-    <%= auto_discovery_link_tag :atom, params.merge({ :page => nil, :action => :feed }) %>
+    <%= auto_discovery_link_tag :atom, @params.merge(:max_id => nil, :xhr => nil, :action => :feed) %>

   <% end -%>
 <% end -%>
 
 <%
   <% end -%>
 <% end -%>
 
 <%

-   if params[:friends] and @user
-     @title = t 'changeset.list.title_friend'
-     @heading = t 'changeset.list.title_friend'
-   elsif params[:nearby] and @user
-     @title = t 'changeset.list.title_nearby'
-     @heading = t 'changeset.list.title_nearby'
-   elsif params[:display_name]
-     @title = t 'changeset.list.title_user', :user => params[:display_name]
+   set_title(changeset_list_title(params, current_user))
+   if params[:display_name]

      @heading = t('changeset.list.title_user', :user => link_to(params[:display_name], :controller => "user", :action => "view", :display_name => params[:display_name])).html_safe
    else
      @heading = t('changeset.list.title_user', :user => link_to(params[:display_name], :controller => "user", :action => "view", :display_name => params[:display_name])).html_safe
    else

-     @title = t 'changeset.list.title'
-     @heading = t 'changeset.list.title'
+     @heading = @title

    end
 %>
 
    end
 %>