Merge remote-tracking branch 'openstreetmap/pull/1030' into next

[rails.git] / app / views / notifier / friend_notification.html.erb

diff --git a/app/views/notifier/friend_notification.html.erb b/app/views/notifier/friend_notification.html.erb
index 91de4b732000ba31dd479007fd6dd2a704a78893..cfea971958452e8e7a69dfebd1b3a8a56390ee51 100644 (file)
--- a/app/views/notifier/friend_notification.html.erb
+++ b/app/views/notifier/friend_notification.html.erb
@@ -1,9 +1,9 @@
-<p style="margin: 0"><%= t 'notifier.friend_notification.had_added_you', :user => @friend.befriender.display_name %></p>
+<p><%= t 'notifier.friend_notification.had_added_you', :user => @friend.befriender.display_name %></p>
 
-<%= render "notifier/user_message_table", :captured => capture { %>
+<%= message_body do %>
   <p><%= raw t 'notifier.friend_notification.see_their_profile', :userurl => link_to(@viewurl, @viewurl) %></p>
 
   <% unless @friend.befriendee.is_friends_with?(@friend.befriender) -%>
   <p><%= raw t 'notifier.friend_notification.befriend_them', :befriendurl => link_to(@friendurl, @friendurl) %></p>
   <% end -%>
-<% } %>
+<% end %>