Merge remote-tracking branch 'upstream/pull/2168'

[rails.git] / 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 823f1487aa86f442c68a40640ceb23fb6643fa00..080146fef1925fb921cf7f5898199c1f5196db6b 100644 (file)
--- a/app/views/notifier/message_notification.html.erb
+++ b/app/views/notifier/message_notification.html.erb
@@ -1,24 +1,20 @@
-<% 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',
+<p>
+  <%= t '.hi', :to_user => @to_user %>
+</p>
+<p>
+  <%= raw t '.header',

             :from_user => link_to_user(@from_user),
             :from_user => link_to_user(@from_user),

-            :subject => content_tag("em", @title)
-    %>
-  </p>
+            :subject => content_tag("em", @title) %>
+</p>

 
 

-  <%= render "notifier/user_message_table", :captured => capture { %>
-    <%= @text.to_html %>
-  <% } %>
+<%= message_body do %>
+  <%= @text.to_html %>

 <% end %>
 
 <% content_for :footer do %>
   <p>
 <% end %>
 
 <% content_for :footer do %>
   <p>

-    <%= t'notifier.message_notification.footer_html',
+    <%= t '.footer_html',

           :readurl => link_to(@readurl, @readurl) + tag(:br),
           :readurl => link_to(@readurl, @readurl) + tag(:br),

-          :replyurl => link_to(@replyurl, @replyurl)
-    %>
+          :replyurl => link_to(@replyurl, @replyurl) %>

   </p>
 <% end %>
   </p>
 <% end %>