Change server_settings to smtp_settings to avoid deprecation warning.

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

diff --git a/app/views/trace/mine.rhtml b/app/views/trace/mine.rhtml
index 997e2c297821670353650da22154bf2e41cd05d7..e403d591bba707566b53cc1155c44919ad38c18b 100644 (file)
--- a/app/views/trace/mine.rhtml
+++ b/app/views/trace/mine.rhtml
@@ -1,8 +1,19 @@
 <h1>Your GPS Traces</h1>
 
-<%= link_to 'see all traces', {:controller => 'trace', :action => 'list'} %><br /><br />
+<% if @tag %>
+ Traces filtered by tag <b><%= @tag %></b>
+ <br/><br/>
+<% end %>
+<%= link_to 'See all traces', {:controller => 'trace', :action => 'list'} %>
+<% if @tag %>
+  | <%= link_to 'See all your traces', {:controller => 'trace', :action => 'mine'} %>
+<% end %>
+
+<br />
+<br />
 
 <% if @user %>
+
 <%= start_form_tag({:action => 'create'}, :multipart => true) %>
 <table>
 <table>
@@ -15,20 +26,18 @@
 </td></tr>
 </table>
 
-<br>
-
 <%= end_form_tag %> 
 
+<%= render (:partial => 'trace_paging_nav') %>
 <table id="keyvalue" cellpadding="3">
   <tr>
     <th></th>
     <th></th>
   </tr>
-  <%= render :partial => 'trace', :collection => @traces %>
+  <%= render (:partial => 'trace', :collection => @traces) unless @traces.nil? %>
 </table>
+<%= render (:partial => 'trace_paging_nav') %>
 
 <% end %>
 
-
-
-
+<%= render (:partial => 'trace_optionals') %>