Merge vendor tree from api06 branch.

[rails.git] / app / views / trace / _trace_header.rhtml

diff --git a/app/views/trace/_trace_header.rhtml b/app/views/trace/_trace_header.rhtml
index c89a2a390bf305aecdf9acdd17437294f42968cd..cab6f7124504320d1eb19b8920bac3971b980e5b 100644 (file)
--- a/app/views/trace/_trace_header.rhtml
+++ b/app/views/trace/_trace_header.rhtml
@@ -1,7 +1,11 @@
 <h1><%= h(@title) %></h1>
 
+<% content_for :head do %>
+<%= auto_discovery_link_tag :atom, :action => 'georss', :display_name => @display_name, :tag => @tag %>
+<% end %>
+
 <p>
-  <span class="rsssmall"><a href="<%= url_for :action => 'georss', :display_name => @display_name, :tag => @tag %>"><img src="/images/RSS.gif" border="0" alt="RSS" /></a></span>
+  <%= rss_link_to :action => 'georss', :display_name => @display_name, :tag => @tag %>
   <% if @user.nil? or @display_name.nil? or @user.display_name != @display_name %>
     | <%= link_to 'See just your traces, or upload a trace', :action => 'mine' %>
   <% end %>
@@ -13,12 +17,10 @@
   <% end %>
 </p>
 
-<% if @display_name %>
-  <% if @user.traces.count(:conditions => "inserted=0") > 4 %>
-    <p>
-      You have <%= @user.traces.count(:conditions => "inserted=0") %> traces 
-      waiting for upload. Please consider waiting for these to finish before 
-      uploading any more, so as not to block the queue for other users.
-    </p>
-  <% end %>
+<% if @user and @user.traces.count(:conditions => ["inserted=?", false]) > 4 %>
+  <p>
+    You have <%= @user.traces.count(:conditions => ["inserted=?", false]) %> traces 
+    waiting for upload. Please consider waiting for these to finish before 
+    uploading any more, so as not to block the queue for other users.
+  </p>
 <% end %>