Drop with_format and user the new :formats render option instead

[rails.git] / app / views / trace / list.html.erb

diff --git a/app/views/trace/list.html.erb b/app/views/trace/list.html.erb
index 78d2037564d8b1bfbb914867256570c18756464d..2475b5ad2ef1a0786cd55d1d9317cd7fd9d43506 100644 (file)
--- a/app/views/trace/list.html.erb
+++ b/app/views/trace/list.html.erb
@@ -6,16 +6,16 @@
 
 <p>
   <%= rss_link_to :action => 'georss', :display_name => @display_name, :tag => @tag %>
 
 <p>
   <%= rss_link_to :action => 'georss', :display_name => @display_name, :tag => @tag %>

-  <% unless_user(@target_user, :span) do %>
-    | <%= link_to t('trace.trace_header.your_traces'), :action => 'mine' %>
-  <% end %>

   | <%= link_to t('trace.trace_header.upload_trace'), :action => 'create' %>
   <% if @tag %>
   | <%= link_to t('trace.trace_header.upload_trace'), :action => 'create' %>
   <% if @tag %>

+    | <%= link_to t('trace.trace_header.see_all_traces'), :controller => 'trace', :action => 'list', :display_name => nil, :tag => nil, :page => nil %>
+    | <%= link_to t('trace.trace_header.see_your_traces'), :action => 'mine', :tag => nil, :page => nil %>
+  <% else %>

     <% if @display_name %>
     <% if @display_name %>

-      | <%= link_to t('trace.trace_header.see_all_traces'), :controller => 'trace', :action => 'list' %>
+      | <%= link_to t('trace.trace_header.see_all_traces'), :controller => 'trace', :action => 'list', :display_name => nil, :tag => nil, :page => nil %>

     <% end %>
     <% end %>

-    <% if_user(@target_user, :span) do %>
-      | <%= link_to t('trace.trace_header.see_your_traces'), :controller => 'trace', :action => 'mine' %>
+    <%= unless_user(@target_user, :span) do %>
+      | <%= link_to t('trace.trace_header.see_your_traces'), :action => 'mine', :tag => nil, :page => nil %>

     <% end %>
   <% end %>
 </p>
     <% end %>
   <% end %>
 </p>