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

[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 d72899f169a20b6987cea731879d0426a632d656..ae5ffe5657ffbbfaddc7e2a0cd519aae89ddba26 100644 (file)
--- a/app/views/traces/new.html.erb
+++ b/app/views/traces/new.html.erb
@@ -1,33 +1,18 @@
 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h1><%= t '.upload_trace' %></h1>
+  <h1><%= t ".upload_trace" %></h1>

 <% end %>
 
 <% 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"),
+                              :help => ".gpx, .tar.gz, .tar.bz2, .tar, .zip, .gpx.gz, .gpx.bz2" %>
+  <%= f.text_field :description, :maxlength => 255 %>
+  <%= 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 %>
 <% end %>