Fix incorrectly nested HTML in OAuth application creation form

[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..b47900a631fc2ef28e90ffe2fe87564beead0c18 100644 (file)
--- a/app/views/notifier/diary_comment_notification.html.erb
+++ b/app/views/notifier/diary_comment_notification.html.erb
@@ -1,9 +1,9 @@
-<%= t'notifier.diary_comment_notification.hi', :to_user => @to_user %> 
+<p><%= t'notifier.diary_comment_notification.hi', :to_user => @to_user %></p>

 
 

-<%= t'notifier.diary_comment_notification.header', :from_user => @from_user, :subject => @title %>
+<p><%= raw t'notifier.diary_comment_notification.header', :from_user => link_to(@from_user, :host => SERVER_URL, :controller => :user, :action => :view, :display_name => @from_user), :subject => @title %></p>

 
 ==
 
 ==

-<%= @body %>
+<%= @text.to_html %>

 ==
 
 ==
 

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