Simplified the partial layout

[rails.git] / app / views / notifier / friend_notification.html.erb

diff --git a/app/views/notifier/friend_notification.html.erb b/app/views/notifier/friend_notification.html.erb
index 8917061f1444d3e556ee824c1d374696da85a74b..91de4b732000ba31dd479007fd6dd2a704a78893 100644 (file)
--- a/app/views/notifier/friend_notification.html.erb
+++ b/app/views/notifier/friend_notification.html.erb
@@ -1,4 +1,9 @@
-<%= t'notifier.friend_notification.had_added_you', :user => @user %>
+<p style="margin: 0"><%= t 'notifier.friend_notification.had_added_you', :user => @friend.befriender.display_name %></p>
 
-<%= t'notifier.friend_notification.see_their_profile', :userurl => @userurl %>
+<%= 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 -%>
+<% } %>