Make CSP rule for the remote control explicitly allow http

[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 ef55b9b96af68e3def52d07a5f1026a2543e3853..4e4b2ea9a993ff9cb97d4e8c76a923c931685b8c 100644 (file)
--- a/app/views/notifier/message_notification.html.erb
+++ b/app/views/notifier/message_notification.html.erb
@@ -1,12 +1,22 @@
-<p><%= t'notifier.message_notification.hi', :to_user => @to_user %></p>
-
-<p><%= raw t'notifier.message_notification.header', :from_user => link_to(@from_user, :host => SERVER_URL, :controller => :user, :action => :view, :display_name => @from_user), :subject => @title %></p>
-
-==
-<%= htmlize @text %>
-==
-
 <p>
-  <%= raw t'notifier.message_notification.footer1', :readurl => link_to(@readurl, @readurl) %>
-  <%= raw t'notifier.message_notification.footer2', :replyurl => link_to(@replyurl, @replyurl) %>
+  <%= t '.hi', :to_user => @to_user %>
 </p>
+<p>
+  <%= raw t '.header',
+          :from_user => link_to_user(@from_user),
+          :subject => content_tag("em", @title)
+  %>
+</p>
+
+<%= message_body do %>
+  <%= @text.to_html %>
+<% end %>
+
+<% content_for :footer do %>
+  <p>
+    <%= t '.footer_html',
+          :readurl => link_to(@readurl, @readurl) + tag(:br),
+          :replyurl => link_to(@replyurl, @replyurl)
+    %>
+  </p>
+<% end %>