From 68a5aa5ed805c97f217fa09f869179c3544a8d63 Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Wed, 6 Mar 2019 10:34:54 +0100 Subject: [PATCH 1/1] Whitespace fixes for notifier erb views --- app/views/notifier/_gpx_description.html.erb | 8 +++---- app/views/notifier/_message_body.html.erb | 22 +++++++++---------- .../diary_comment_notification.html.erb | 8 +++---- app/views/notifier/gpx_failure.html.erb | 10 ++++----- app/views/notifier/gpx_success.html.erb | 4 ++-- .../notifier/message_notification.html.erb | 8 +++---- 6 files changed, 29 insertions(+), 31 deletions(-) diff --git a/app/views/notifier/_gpx_description.html.erb b/app/views/notifier/_gpx_description.html.erb index 8d44336c9..d83f72d90 100644 --- a/app/views/notifier/_gpx_description.html.erb +++ b/app/views/notifier/_gpx_description.html.erb @@ -1,12 +1,12 @@ -<%= t'notifier.gpx_notification.your_gpx_file' %> +<%= t 'notifier.gpx_notification.your_gpx_file' %> <%= @trace_name %> -<%= t'notifier.gpx_notification.with_description' %> +<%= t 'notifier.gpx_notification.with_description' %> <%= @trace_description %> <% if @trace_tags.length>0 %> - <%= t'notifier.gpx_notification.and_the_tags' %> + <%= t 'notifier.gpx_notification.and_the_tags' %> <% @trace_tags.each do |tag| %> <%= tag.tag.rstrip %> <% end %> <% else %> - <%= t'notifier.gpx_notification.and_no_tags' %> + <%= t 'notifier.gpx_notification.and_no_tags' %> <% end %> diff --git a/app/views/notifier/_message_body.html.erb b/app/views/notifier/_message_body.html.erb index 38f491799..b3b0eb687 100644 --- a/app/views/notifier/_message_body.html.erb +++ b/app/views/notifier/_message_body.html.erb @@ -2,17 +2,17 @@ <%= link_to( - image_tag( - attachments["avatar.png"].url, - alt: @author, - title: @author, - width: 50, - height: 50, - border: 0 - ), - user_url(@author), - :target => "_blank" - ) %> + image_tag( + attachments["avatar.png"].url, + alt: @author, + title: @author, + width: 50, + height: 50, + border: 0 + ), + user_url(@author), + :target => "_blank" + ) %> <%= body %> diff --git a/app/views/notifier/diary_comment_notification.html.erb b/app/views/notifier/diary_comment_notification.html.erb index 163223b44..1191286f1 100644 --- a/app/views/notifier/diary_comment_notification.html.erb +++ b/app/views/notifier/diary_comment_notification.html.erb @@ -11,8 +11,8 @@ <% content_for :footer do %>

<%= raw t '.footer', - :readurl => link_to(@readurl, @readurl) + tag(:br), - :commenturl => link_to(@commenturl, @commenturl) + tag(:br), - :replyurl => link_to(@replyurl, @replyurl) - %>

+ :readurl => link_to(@readurl, @readurl) + tag(:br), + :commenturl => link_to(@commenturl, @commenturl) + tag(:br), + :replyurl => link_to(@replyurl, @replyurl) %> +

<% end %> diff --git a/app/views/notifier/gpx_failure.html.erb b/app/views/notifier/gpx_failure.html.erb index dace18522..fee70eed0 100644 --- a/app/views/notifier/gpx_failure.html.erb +++ b/app/views/notifier/gpx_failure.html.erb @@ -1,8 +1,8 @@ -

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

+

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

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

@@ -10,7 +10,7 @@

- <%= t'notifier.gpx_notification.failure.more_info_1' %> - <%= t'notifier.gpx_notification.failure.more_info_2' %> - <%= 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' %>

diff --git a/app/views/notifier/gpx_success.html.erb b/app/views/notifier/gpx_success.html.erb index d298bd70a..71611a088 100644 --- a/app/views/notifier/gpx_success.html.erb +++ b/app/views/notifier/gpx_success.html.erb @@ -1,6 +1,6 @@ -

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

+

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

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

diff --git a/app/views/notifier/message_notification.html.erb b/app/views/notifier/message_notification.html.erb index 4e4b2ea9a..080146fef 100644 --- a/app/views/notifier/message_notification.html.erb +++ b/app/views/notifier/message_notification.html.erb @@ -3,9 +3,8 @@

<%= raw t '.header', - :from_user => link_to_user(@from_user), - :subject => content_tag("em", @title) - %> + :from_user => link_to_user(@from_user), + :subject => content_tag("em", @title) %>

<%= message_body do %> @@ -16,7 +15,6 @@

<%= t '.footer_html', :readurl => link_to(@readurl, @readurl) + tag(:br), - :replyurl => link_to(@replyurl, @replyurl) - %> + :replyurl => link_to(@replyurl, @replyurl) %>

<% end %> -- 2.43.2