Dressed up friend_notification mail

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index 9c566f4fc3c518d923208e89ed0710d239e2a46c..d7fa66c4ad431332455b354528cd10cef97a5aaa 100644 (file)
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -129,7 +129,9 @@ class Notifier < ActionMailer::Base
       @friendurl = url_for(:host => SERVER_URL,
                            :controller => "user", :action => "make_friend",
                            :display_name => @friend.befriender.display_name)
+      @user_message_author = @friend.befriender.display_name
 
+      attach_user_avatar(@friend.befriender)
       mail :to => friend.befriendee.email,
            :subject => I18n.t("notifier.friend_notification.subject", :user => friend.befriender.display_name)
     end

diff --git a/app/views/notifier/friend_notification.html.erb b/app/views/notifier/friend_notification.html.erb
index 181b2b8253efcfb705d47dd749907012eb7f4182..3f260dc9280fe12ba69922e6c383feb1343835c7 100644 (file)
--- a/app/views/notifier/friend_notification.html.erb
+++ b/app/views/notifier/friend_notification.html.erb
@@ -1,7 +1,11 @@
-<p><%= t 'notifier.friend_notification.had_added_you', :user => @friend.befriender.display_name %></p>
+<% content_for :body do %>
+  <p style="margin: 0"><%= t 'notifier.friend_notification.had_added_you', :user => @friend.befriender.display_name %></p>
 
-<p><%= raw t 'notifier.friend_notification.see_their_profile', :userurl => link_to(@viewurl, @viewurl) %></p>
+  <%= render "notifier/user_message_table", :captured => capture { %>
+    <p><%= raw t 'notifier.friend_notification.see_their_profile', :userurl => link_to(@viewurl, @viewurl) %></p>
 
-<% unless @friend.befriendee.is_friends_with?(@friend.befriender) -%>
-<p><%= raw t 'notifier.friend_notification.befriend_them', :befriendurl => link_to(@friendurl, @friendurl) %></p>
-<% end -%>
+    <% unless @friend.befriendee.is_friends_with?(@friend.befriender) -%>
+    <p><%= raw t 'notifier.friend_notification.befriend_them', :befriendurl => link_to(@friendurl, @friendurl) %></p>
+    <% end -%>
+  <% } %>
+<% end %>