cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Dressed up friend_notification mail

Browse source
This commit is contained in:
Herve Saint-Amand 2017-01-12 22:11:23 +00:00
parent 39c3fa427e
commit 22f7c1f721
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/models/notifier.rb
View file

@ -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

14
app/views/notifier/friend_notification.html.erb
View file

@ -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 %>