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

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

diff --git a/app/views/traces/edit.html.erb b/app/views/traces/edit.html.erb
index c17660db39757d40fbe11ab2dc3985bf843f9a87..e3771bac0b225d3390860c3ae5593cb6960d778c 100644 (file)
--- a/app/views/traces/edit.html.erb
+++ b/app/views/traces/edit.html.erb
@@ -1,5 +1,5 @@
 <% content_for :heading do %>
-  <h2><%= t ".heading", :name => h(@trace.name) %></h2>
+  <h2><%= t ".heading", :name => @trace.name %></h2>
 <% end %>
 
 <img src="<%= url_for :controller => "traces", :action => "picture", :id => @trace.id, :display_name => @trace.user.display_name %>">
@@ -8,20 +8,20 @@
 
 <div id='edit-trace-form' class='standard-form'>
   <fieldset>
-    <div class='form-row'>
+    <div class='standard-form-row'>
       <label class='standard-label'><%= t ".filename" %></label>
       <p class='deemphasize'><%= @trace.name %> (<%= link_to t(".download"), trace_data_path(@trace) %>)</p>
     </div>
-    <div class='form-row'>
+    <div class='standard-form-row'>
       <label class='standard-label'><%= t ".uploaded_at" %></label>
       <p class='deemphasize'><%= l @trace.timestamp, :format => :friendly %></p>
     </div>
   <% if @trace.inserted? %>
-    <div class='form-row'>
+    <div class='standard-form-row'>
       <label class='standard-label'><%= t ".points" %></label>
       <p class='deemphasize'><%= @trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/, '\1,') %></p>
     </div>
-    <div class='form-row'>
+    <div class='standard-form-row'>
       <label class='standard-label'><%= t ".start_coord" %></label>
     </div>
     <div class="geo">
@@ -30,19 +30,19 @@
     </div>
     (<%= link_to t(".map"), :controller => "site", :action => "index", :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %> / <%= link_to t(".edit"), :controller => "site", :action => "edit", :gpx => @trace.id, :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %>)
   <% end %>
-    <div class='form-row'>
+    <div class='standard-form-row'>
       <label class='standard-label'><%= t ".owner" %></label>
-      <p class='deemphasize'><%= link_to h(@trace.user.display_name), user_path(@trace.user) %></p>
+      <p class='deemphasize'><%= link_to @trace.user.display_name, user_path(@trace.user) %></p>
     </div>
-    <div class='form-row'>
+    <div class='standard-form-row'>
       <label class='standard-label'><%= t ".description" %></label>
       <%= f.text_field :description %>
     </div>
-    <div class='form-row'>
+    <div class='standard-form-row'>
       <label class='standard-label'><%= t ".tags" %></label>
       <%= f.text_field :tagstring %> (<%= t ".tags_help" %>)
     </div>
-    <div class='form-row'>
+    <div class='standard-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"]] %> (<a href="<%= t ".visibility_help_url" %>"><%= t ".visibility_help" %></a>)
     </div>
@@ -50,6 +50,6 @@
 
 </div>
 
-<%= submit_tag t ".save_button" %>
+<%= f.submit %>
 
 <% end %>