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

[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 42d9f8ab27a1b051bcd5333f89f279d16a0bd504..b7951cb32eb8f167f46b11e0cef5500441ec4323 100644 (file)
--- a/app/views/traces/new.html.erb
+++ b/app/views/traces/new.html.erb
@@ -1,33 +1,17 @@
 <% content_for :heading do %>
-  <h1><%= t '.upload_trace' %></h1>
+  <h1><%= t ".upload_trace" %></h1>
 <% end %>
 
-<%= error_messages_for 'trace' %>
-
-<%= 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('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') %>
-    <span class="form-help deemphasize"><a href="<%= t '.help_url' %>"><%= t '.help' %></a></span>
-  </div>
+<%= bootstrap_form_for @trace, :url => { :action => "create" }, :html => { :multipart => true } do |f| %>
+  <%= f.file_field :gpx_file, :placeholder => t("helpers.file.prompt") %>
+  <%= f.text_field :description %>
+  <%= f.text_field :tagstring %>
+  <%= f.select :visibility,
+               [[t("traces.visibility.private"), "private"],
+                [t("traces.visibility.public"), "public"],
+                [t("traces.visibility.trackable"), "trackable"],
+                [t("traces.visibility.identifiable"), "identifiable"]],
+               :help => link_to(t(".visibility_help"), t(".visibility_help_url")) %>
+  <%= f.primary %>
+  <%= link_to t(".help"), t(".help_url"), :class => "btn btn-link" %>
 <% end %>