Move trace descriptions out of success/failure sentences in emails

app/views/user_mailer/_gpx_description.html.erb

@@ -1,9 +1,16 @@
-<% trace_name = tag.strong(@trace_name) %>
-<% trace_name = link_to(trace_name, @trace_url) if @trace_url %>
-<% trace_description = tag.em(@trace_description) %>
-<% if @trace_tags.length > 0 %>
-  <% tags = safe_join @trace_tags.map { |trace_tag| tag.em trace_tag.tag }, ", " %>
-  <%= t ".description_with_tags_html", :trace_name => trace_name, :trace_description => trace_description, :tags => tags %>
-<% else %>
-  <%= t ".description_with_no_tags_html", :trace_name => trace_name, :trace_description => trace_description %>
-<% end %>
+<p><%= t ".details" %></p>
+
+<dl>
+  <dt><%= t ".filename" %>
+  <% if @trace_url %>
+    <dd><%= link_to(@trace_name, @trace_url) %>
+  <% else %>
+    <dd><%= @trace_name %>
+  <% end %>
+  <dt><%= t ".description" %>
+  <dd><%= @trace_description %>
+  <% if @trace_tags.length > 0 %>
+    <dt><%= t ".tags" %>
+    <dd><%= @trace_tags.map(&:tag).join(", ") %>
+  <% end %>
+</dl>

app/views/user_mailer/_gpx_description.text.erb

@@ -1,8 +1,14 @@
-<% trace_name = @trace_name %>
-<% trace_description = @trace_description %>
-<% if @trace_tags.length > 0 %>
-  <% tags = @trace_tags.map { |trace_tag| trace_tag.tag }.join(", ") %>
-  <%= t ".description_with_tags", :trace_name => trace_name, :trace_description => trace_description, :tags => tags %>
-<% else %>
-  <%= t ".description_with_no_tags", :trace_name => trace_name, :trace_description => trace_description %>
+<%= t ".details" %>
+
+<%= t ".filename" %>
+	<%= @trace_name %>
+<% if @trace_url %>
+<%= t ".url" %>
+	<%= @trace_url %>
+<% end %>
+<%= t ".description" %>
+	<%= @trace_description %>
+<% if @trace_tags.length > 0 %>
+<%= t ".tags" %>
+	<%= @trace_tags.map(&:tag).join(", ") %>
 <% end %>

app/views/user_mailer/gpx_failure.html.erb

@@ -1,9 +1,10 @@
 <p><%= t ".hi", :to_user => @to_user %></p>
 
-<p>
-  <%= render :partial => "gpx_description" %>
-  <%= t ".failed_to_import" %>
-</p>
+<p><%= t ".failed_to_import" %>
+
+<%= render :partial => "gpx_description" %>
+
+<p><%= t ".verify" %></p>
 
 <blockquote>
   <%= @error %>

app/views/user_mailer/gpx_failure.text.erb

@@ -1,8 +1,11 @@
 <%= t ".hi", :to_user => @to_user %>
 
-<%= render :partial => "gpx_description" %>
 <%= t ".failed_to_import" %>
 
+<%= render :partial => "gpx_description" %>
+
+<%= t ".verify" %>
+
 ==
 <%= @error %>
 ==

app/views/user_mailer/gpx_success.html.erb

@@ -1,9 +1,8 @@
 <p><%= t ".hi", :to_user => @to_user %></p>
 
-<p>
-  <%= render :partial => "gpx_description" %>
-  <%= t(".loaded", :trace_points => @trace_points, :count => @possible_points) %>
-</p>
+<p><%= t ".loaded_successfully", :trace_points => @trace_points, :count => @possible_points %>
+
+<%= render :partial => "gpx_description" %>
 
 <p>
   <%= t ".all_your_traces_html", :url => link_to(@my_traces_url, @my_traces_url) %>

app/views/user_mailer/gpx_success.text.erb

@@ -1,8 +1,7 @@
 <%= t ".hi", :to_user => @to_user %>
 
-<%= render :partial => "gpx_description" %>
-<%= t(".loaded", :trace_points => @trace_points, :count => @possible_points) %>
+<%= t ".loaded_successfully", :trace_points => @trace_points, :count => @possible_points %>
 
-<%= t ".trace_location", :trace_url => @trace_url %>
+<%= render :partial => "gpx_description" %>
 
 <%= t ".all_your_traces", :url => @my_traces_url %>