diff --git a/app/mailers/notifier.rb b/app/mailers/notifier.rb index f73d41053..6133f3f90 100644 --- a/app/mailers/notifier.rb +++ b/app/mailers/notifier.rb @@ -3,7 +3,7 @@ class Notifier < ActionMailer::Base 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 = {}) mails = [] @@ -17,7 +17,7 @@ class Notifier < ActionMailer::Base def single_admin(string, recipient) @recipient = recipient @string = string.html_safe - attachments.inline['diaspora_white_on_grey.png'] = ATTACHMENT + attachments.inline['logo_caps.png'] = ATTACHMENT mail(:to => @recipient.email, :subject => I18n.t('notifier.single_admin.subject'), :host => AppConfig[:pod_uri].host) end @@ -49,7 +49,7 @@ class Notifier < ActionMailer::Base def comment_on_post(recipient_id, sender_id, comment_id) @receiver = User.find_by_id(recipient_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') @@ -62,9 +62,9 @@ class Notifier < ActionMailer::Base def also_commented(recipient_id, sender_id, comment_id) @receiver = User.find_by_id(recipient_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 - + log_mail(recipient_id, sender_id, 'comment_on_post') diff --git a/app/views/devise/mailer/invitation.html.haml b/app/views/devise/mailer/invitation.html.haml index 5f9edcb33..73cc899dc 100644 --- a/app/views/devise/mailer/invitation.html.haml +++ b/app/views/devise/mailer/invitation.html.haml @@ -5,7 +5,7 @@ = render :partial => 'notifier/notifier_css' %body %header - = image_tag AppConfig[:pod_url] + 'images/diaspora_white_on_grey.png' + = image_tag AppConfig[:pod_url] + 'images/logo_caps.png' #container - @invs = @resource.invitations_to_me %p diff --git a/app/views/layouts/notifier.html.haml b/app/views/layouts/notifier.html.haml index ab3ad44af..ef334cedf 100644 --- a/app/views/layouts/notifier.html.haml +++ b/app/views/layouts/notifier.html.haml @@ -5,6 +5,6 @@ = render :partial => 'notifier_css' %body %header - = image_tag attachments['diaspora_white_on_grey.png'].url, :alt => "DIASPORA" + = image_tag attachments['logo_caps.png'].url, :alt => "DIASPORA" #container = yield diff --git a/app/views/notifier/_notifier_css.haml b/app/views/notifier/_notifier_css.haml index 1c4154e5e..d75c9003a 100644 --- a/app/views/notifier/_notifier_css.haml +++ b/app/views/notifier/_notifier_css.haml @@ -2,7 +2,7 @@ body{ width:600px; font-family:'Arial','Helvetica',sans-serif; - font-size:14px; + font-size:14px; color:#333; } #container{ @@ -11,8 +11,6 @@ padding-left:15px; } header{ - background-color:#333; - padding: 15px; margin-bottom: 25px; } p{