X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/02628bed1e7b5c2656bc68076403467e92462b4f..9f84c6f46e14eb64f985d2b67a331957f648380a:/app/views/trace/edit.html.erb

diff --git a/app/views/trace/edit.html.erb b/app/views/trace/edit.html.erb
index 2f73d2d4e..07e9820e6 100644
--- a/app/views/trace/edit.html.erb
+++ b/app/views/trace/edit.html.erb
@@ -1,42 +1,54 @@
-<h2><%= t 'trace.edit.heading', :name => h(@trace.name) %></h2>
+<% content_for :heading do %>
+  <h2><%= t 'trace.edit.heading', :name => h(@trace.name) %></h2>
+<% end %>
 
 <img src="<%= url_for :controller => 'trace', :action => 'picture', :id => @trace.id, :display_name => @trace.user.display_name %>">
 
-<% form_for :trace, @trace do |f| %>
+<%= form_for @trace, :method => :post, :url => { :action => "edit" } do |f| %>
 
-<table border="0">
-  <tr>
-    <td><%= t'trace.edit.filename' %></td>
-    <td><%= @trace.name %> (<%= link_to t('trace.edit.download'), :controller => 'trace', :action => 'data', :id => @trace.id %>)</td>
-  </tr> 
-  <tr>
-    <td><%= t'trace.edit.uploaded_at' %></td>
-    <td><%= l @trace.timestamp %></td>
-  </tr>
+<div id='edit-trace-form' class='standard-form'>
+  <fieldset>
+    <div class='form-row'>
+      <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'>
+      <label class='standard-label'><%= t'trace.edit.uploaded_at' %></label>
+      <p class='deemphasize'><%= l @trace.timestamp, :format => :friendly %></p>
+    </div>
   <% if @trace.inserted? %>
-  <tr>
-    <td><%= t'trace.edit.points' %></td>
-    <td><%= @trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/,'\1,') %></td></tr>
-  <tr>
-    <td><%= t'trace.edit.start_coord' %></td>
-    <td><div class="geo" style="display: inline"><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 %>)</td>
-  </tr>
+    <div class='form-row'>
+      <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'>
+      <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>
+    (<%=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 %>
-  <tr>
-    <td><%= t'trace.edit.owner' %></td>
-    <td><%= link_to h(@trace.user.display_name), {:controller => 'user', :action => 'view', :display_name => @trace.user.display_name} %></td>
-  </tr>
-  <tr>
-    <td><%= t'trace.edit.description' %></td>
-    <td><%= f.text_field :description %></td>
-  </tr>
-  <tr>
-    <td><%= t'trace.edit.tags' %></td>
-    <td><%= f.text_field :tagstring %></td>
-  </tr>
-</table>
+    <div class='form-row'>
+      <label class='standard-label'><%= t'trace.edit.owner' %></label>
+      <p class='deemphasize'><%= link_to h(@trace.user.display_name), user_path(@trace.user) %></p>
+    </div>
+    <div class='form-row'>
+      <label class='standard-label'><%= t'trace.edit.description' %></label>
+      <%= f.text_field :description %>
+    </div>
+    <div class='form-row'>
+      <label class='standard-label'><%= t'trace.edit.tags' %></label>
+      <%= f.text_field :tagstring %> (<%= t'trace.edit.tags_help' %>)
+    </div>
+    <div class='form-row'>
+      <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>
 
-<br /><br />
+</div>
 
 <%= submit_tag t'trace.edit.save_button' %>