X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/2e2f2124728ca755b2db8f83f022eaea24b647f0..3aa69ffbdda5f111aed60d77e1a1eec8cdcad3ba:/app/views/notifier/message_notification.html.erb

diff --git a/app/views/notifier/message_notification.html.erb b/app/views/notifier/message_notification.html.erb
index 4fb23e0a2..823f1487a 100644
--- a/app/views/notifier/message_notification.html.erb
+++ b/app/views/notifier/message_notification.html.erb
@@ -1,24 +1,24 @@
-***************************************************************************
-*                                                                         *
-<%= t'notifier.message_notification.banner1' %>
-<%= t'notifier.message_notification.banner2' %>
-*                                                                         *
-***************************************************************************
+<% content_for :body do %>
+  <p style="margin: 0">
+    <%= t'notifier.message_notification.hi', :to_user => @to_user %>
+  </p>
+  <p>
+    <%= raw t'notifier.message_notification.header',
+            :from_user => link_to_user(@from_user),
+            :subject => content_tag("em", @title)
+    %>
+  </p>
 
-<%= t'notifier.message_notification.hi', :to_user => @to_user %> 
+  <%= render "notifier/user_message_table", :captured => capture { %>
+    <%= @text.to_html %>
+  <% } %>
+<% end %>
 
-<%= t'notifier.message_notification.header', :from_user => @from_user, :subject => @title %>
-
-==
-<%= @body %>
-==
-
-<%= t'notifier.message_notification.footer1', :readurl => @readurl %>
-<%= t'notifier.message_notification.footer2', :replyurl => @replyurl %>
-
-***************************************************************************
-*                                                                         *
-<%= t'notifier.message_notification.banner1' %>
-<%= t'notifier.message_notification.banner2' %>
-*                                                                         *
-***************************************************************************
+<% content_for :footer do %>
+  <p>
+    <%= t'notifier.message_notification.footer_html',
+          :readurl => link_to(@readurl, @readurl) + tag(:br),
+          :replyurl => link_to(@replyurl, @replyurl)
+    %>
+  </p>
+<% end %>