X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5a00e23fa3200d95a27177dc5e392993e9dd0195..191f6b3fcdd6945fe9c8af8094c8dc94e4b7afd2:/app/views/changeset/history.html.erb?ds=sidebyside diff --git a/app/views/changeset/history.html.erb b/app/views/changeset/history.html.erb index d9f088836..7f08a40b3 100644 --- a/app/views/changeset/history.html.erb +++ b/app/views/changeset/history.html.erb @@ -1,28 +1,22 @@ -<% 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' - @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, @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 - @title = t 'changeset.list.title' - @heading = t 'changeset.list.title' + @heading = @title end %> -