Allow the map centre and marker position to be set independently.

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

diff --git a/app/views/trace/mine.rhtml b/app/views/trace/mine.rhtml
index 41aa0bc1eb09a0b96da419ca01d6fa8d7fece796..661f73c52777bce3476e1269aaa05073d862d039 100644 (file)
--- a/app/views/trace/mine.rhtml
+++ b/app/views/trace/mine.rhtml
@@ -1,22 +1,43 @@
 <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) %>
+
+<% form_tag({:action => 'create'}, :multipart => true) do %>
 <table>
 <table>
 <tr><td align="right">upload GPX file:</td><td><%= file_field('trace', 'gpx_file', {:size => 50, :maxlength => 255}) %></td></tr>
 <tr><td align="right">description:</td><td><%= text_field('trace', 'description', {:size => 50, :maxlength => 255}) %></td></tr>
-<tr><td align="right">tags:</td><td><%= text_field('trace', 'tags', {:size => 50, :maxlength => 255}) %></td></tr>
+<tr><td align="right">tags:</td><td><%= text_field('trace', 'tagstring', {:size => 50, :maxlength => 255}) %></td></tr>
 <tr><td align="right">public?</td><td><%= check_box('trace', 'public', {:checked => 'checked'}) %></td></tr>
 <tr><td></td><td>
 <%= submit_tag 'Upload' %> | <a href="http://wiki.openstreetmap.org/index.php/Upload">help</a>
 </td></tr>
 </table>
 
-<br>
+<% end %>
+
+<%= render :partial => 'trace_paging_nav' %>
+<table id="keyvalue" cellpadding="3">
+  <tr>
+    <th></th>
+    <th></th>
+  </tr>
+  <%= render :partial => 'trace', :collection => @traces unless @traces.nil? %>
+</table>
+<%= render :partial => 'trace_paging_nav' %>
 
-<%= end_form_tag %> 
 <% end %>
 
+<%= render :partial => 'trace_optionals' %>