suite

2020-02-27 17:41:27 +01:00 · 2020-02-27 17:41:27 +01:00 · a46d75601b
commit a46d75601b
parent 1b82c04734
4 changed files with 12 additions and 3 deletions
--- a/app/mailers/general_mails.rb
+++ b/app/mailers/general_mails.rb
@ -8,11 +8,12 @@ class GeneralMails < ActionMailer::Base


  def general(lang_slug, mail_type, email, options = {})
+    @options = options
    
    @m_odr = @options[:m_odr]
    @m_odr_rep = @options[:m_odr_rep]
    
-    @options = options
+    
    
    @mail_type = mail_type
    
--- a/app/views/admin/m_odrs/_form.html.haml
+++ b/app/views/admin/m_odrs/_form.html.haml
@ -118,6 +118,9 @@
  
  .qi_row
    .qi_pannel.qi_plain.padding
+    
+      = f.input :email_from, :label => "Email d'envoi :" 
+    
      Mails types :
      %hr
    
--- a/app/views/layouts/mail.html.haml
+++ b/app/views/layouts/mail.html.haml
@ -34,7 +34,10 @@
    
    
    #odr_form
-      .form_pannel= yield
+      .form_pannel
+        = yield
+        %br
+        %br
  
  
    -if @m_odr
--- a/app/views/public/m_odr_reps/thank.html.haml
+++ b/app/views/public/m_odr_reps/thank.html.haml
@ -16,6 +16,8 @@
        %p
          Merci pour votre participation
    
+    %br
+    %br
    -if false
      =@m_odr_rep.token
      %br