Merge 12304:14009 from trunk.

[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 179b79c32fccbe8541c345f93d470d93b31ad3ff..f739d90532c7a46a5a995a4a7e2d931887caf416 100644 (file)
--- a/app/views/trace/_trace_header.rhtml
+++ b/app/views/trace/_trace_header.rhtml
@@ -1,15 +1,26 @@
 <h1><%= h(@title) %></h1>
 
 <h1><%= h(@title) %></h1>
 

-<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>
-<% 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 %>
-<% if @tag or @display_name %>
- | <%= link_to 'See all traces', :controller => 'trace', :action => 'list' %>
-<% end %>
-<% if @tag and @user and @user.display_name == @display_name %>
- | <%= link_to 'See all your traces', :controller => 'trace', :action => 'mine' %>
+<% content_for :head do %>
+<%= auto_discovery_link_tag :atom, :action => 'georss', :display_name => @display_name, :tag => @tag %>

 <% end %>
 
 <% end %>
 

-<br />
-<br />
+<p>
+  <%= 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 %>
+  <% if @tag or @display_name %>
+    | <%= link_to 'See all traces', :controller => 'trace', :action => 'list' %>
+  <% end %>
+  <% if @tag and @user and @user.display_name == @display_name %>
+    | <%= link_to 'See all your traces', :controller => 'trace', :action => 'mine' %>
+  <% end %>
+</p>
+
+<% if @user and @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 %>