Doing a resync from mainline 8633:10895. There was one simple to resolve conflict...

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

diff --git a/app/views/trace/mine.rhtml b/app/views/trace/mine.rhtml
index a626e2b514959b0bd7706e28b1eae02f673e2733..7deaa18315efa4f98fe263563ac7338206241a42 100644 (file)
--- a/app/views/trace/mine.rhtml
+++ b/app/views/trace/mine.rhtml
@@ -1,43 +1,3 @@
-<h1>Your GPS Traces</h1>
-
-<% 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 %>
-
-<% 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', '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>
-
-<% 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 %>
-
-<%= render (:partial => 'trace_optionals') %>
+<%= render :partial => 'trace_header' %>
+<%= render :partial => 'trace_form' %>
+<%= render :partial => 'trace_list' %>