projects
/
rails.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
38cfc35
)
Whitespace fixes for notifier erb views
author
Andy Allan
<git@gravitystorm.co.uk>
Wed, 6 Mar 2019 09:34:54 +0000
(10:34 +0100)
committer
Tom Hughes
<tom@compton.nu>
Tue, 26 Mar 2019 20:23:35 +0000
(20:23 +0000)
app/views/notifier/_gpx_description.html.erb
patch
|
blob
|
history
app/views/notifier/_message_body.html.erb
patch
|
blob
|
history
app/views/notifier/diary_comment_notification.html.erb
patch
|
blob
|
history
app/views/notifier/gpx_failure.html.erb
patch
|
blob
|
history
app/views/notifier/gpx_success.html.erb
patch
|
blob
|
history
app/views/notifier/message_notification.html.erb
patch
|
blob
|
history
diff --git
a/app/views/notifier/_gpx_description.html.erb
b/app/views/notifier/_gpx_description.html.erb
index 8d44336c9910715bbfd59f009b23cdd9a798e86f..d83f72d9091045bb6fbefa5fbc581d11738c77a6 100644
(file)
--- 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' %>
<strong><%= @trace_name %></strong>
<strong><%= @trace_name %></strong>
-<%= t'notifier.gpx_notification.with_description' %>
+<%= t
'notifier.gpx_notification.with_description' %>
<em><%= @trace_description %></em>
<% if @trace_tags.length>0 %>
<em><%= @trace_description %></em>
<% if @trace_tags.length>0 %>
- <%= t'notifier.gpx_notification.and_the_tags' %>
+ <%= t
'notifier.gpx_notification.and_the_tags' %>
<em><% @trace_tags.each do |tag| %>
<%= tag.tag.rstrip %>
<% end %></em>
<% else %>
<em><% @trace_tags.each do |tag| %>
<%= tag.tag.rstrip %>
<% end %></em>
<% else %>
- <%= t'notifier.gpx_notification.and_no_tags' %>
+ <%= t
'notifier.gpx_notification.and_no_tags' %>
<% end %>
<% end %>
diff --git
a/app/views/notifier/_message_body.html.erb
b/app/views/notifier/_message_body.html.erb
index 38f4917993b8c40dbf1ad2afb52a1a7eaba4ec75..b3b0eb687d5b44277e6cd8d76d2e4134e2575562 100644
(file)
--- a/
app/views/notifier/_message_body.html.erb
+++ b/
app/views/notifier/_message_body.html.erb
@@
-2,17
+2,17
@@
<tr>
<td style="width: 50px; min-width: 50px; vertical-align: top; padding: 15px">
<%= link_to(
<tr>
<td style="width: 50px; min-width: 50px; vertical-align: top; padding: 15px">
<%= 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"
+
) %>
</td>
<td style="text-align: left; vertical-align: top; padding-right: 10px; width: 100%">
<%= body %>
</td>
<td style="text-align: left; vertical-align: top; padding-right: 10px; width: 100%">
<%= body %>
diff --git
a/app/views/notifier/diary_comment_notification.html.erb
b/app/views/notifier/diary_comment_notification.html.erb
index 163223b44584cbd2fe92df87b920db081cf85474..1191286f1953a1b193931430ce5115068acf79b0 100644
(file)
--- 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 %>
<p><%= raw t '.footer',
<% content_for :footer do %>
<p><%= raw t '.footer',
- :readurl => link_to(@readurl, @readurl) + tag(:br),
- :commenturl => link_to(@commenturl, @commenturl) + tag(:br),
- :replyurl => link_to(@replyurl, @replyurl)
-
%>
</p>
+
:readurl => link_to(@readurl, @readurl) + tag(:br),
+
:commenturl => link_to(@commenturl, @commenturl) + tag(:br),
+ :replyurl => link_to(@replyurl, @replyurl) %>
+ </p>
<% end %>
<% end %>
diff --git
a/app/views/notifier/gpx_failure.html.erb
b/app/views/notifier/gpx_failure.html.erb
index dace1852264604c2a2a38e48b497c54a2b130d50..fee70eed0859e279f44dceeaca94ed9fc95c3e69 100644
(file)
--- a/
app/views/notifier/gpx_failure.html.erb
+++ b/
app/views/notifier/gpx_failure.html.erb
@@
-1,8
+1,8
@@
-<p><%= t'notifier.gpx_notification.greeting' %></p>
+<p><%= t
'notifier.gpx_notification.greeting' %></p>
<p>
<%= render :partial => "gpx_description" %>
<p>
<%= render :partial => "gpx_description" %>
- <%= t'notifier.gpx_notification.failure.failed_to_import' %>
+ <%= t
'notifier.gpx_notification.failure.failed_to_import' %>
</p>
<blockquote>
</p>
<blockquote>
@@
-10,7
+10,7
@@
</blockquote>
<p>
</blockquote>
<p>
- <%= 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' %>
</p>
</p>
diff --git
a/app/views/notifier/gpx_success.html.erb
b/app/views/notifier/gpx_success.html.erb
index d298bd70a0c9f3690be86482224a663590f75ad6..71611a0887b7783252391e87a87c3d8ee11dc482 100644
(file)
--- a/
app/views/notifier/gpx_success.html.erb
+++ b/
app/views/notifier/gpx_success.html.erb
@@
-1,6
+1,6
@@
-<p><%= t'notifier.gpx_notification.greeting' %></p>
+<p><%= t
'notifier.gpx_notification.greeting' %></p>
<p>
<%= render :partial => "gpx_description" %>
<p>
<%= 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 %>
</p>
</p>
diff --git
a/app/views/notifier/message_notification.html.erb
b/app/views/notifier/message_notification.html.erb
index 4e4b2ea9a993ff9cb97d4e8c76a923c931685b8c..080146fef1925fb921cf7f5898199c1f5196db6b 100644
(file)
--- a/
app/views/notifier/message_notification.html.erb
+++ b/
app/views/notifier/message_notification.html.erb
@@
-3,9
+3,8
@@
</p>
<p>
<%= raw t '.header',
</p>
<p>
<%= 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) %>
</p>
<%= message_body do %>
</p>
<%= message_body do %>
@@
-16,7
+15,6
@@
<p>
<%= t '.footer_html',
:readurl => link_to(@readurl, @readurl) + tag(:br),
<p>
<%= t '.footer_html',
:readurl => link_to(@readurl, @readurl) + tag(:br),
- :replyurl => link_to(@replyurl, @replyurl)
- %>
+ :replyurl => link_to(@replyurl, @replyurl) %>
</p>
<% end %>
</p>
<% end %>