Drop max_id from the changeset feed URL

[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 23cee14f794da3741578e18810256ab3cae89dda..8aac76b75a9a388f547a7ed8075e2bdb12e838de 100644 (file)
--- a/app/views/changeset/history.html.erb
+++ b/app/views/changeset/history.html.erb
@@ -1,26 +1,29 @@
 <% content_for :head do -%>
   <% unless params[:friends] or params[:nearby] -%>
 <% content_for :head 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, :action => :feed }) %>

   <% end -%>
 <% end -%>
 
 <%
    if params[:friends] and @user
   <% 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
      @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]
      @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
      @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
 %>
 
      @heading = t 'changeset.list.title'
    end
 %>
 

-<h2><%= @heading %></h2>
+<h2>
+  <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
+  <%= @heading %>
+</h2>

 
 <div class="changesets">
   <%= image_tag "searching.gif", :class => "loader" %>
 
 <div class="changesets">
   <%= image_tag "searching.gif", :class => "loader" %>