From 13d7d7fbafc90829c9cd193906c59612947d2a10 Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Sat, 29 Jun 2013 12:12:39 +0200 Subject: [PATCH] layout mail --- app/mailers/newsletter_mails.rb | 2 +- app/views/newsletter_mails/newsletter.html.haml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/mailers/newsletter_mails.rb b/app/mailers/newsletter_mails.rb index df6f669..294eeb5 100644 --- a/app/mailers/newsletter_mails.rb +++ b/app/mailers/newsletter_mails.rb @@ -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 " end diff --git a/app/views/newsletter_mails/newsletter.html.haml b/app/views/newsletter_mails/newsletter.html.haml index 9a42bf6..3f243e5 100644 --- a/app/views/newsletter_mails/newsletter.html.haml +++ b/app/views/newsletter_mails/newsletter.html.haml @@ -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}" \ No newline at end of file