Merge remote-tracking branch 'openstreetmap/pull/1349'

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

diff --git a/app/views/trace/edit.html.erb b/app/views/trace/edit.html.erb
index d9ec9f14b7d94cc632ca824607c4ec2edfc07195..da273b0ebb390ff42549c9adb30d108e419bbc8e 100644 (file)
--- a/app/views/trace/edit.html.erb
+++ b/app/views/trace/edit.html.erb
@@ -9,49 +9,41 @@
 <div id='edit-trace-form' class='standard-form'>
   <fieldset>
     <div class='form-row'>
 <div id='edit-trace-form' class='standard-form'>
   <fieldset>
     <div class='form-row'>

-      <label><%= t'trace.edit.filename' %></label>
+      <label class='standard-label'><%= t'trace.edit.filename' %></label>

       <p class='deemphasize'><%= @trace.name %> (<%= link_to t('trace.edit.download'), :controller => 'trace', :action => 'data', :id => @trace.id %>)</p>
     </div>
     <div class='form-row'>
       <p class='deemphasize'><%= @trace.name %> (<%= link_to t('trace.edit.download'), :controller => 'trace', :action => 'data', :id => @trace.id %>)</p>
     </div>
     <div class='form-row'>

-      <label><%= t'trace.edit.uploaded_at' %></label>
+      <label class='standard-label'><%= t'trace.edit.uploaded_at' %></label>

       <p class='deemphasize'><%= l @trace.timestamp, :format => :friendly %></p>
     </div>
       <p class='deemphasize'><%= l @trace.timestamp, :format => :friendly %></p>
     </div>

-  </fieldset>
-

   <% if @trace.inserted? %>
   <% if @trace.inserted? %>

-
-  <fieldset>

     <div class='form-row'>
     <div class='form-row'>

-      <label><%= t'trace.edit.points' %></label>
+      <label class='standard-label'><%= t'trace.edit.points' %></label>

       <p class='deemphasize'><%= @trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/,'\1,') %></p>
     </div>
     <div class='form-row'>
       <p class='deemphasize'><%= @trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/,'\1,') %></p>
     </div>
     <div class='form-row'>

-      <label><%= t'trace.edit.start_coord' %></label>
+      <label class='standard-label'><%= t'trace.edit.start_coord' %></label>

     </div>
     <div class="geo">
       <span class="latitude"><%= @trace.latitude %></span>;
       <span class="longitude"><%= @trace.longitude %></span>
     </div>
     </div>
     <div class="geo">
       <span class="latitude"><%= @trace.latitude %></span>;
       <span class="longitude"><%= @trace.longitude %></span>
     </div>

-    (<%=link_to t('trace.edit.map'), :controller => 'site', :action => 'index', :lat => @trace.latitude, :lon => @trace.longitude, :zoom => 14 %> / <%=link_to t('trace.edit.edit'), :controller => 'site', :action => 'edit', :lat => @trace.latitude, :lon => @trace.longitude, :gpx=> @trace.id, :zoom => 14 %>)
-  </fieldset>
-
+    (<%=link_to t('trace.edit.map'), :controller => 'site', :action => 'index', :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %> / <%=link_to t('trace.edit.edit'), :controller => 'site', :action => 'edit', :gpx=> @trace.id, :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %>)

   <% end %>
   <% end %>

-
-  <fieldset>

     <div class='form-row'>
     <div class='form-row'>

-      <label><%= t'trace.edit.owner' %></label>
+      <label class='standard-label'><%= t'trace.edit.owner' %></label>

       <p class='deemphasize'><%= link_to h(@trace.user.display_name), {:controller => 'user', :action => 'view', :display_name => @trace.user.display_name} %></p>
     </div>
     <div class='form-row'>
       <p class='deemphasize'><%= link_to h(@trace.user.display_name), {:controller => 'user', :action => 'view', :display_name => @trace.user.display_name} %></p>
     </div>
     <div class='form-row'>

-      <label><%= t'trace.edit.description' %></label>
+      <label class='standard-label'><%= t'trace.edit.description' %></label>

       <%= f.text_field :description %>
     </div>
     <div class='form-row'>
       <%= f.text_field :description %>
     </div>
     <div class='form-row'>

-      <label><%= t'trace.edit.tags' %></label>
+      <label class='standard-label'><%= t'trace.edit.tags' %></label>

       <%= f.text_field :tagstring %> (<%= t'trace.edit.tags_help' %>)
     </div>
     <div class='form-row'>
       <%= f.text_field :tagstring %> (<%= t'trace.edit.tags_help' %>)
     </div>
     <div class='form-row'>

-      <label><%= t'trace.edit.visibility' %></label>
+      <label class='standard-label'><%= t'trace.edit.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"]] %> (<a href="<%= t'trace.edit.visibility_help_url' %>"><%= t'trace.edit.visibility_help' %></a>)
     </div>
   </fieldset>
       <%= f.select :visibility, [[t('trace.visibility.private'),"private"],[t('trace.visibility.public'),"public"],[t('trace.visibility.trackable'),"trackable"],[t('trace.visibility.identifiable'),"identifiable"]] %> (<a href="<%= t'trace.edit.visibility_help_url' %>"><%= t'trace.edit.visibility_help' %></a>)
     </div>
   </fieldset>