Skip to content
Extraits de code Groupes Projets
Valider 767e58bf rédigé par Raphael's avatar Raphael
Parcourir les fichiers

Correct email picture url

parent 5967ce25
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -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')
......
......@@ -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
......
......@@ -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
......@@ -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{
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter