Simplified the partial layout

[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..7a4ac66a5a79757ea751e7b4d5ffd6831ced091f 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 style="margin: 0">
+  <%= t'notifier.message_notification.hi', :to_user => @to_user %>
+</p>

 <p>
 <p>

-  <%= raw t'notifier.message_notification.footer1', :readurl => link_to(@readurl, @readurl) %>
-  <%= raw t'notifier.message_notification.footer2', :replyurl => link_to(@replyurl, @replyurl) %>
+  <%= raw t'notifier.message_notification.header',
+          :from_user => link_to_user(@from_user),
+          :subject => content_tag("em", @title)
+  %>

 </p>
 </p>

+
+<%= render "notifier/user_message_table", :captured => capture { %>
+  <%= @text.to_html %>
+<% } %>
+
+<% content_for :footer do %>
+  <p>
+    <%= t'notifier.message_notification.footer_html',
+          :readurl => link_to(@readurl, @readurl) + tag(:br),
+          :replyurl => link_to(@replyurl, @replyurl)
+    %>
+  </p>
+<% end %>