Make sure the query location is always in view

[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 d9f0888365be5537093a5cc6d90223a591984071..77118b4b4b5214c9183ded9af5af5dd4c8cfc041 100644 (file)
--- a/app/views/changeset/history.html.erb
+++ b/app/views/changeset/history.html.erb
@@ -1,28 +1,29 @@
-<% content_for :head do -%>
+<% content_for :auto_discovery_link_tag do -%>
   <% 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 -%>
 
 <%
    if params[:friends] and @user
-     @title = t 'changeset.list.title_friend'
+     set_title(t 'changeset.list.title_friend')
      @heading = t 'changeset.list.title_friend'
    elsif params[:nearby] and @user
-     @title = t 'changeset.list.title_nearby'
+     set_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(t 'changeset.list.title_user', :user => 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
-     @title = t 'changeset.list.title'
+     set_title(t 'changeset.list.title')
      @heading = t 'changeset.list.title'
    end
 %>
 
-<div class='browse_details header'> 
-  <h2><%= @heading %></h2>
-</div>
+<h2>
+  <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
+  <%= @heading %>
+</h2>
 
 <div class="changesets">
   <%= image_tag "searching.gif", :class => "loader" %>