Dressed up note comment messages

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

diff --git a/app/views/notifier/note_comment_notification.html.erb b/app/views/notifier/note_comment_notification.html.erb
index fade148d847f57e5fb0be006ff15fd3f5acfd06b..ab4378fa275f00067570c4a235a7002f90ee683f 100644 (file)
--- a/app/views/notifier/note_comment_notification.html.erb
+++ b/app/views/notifier/note_comment_notification.html.erb
@@ -1,15 +1,15 @@
-<%= t 'notifier.note_plain.greeting' %>
+<% content_for :body do %>
+  <p style="margin: 0"><%= t 'notifier.note_comment_notification.greeting' %></p>
 
-<% if @owner %>
-<%= t 'notifier.note_plain.your_note', :commenter => @commenter, :place => @place %>
-<% else %>
-<%= t 'notifier.note_plain.commented_note', :commenter => @commenter, :place => @place %>
-<% end %>
-
-==
-<%= @comment %>
-==
-
-<%= t 'notifier.note_plain.details', :URL => @noteurl %>
+  <% if @owner %>
+    <p><%= raw t "notifier.note_comment_notification.#{@event}.your_note", :commenter => link_to_user(@commenter), :place => @place %></p>
+  <% else %>
+    <p><%= raw t "notifier.note_comment_notification.#{@event}.commented_note", :commenter => link_to_user(@commenter), :place => @place %></p>
+  <% end %>
 
+  <%= render "notifier/user_message_table", :captured => capture { %>
+    <%= @comment.to_html %>
+  <% } %>
 
+  <p><%= raw t 'notifier.note_comment_notification.details', :url => link_to(@noteurl, @noteurl) %></p>
+<% end %>