From: Herve Saint-Amand Date: Thu, 12 Jan 2017 22:28:09 +0000 (+0000) Subject: Dressed up gpx notification mails X-Git-Tag: live~3653^2~18 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/6d1c10afbc3641095c515152f6ae07a0b9ddffcf Dressed up gpx notification mails --- diff --git a/app/views/notifier/_gpx_description.html.erb b/app/views/notifier/_gpx_description.html.erb index 282579919..8d44336c9 100644 --- a/app/views/notifier/_gpx_description.html.erb +++ b/app/views/notifier/_gpx_description.html.erb @@ -1,14 +1,12 @@ -<%= t'notifier.gpx_notification.greeting' %> - <%= t'notifier.gpx_notification.your_gpx_file' %> - - <%= @trace_name %> - +<%= @trace_name %> <%= t'notifier.gpx_notification.with_description' %> - - <%= @trace_description %> +<%= @trace_description %> <% if @trace_tags.length>0 %> -<%= t'notifier.gpx_notification.and_the_tags' %> -<% @trace_tags.each do |tag| %> - <%= tag.tag.rstrip %><% end %><% else %> -<%= t'notifier.gpx_notification.and_no_tags' %><% end %> + <%= t'notifier.gpx_notification.and_the_tags' %> + <% @trace_tags.each do |tag| %> + <%= tag.tag.rstrip %> + <% end %> +<% else %> + <%= t'notifier.gpx_notification.and_no_tags' %> +<% end %> diff --git a/app/views/notifier/gpx_failure.html.erb b/app/views/notifier/gpx_failure.html.erb index f59aa3dbb..d1319acbd 100644 --- a/app/views/notifier/gpx_failure.html.erb +++ b/app/views/notifier/gpx_failure.html.erb @@ -1,9 +1,18 @@ -<%= render :partial => "gpx_description" %> -<%= t'notifier.gpx_notification.failure.failed_to_import' %> +<% content_for :body do %> +

<%= t'notifier.gpx_notification.greeting' %>

- <%= @error %> +

+ <%= render :partial => "gpx_description" %> + <%= t'notifier.gpx_notification.failure.failed_to_import' %> +

-<%= t'notifier.gpx_notification.failure.more_info_1' %> -<%= t'notifier.gpx_notification.failure.more_info_2' %> +
+ <%= @error %> +
- <%= t'notifier.gpx_notification.failure.import_failures_url' %> +

+ <%= t'notifier.gpx_notification.failure.more_info_1' %> + <%= t'notifier.gpx_notification.failure.more_info_2' %> + <%= t'notifier.gpx_notification.failure.import_failures_url' %> +

+<% end %> diff --git a/app/views/notifier/gpx_success.html.erb b/app/views/notifier/gpx_success.html.erb index 1983fe71c..97267944e 100644 --- a/app/views/notifier/gpx_success.html.erb +++ b/app/views/notifier/gpx_success.html.erb @@ -1,2 +1,8 @@ -<%= render :partial => "gpx_description" %> -<%= t'notifier.gpx_notification.success.loaded_successfully', :trace_points => @trace_points, :possible_points => @possible_points %> +<% content_for :body do %> +

<%= t'notifier.gpx_notification.greeting' %>

+ +

+ <%= render :partial => "gpx_description" %> + <%= t'notifier.gpx_notification.success.loaded_successfully', :trace_points => @trace_points, :possible_points => @possible_points %> +

+<% end %>