Merge branch 'master' into next

[rails.git] / 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 efdd620e6f763e5c2d5f01a5521f906b63fa2f92..163223b44584cbd2fe92df87b920db081cf85474 100644 (file)
--- a/app/views/notifier/diary_comment_notification.html.erb
+++ b/app/views/notifier/diary_comment_notification.html.erb
@@ -1,9 +1,18 @@
-<%= t'notifier.diary_comment_notification.hi', :to_user => @to_user %> 
+<p>
+  <%= t '.hi', :to_user => @to_user %>
+</p>
+<p>
+  <%= raw t '.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 %>
+<%= message_body do %>
+  <%= @text.to_html %>
+<% end %>

 
 

-==
-<%= @body %>
-==
-
-<%= t'notifier.diary_comment_notification.footer', :readurl => @readurl, :commenturl => @commenturl, :replyurl => @replyurl %>
+<% content_for :footer do %>
+  <p><%= raw t '.footer',
+             :readurl => link_to(@readurl, @readurl) + tag(:br),
+             :commenturl => link_to(@commenturl, @commenturl) + tag(:br),
+             :replyurl => link_to(@replyurl, @replyurl)
+  %></p>
+<% end %>