mailer doesn't break everything anymore. attachments are also inlined.
This commit is contained in:
parent
8c350282d3
commit
a31c22adb3
3 changed files with 5 additions and 4 deletions
|
|
@ -7,7 +7,7 @@ class Notifier < ActionMailer::Base
|
||||||
def new_request(recipient, sender)
|
def new_request(recipient, sender)
|
||||||
@receiver = recipient
|
@receiver = recipient
|
||||||
@sender = sender
|
@sender = sender
|
||||||
attachments["diaspora_white_on_grey.png"] = ATTACHMENT
|
attachments.inline['diaspora_white_on_grey.png'] = ATTACHMENT
|
||||||
|
|
||||||
mail(:to => "#{recipient.real_name} <#{recipient.email}>",
|
mail(:to => "#{recipient.real_name} <#{recipient.email}>",
|
||||||
:subject => "new Diaspora* friend request from #{@sender.real_name}", :host => APP_CONFIG[:terse_pod_url])
|
: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
|
@receiver = recipient
|
||||||
@sender = sender
|
@sender = sender
|
||||||
@aspect = aspect
|
@aspect = aspect
|
||||||
attachments["diaspora_white.png"] = ATTACHMENT
|
attachments.inline['diaspora_white_on_grey.png'] = ATTACHMENT
|
||||||
|
|
||||||
mail(:to => "#{recipient.real_name} <#{recipient.email}>",
|
mail(:to => "#{recipient.real_name} <#{recipient.email}>",
|
||||||
:subject => "#{@sender.real_name} has accepted your friend request on Diaspora*", :host => APP_CONFIG[:terse_pod_url])
|
:subject => "#{@sender.real_name} has accepted your friend request on Diaspora*", :host => APP_CONFIG[:terse_pod_url])
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -43,7 +43,7 @@
|
||||||
}
|
}
|
||||||
%body
|
%body
|
||||||
%header
|
%header
|
||||||
= image_tag attachments['diaspora_white_on_grey.png'], :alt => "DIASPORA"
|
= image_tag attachments['diaspora_white_on_grey.png'].url, :alt => "DIASPORA"
|
||||||
#container
|
#container
|
||||||
%p
|
%p
|
||||||
Hello #{@receiver.profile.first_name}!
|
Hello #{@receiver.profile.first_name}!
|
||||||
|
|
|
||||||
|
|
@ -43,7 +43,7 @@
|
||||||
}
|
}
|
||||||
%body
|
%body
|
||||||
%header
|
%header
|
||||||
= image_tag attachments['diaspora_white_on_grey.png'], :alt => "DIASPORA"
|
= image_tag attachments['diaspora_white_on_grey.png'].url, :alt => "DIASPORA"
|
||||||
#container
|
#container
|
||||||
%p
|
%p
|
||||||
Hello #{@receiver.profile.first_name}!
|
Hello #{@receiver.profile.first_name}!
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue