Add missing files from api06 merge.

[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 8fdd8de7eff629db2d47ae3362573d115a73db0e..cab6f7124504320d1eb19b8920bac3971b980e5b 100644 (file)
--- a/app/views/trace/_trace_header.rhtml
+++ b/app/views/trace/_trace_header.rhtml
@@ -1,6 +1,8 @@
 <h1><%= h(@title) %></h1>
 
 <h1><%= h(@title) %></h1>
 

+<% content_for :head do %>

 <%= auto_discovery_link_tag :atom, :action => 'georss', :display_name => @display_name, :tag => @tag %>
 <%= auto_discovery_link_tag :atom, :action => 'georss', :display_name => @display_name, :tag => @tag %>

+<% end %>

 
 <p>
   <%= rss_link_to :action => 'georss', :display_name => @display_name, :tag => @tag %>
 
 <p>
   <%= rss_link_to :action => 'georss', :display_name => @display_name, :tag => @tag %>


@@ -15,12 +17,10 @@
   <% end %>
 </p>
 
   <% 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 %>
 <% end %>