X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/85d8a2d17702b73620cbc3b907fd84fdf6ec1545..9db4f4e13c3a329dd9736c3d8db18c893f064ea2:/app/views/trace/list.rhtml

diff --git a/app/views/trace/list.rhtml b/app/views/trace/list.rhtml
index dce98136f..327c68ed6 100644
--- a/app/views/trace/list.rhtml
+++ b/app/views/trace/list.rhtml
@@ -1,26 +1,24 @@
 <h1>Public GPS Traces</h1>
 
-<br /><br />
-
-<span class="rsssmall"><a href="<%= url_for :controller => 'trace', :action => 'georss' %>"><img src="http://<%= SERVER_URL %>/images/RSS.gif" border="0"></a></span> | 
+<% if @tag %>
+ Traces filtered by tag <b><%= @tag %></b>
+ <br/><br/>
+<% end %>
+<span class="rsssmall"><a href="<%= url_for :controller => 'trace', :action => 'georss' %>"><img src="/images/RSS.gif" border="0"></a></span> | 
 <% if @user %>
-  <%= link_to 'See just your traces', {:controller => 'trace', :action => 'mine'} %>
+  <%= link_to 'See just your traces, or upload a trace', {:controller => 'trace', :action => 'mine'} %>
 <% else %>
-  <%= link_to 'login', {:controller => 'user', :action => 'login'} %> to see just your traces
+  <%= link_to 'login', {:controller => 'user', :action => 'login', :next_controller => 'traces', :next_action => 'mine'} %> to upload a trace or see yours alone
 <% end %>
-
-
-<br /><br />
-Showing page 
-<% if @page > 0 %>
-  <%= link_to '<<<', {:controller => 'trace', :action => 'list', :page => @page-1}, {:title => 'previous page'} %>
+<% if @tag %>
+ | <%= link_to 'See all traces', {:controller => 'trace', :action => 'list'} %>
 <% end %>
 
-<%= @page %> 
 
-<%= link_to '>>>', {:controller => 'trace', :action => 'list', :page => @page+1}, {:title => 'next page'} %>
+<br />
+<br />
 
-(<%= 1+(@page * 20)%>-<%= (1+@page) * 20 %>)
+<%= render (:partial => 'trace_paging_nav') %>
 
 <table id="keyvalue" cellpadding="3">
   <tr>
@@ -29,3 +27,6 @@ Showing page
   </tr>
   <%= render :partial => 'trace', :collection => @traces %>
 </table>
+<%= render (:partial => 'trace_paging_nav') %>
+
+<%= render (:partial => 'trace_optionals') %>