X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/8b5847f7e37de4a0f5b49b16f6529a46e3e4dc21..31778fd1554d0c23298c92fb62c2277200e31e61:/app/views/notifier/diary_comment_notification.html.erb

diff --git a/app/views/notifier/diary_comment_notification.html.erb b/app/views/notifier/diary_comment_notification.html.erb
index efdd620e6..ea9a65591 100644
--- a/app/views/notifier/diary_comment_notification.html.erb
+++ b/app/views/notifier/diary_comment_notification.html.erb
@@ -1,9 +1,20 @@
-<%= t'notifier.diary_comment_notification.hi', :to_user => @to_user %> 
+<% content_for :body do %>
+  <p style="margin: 0">
+    <%= t'notifier.diary_comment_notification.hi', :to_user => @to_user %>
+  </p>
+  <p>
+    <%= raw t'notifier.diary_comment_notification.header', :from_user => link_to_user(@from_user), :subject => content_tag("em", @title) %>
+  </p>
 
-<%= t'notifier.diary_comment_notification.header', :from_user => @from_user, :subject => @title %>
+  <%= render "notifier/user_message_table", :captured => capture { %>
+    <%= @text.to_html %>
+  <% } %>
+<% end %>
 
-==
-<%= @body %>
-==
-
-<%= t'notifier.diary_comment_notification.footer', :readurl => @readurl, :commenturl => @commenturl, :replyurl => @replyurl %>
+<% content_for :footer do %>
+  <p><%= raw t'notifier.diary_comment_notification.footer',
+             :readurl => link_to(@readurl, @readurl) + tag(:br),
+             :commenturl => link_to(@commenturl, @commenturl) + tag(:br),
+             :replyurl => link_to(@replyurl, @replyurl)
+  %></p>
+<% end %>