nicolas/pic_vert_app
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

layout mail

Browse Source
This commit is contained in:
Nicolas Bally 2013-06-29 12:12:39 +02:00
parent 6f09437e16
commit 13d7d7fbaf
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/mailers/newsletter_mails.rb
View File

@ -10,7 +10,7 @@ class NewsletterMails < ActionMailer::Base
@title = @newsletter.title
@content = @newsletter.content
if @newsletter.email_from?
@from = @newsletter.email_from.to_s
@from = Newsletter::EMAIL_TEXTES[@newsletter.email_from][0].to_s+ " <#{@newsletter.email_from}>"
else
@from = "Le Pic Vert <contact@lepicvert.asso.fr>"
end

8
app/views/newsletter_mails/newsletter.html.haml
View File

@ -1,12 +1,12 @@
=raw @content
-if @email_from? and @email_from != "contact@lepicvert.asso.fr"
-if @newsletter.email_from and @newsletter.email_from != "" and @newsletter.email_from != "contact@lepicvert.asso.fr"
%br
%p
%strong=Newsletter::EMAIL_TEXTES[@email_from][1]
%strong=Newsletter::EMAIL_TEXTES[@newsletter.email_from][1]
%br
=Newsletter::EMAIL_TEXTES[@email_from][2]
=Newsletter::EMAIL_TEXTES[@newsletter.email_from][2]
%br
%br
=link_to @email_from, "mailto:#{@email_from}"
=link_to @newsletter.email_from, "mailto:#{@newsletter.email_from}"