nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mailer doesn't break everything anymore. attachments are also inlined.

Browse source
This commit is contained in:
danielvincent 2010-11-02 17:59:50 -07:00
parent 8c350282d3
commit a31c22adb3
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/mailers/notifier.rb
View file

@ -7,7 +7,7 @@ class Notifier < ActionMailer::Base
def new_request(recipient, sender)
@receiver = recipient
@sender = sender
attachments["diaspora_white_on_grey.png"] = ATTACHMENT
attachments.inline['diaspora_white_on_grey.png'] = ATTACHMENT
mail(:to => "#{recipient.real_name} <#{recipient.email}>",
:subject => "new Diaspora* friend request from #{@sender.real_name}", :host => APP_CONFIG[:terse_pod_url])
@ -17,7 +17,8 @@ class Notifier < ActionMailer::Base
@receiver = recipient
@sender = sender
@aspect = aspect
attachments["diaspora_white.png"] = ATTACHMENT
attachments.inline['diaspora_white_on_grey.png'] = ATTACHMENT
mail(:to => "#{recipient.real_name} <#{recipient.email}>",
:subject => "#{@sender.real_name} has accepted your friend request on Diaspora*", :host => APP_CONFIG[:terse_pod_url])
end

2
app/views/notifier/new_request.html.haml
View file

@ -43,7 +43,7 @@
}
%body
%header
= image_tag attachments['diaspora_white_on_grey.png'], :alt => "DIASPORA"
= image_tag attachments['diaspora_white_on_grey.png'].url, :alt => "DIASPORA"
#container
%p
Hello #{@receiver.profile.first_name}!

2
app/views/notifier/request_accepted.html.haml
View file

@ -43,7 +43,7 @@
}
%body
%header
= image_tag attachments['diaspora_white_on_grey.png'], :alt => "DIASPORA"
= image_tag attachments['diaspora_white_on_grey.png'].url, :alt => "DIASPORA"
#container
%p
Hello #{@receiver.profile.first_name}!