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

Correct email picture url

Browse source
This commit is contained in:
Raphael 2011-01-28 11:42:56 -08:00
parent 5967ce25fd
commit 767e58bf94
4 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/mailers/notifier.rb
View file

@ -3,7 +3,7 @@ class Notifier < ActionMailer::Base
default :from => AppConfig[:smtp_sender_address] default :from => AppConfig[:smtp_sender_address]
ATTACHMENT = File.read("#{Rails.root}/public/images/white_on_grey.png") ATTACHMENT = File.read("#{Rails.root}/public/images/logo_caps.png")
def self.admin(string, recipients, opts = {}) def self.admin(string, recipients, opts = {})
mails = [] mails = []
@ -17,7 +17,7 @@ class Notifier < ActionMailer::Base
def single_admin(string, recipient) def single_admin(string, recipient)
@recipient = recipient @recipient = recipient
@string = string.html_safe @string = string.html_safe
attachments.inline['diaspora_white_on_grey.png'] = ATTACHMENT attachments.inline['logo_caps.png'] = ATTACHMENT
mail(:to => @recipient.email, mail(:to => @recipient.email,
:subject => I18n.t('notifier.single_admin.subject'), :host => AppConfig[:pod_uri].host) :subject => I18n.t('notifier.single_admin.subject'), :host => AppConfig[:pod_uri].host)
end end
@ -49,7 +49,7 @@ class Notifier < ActionMailer::Base
def comment_on_post(recipient_id, sender_id, comment_id) def comment_on_post(recipient_id, sender_id, comment_id)
@receiver = User.find_by_id(recipient_id) @receiver = User.find_by_id(recipient_id)
@sender = Person.find_by_id(sender_id) @sender = Person.find_by_id(sender_id)
@comment = Comment.find_by_id(comment_id) @comment = Comment.find_by_id(comment_id)
log_mail(recipient_id, sender_id, 'comment_on_post') log_mail(recipient_id, sender_id, 'comment_on_post')
@ -62,9 +62,9 @@ class Notifier < ActionMailer::Base
def also_commented(recipient_id, sender_id, comment_id) def also_commented(recipient_id, sender_id, comment_id)
@receiver = User.find_by_id(recipient_id) @receiver = User.find_by_id(recipient_id)
@sender = Person.find_by_id(sender_id) @sender = Person.find_by_id(sender_id)
@comment = Comment.find_by_id(comment_id) @comment = Comment.find_by_id(comment_id)
@post_author_name = @comment.post.person.name @post_author_name = @comment.post.person.name
log_mail(recipient_id, sender_id, 'comment_on_post') log_mail(recipient_id, sender_id, 'comment_on_post')

2
app/views/devise/mailer/invitation.html.haml
View file

@ -5,7 +5,7 @@
= render :partial => 'notifier/notifier_css' = render :partial => 'notifier/notifier_css'
%body %body
%header %header
= image_tag AppConfig[:pod_url] + 'images/diaspora_white_on_grey.png' = image_tag AppConfig[:pod_url] + 'images/logo_caps.png'
#container #container
- @invs = @resource.invitations_to_me - @invs = @resource.invitations_to_me
%p %p

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

@ -5,6 +5,6 @@
= render :partial => 'notifier_css' = render :partial => 'notifier_css'
%body %body
%header %header
= image_tag attachments['diaspora_white_on_grey.png'].url, :alt => "DIASPORA" = image_tag attachments['logo_caps.png'].url, :alt => "DIASPORA"
#container #container
= yield = yield

4
app/views/notifier/_notifier_css.haml
View file

@ -2,7 +2,7 @@
body{ body{
width:600px; width:600px;
font-family:'Arial','Helvetica',sans-serif; font-family:'Arial','Helvetica',sans-serif;
font-size:14px; font-size:14px;
color:#333; color:#333;
} }
#container{ #container{
@ -11,8 +11,6 @@
padding-left:15px; padding-left:15px;
} }
header{ header{
background-color:#333;
padding: 15px;
margin-bottom: 25px; margin-bottom: 25px;
} }
p{ p{