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

[rails.git] / app / views / traces / new.html.erb

diff --git a/app/views/traces/new.html.erb b/app/views/traces/new.html.erb
index 51cd1630819b1d826e92c0e8d6763861ca7b203d..d2ccebb4cd4621922ab1bd7bbc69c411eba6de63 100644 (file)
--- a/app/views/traces/new.html.erb
+++ b/app/views/traces/new.html.erb
@@ -7,27 +7,27 @@
 <%= form_for @trace, :url => { :action => "create" }, :html => { :multipart => true } do |f| %>
   <div class="standard-form">
     <fieldset>
-      <div class='form-row'>
+      <div class='standard-form-row'>
         <label for="trace_gpx_file" class="standard-label"><%= t ".upload_gpx" %></label>
         <%= f.file_field :gpx_file %>
       </div>
-      <div class='form-row'>
+      <div class='standard-form-row'>
         <label class="standard-label"><%= t ".description" %></label>
         <%= f.text_field :description %>
       </div>
-      <div class='form-row'>
+      <div class='standard-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'>
+      <div class='standard-form-row'>
         <label class="standard-label"><%= t ".visibility" %></label>
         <%= f.select :visibility, [[t("traces.visibility.private"), "private"], [t("traces.visibility.public"), "public"], [t("traces.visibility.trackable"), "trackable"], [t("traces.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") %>
+    <%= f.submit %>
     <span class="form-help deemphasize"><a href="<%= t ".help_url" %>"><%= t ".help" %></a></span>
   </div>
 <% end %>