Merge remote-tracking branch 'upstream/pull/1851'

[rails.git] / app / views / trace / create.html.erb

diff --git a/app/views/trace/create.html.erb b/app/views/trace/create.html.erb
index 140b74918cd8027323ad38f729df668d3a182f85..7e1af7862ccf37f16aa6556ed8dbf06ddf3c92c6 100644 (file)
--- a/app/views/trace/create.html.erb
+++ b/app/views/trace/create.html.erb
@@ -1,5 +1,33 @@
-<h1><%= t'trace.create.upload_trace' %></h1>
+<% content_for :heading do %>
+  <h1><%= t '.upload_trace' %></h1>
+<% end %>
 
 <%= error_messages_for 'trace' %>
 
-<%= render :partial => 'trace_form' %>
+<%= form_for @trace, :url => { :action => "create" }, :html => { :multipart => true } do |f| %>
+  <div class="standard-form">
+    <fieldset>
+      <div class='form-row'>
+        <label for="trace_gpx_file" class="standard-label"><%= t '.upload_gpx' %></label>
+        <%= f.file_field :gpx_file %>
+      </div>
+      <div class='form-row'>
+        <label class="standard-label"><%= t '.description' %></label>
+        <%= f.text_field :description %>
+      </div>
+      <div class='form-row'>
+        <label class="standard-label"><%= t '.tags' %></label>
+        <%= f.text_field :tagstring %>
+        <span class="form-help deemphasize">(<%= t '.tags_help' %>)</span>
+      </div>
+      <div class='form-row'>
+        <label class="standard-label"><%= t '.visibility' %></label>
+        <%= f.select :visibility, [[t('trace.visibility.private'),"private"],[t('trace.visibility.public'),"public"],[t('trace.visibility.trackable'),"trackable"],[t('trace.visibility.identifiable'),"identifiable"]] %>
+        <span class="form-help deemphasize">(<a href="<%= t '.visibility_help_url' %>"><%= t '.visibility_help' %></a>)</span>
+      </div>
+    </fieldset>
+
+    <%= submit_tag t('.upload_button') %>
+    <span class="form-help deemphasize"><a href="<%= t '.help_url' %>"><%= t '.help' %></a></span>
+  </div>
+<% end %>