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 98bce9a513609c1aef72acfbb0164bcfde108bbe..7e1af7862ccf37f16aa6556ed8dbf06ddf3c92c6 100644 (file)
--- a/app/views/trace/create.html.erb
+++ b/app/views/trace/create.html.erb
@@ -1,5 +1,5 @@
 <% content_for :heading do %>
-  <h1><%= t'trace.create.upload_trace' %></h1>
+  <h1><%= t '.upload_trace' %></h1>
 <% end %>
 
 <%= error_messages_for 'trace' %>
@@ -7,24 +7,27 @@
 <%= form_for @trace, :url => { :action => "create" }, :html => { :multipart => true } do |f| %>
   <div class="standard-form">
     <fieldset>
-      <label><%= t'trace.trace_form.upload_gpx' %></label>
-      <%= f.file_field :gpx_file %>
+      <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>
-    <fieldset>
-      <label><%= t'trace.trace_form.description' %></label>
-      <%= f.text_field :description %></td></tr>
-    </fieldset>
-    <fieldset>
-      <label><%= t'trace.trace_form.tags' %></label>
-      <%= f.text_field :tagstring %>
-      <p class="form-help deemphasize">(<%= t'trace.trace_form.tags_help' %>)</p>
-    </fieldset>
-    <fieldset>
-      <label><%= t'trace.trace_form.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"]] %>
-      <p class="form-help deemphasize">(<a href="<%= t'trace.trace_form.visibility_help_url' %>"><%= t'trace.trace_form.visibility_help' %></a>)</p>
-    </fieldset>
-    <%= submit_tag t('trace.trace_form.upload_button') %>
-    <p class="form-help deemphasize"><a href="<%= t'trace.trace_form.help_url' %>"><%= t'trace.trace_form.help' %></a></p>
+
+    <%= submit_tag t('.upload_button') %>
+    <span class="form-help deemphasize"><a href="<%= t '.help_url' %>"><%= t '.help' %></a></span>
   </div>
 <% end %>