[IMP] mass_mailing: move code from website_mail to mass_mailing and use web_editor

1 files changed, 6 insertions, 72 deletions

diff --git a/addons/mass_mailing/data/mass_mailing_demo.xml b/addons/mass_mailing/data/mass_mailing_demo.xml
index 1c76d41ebcd..f58d9dc0f21 100644
--- a/addons/mass_mailing/data/mass_mailing_demo.xml
+++ b/addons/mass_mailing/data/mass_mailing_demo.xml
@@ -39,40 +39,9 @@
             <field name="model_id" ref="mass_mailing.model_mail_mass_mailing_contact"/>
             <field name="use_default_to" eval="True"/>
             <field name="auto_delete" eval="True"/>
-            <field name="body_html"><![CDATA[<div>
-<div class="snippet_row" style="padding: 0px; width: 600px; margin: auto; color: rgb(119, 119, 119); height: 80px; overflow: hidden; background-color: rgb(255, 255, 255);">
-<table cellpadding="0" cellspacing="0" style="border-collapse:collapse;background:inherit;color:inherit" width="100%"><tbody><tr><td style="text-align:center;padding-bottom:10px"><span style="color:#000000;"><span style="font-size:36px"></span></span>
-
-            <h2 style="font-family: arial; color: rgb(51, 51, 51); text-align: center; padding: 0px 5px;">A Punchy Headline</h2>
-            <span style="color:#000000;"><span style="font-size:36px"></span></span></td>
-        </tr><tr><td style="font-size:20px; text-align:center; padding: 0 5px"><span style="color:#000000;"></span></td>
-        </tr></tbody></table></div>
-
-<div style="padding:0px; margin:auto;width:600px;background-color:#fff;color:#777777">
-<table cellpadding="0" cellspacing="0" style="margin:auto;border-collapse:collapse;background:inherit;color:inherit" width="600"><tbody><tr><td align="left" class="col_mv color_picker" style="text-align:center"><img alt="image" src="/website/static/src/img/big_picture.png" style="height: auto; max-width: 600px; width: 535px;"></td>
-        </tr></tbody></table></div>
-
-<div class="snippet_row" style="padding:0px;width:600px;margin:auto;background-color:#fff;color:#777777">
-<table cellpadding="0" cellspacing="0" style="border-collapse:collapse;background:inherit;color:inherit" width="100%"><tbody><tr><td style="text-align:center;padding-bottom:10px"><span style="font-size:36px"></span>
-
-            <h3 style="font-family: arial; color: rgb(51, 51, 51); text-align: center; padding: 0px 5px; margin-top:20px;">A Small Subtitle for ${object.name}</h3>
-            <span style="font-size:36px"></span></td>
-        </tr><tr><td style="font-size:20px; text-align:center; padding: 0 5px"><span style="color: rgb(51, 51, 51); font-family: arial; font-size: 12px; line-height: 17.142858505249px; text-align: center;"><span style="color: rgb(51, 51, 51); font-family: arial; font-size: 12px; line-height: 17.142858505249px; text-align: center;">Choose a vibrant image and write an inspiring paragraph about it. It does not have to be long, but it should reinforce your image.</span></span></td>
-        </tr></tbody></table></div>
-
-<div style="padding:0px;width:600px;margin:auto;background-color:#fff;color:#000;color:#777777">
-<table cellpadding="0" cellspacing="0" style="width:100%;border-collapse:collapse;background:inherit;color:inherit">
-    <tbody>
-        <tr>
-            <td class="col_mv color_picker" style="padding:30px 15px;width:33%;text-align:center;background-color:#fff;color:#777777"><img alt="column2 image" src="/website/static/src/img/desert_thumb.jpg" style="height: auto; max-width: 600px; padding: 20px 0px 30px; width: 270px;"><span style="color: rgb(51, 51, 51); font-family: arial; font-size: 24px; line-height: 1.1;">Feature One</span>
-
-            <p style="text-align: left;"><span style="font-size:24px;font-weight:bold"></span><span style="color: rgb(51, 51, 51); font-family: arial; font-size: 12px; line-height: 17.142858505249px;">Choose a vibrant image and write an inspiring paragraph about it. It does not have to be long, but it should reinforce your image.</span></p>
-            </td>
-            <td class="col_mv color_picker" style="vertical-align:top; padding: 30px 15px; width:33%;text-align:center;background-color:#fff;color:#777777"><img alt="column3 image" src="/website/static/src/img/deers_thumb.jpg" style="height: auto; max-width: 600px; padding: 20px 0px 30px; width: 270px;"><span style="color: rgb(51, 51, 51); font-family: arial; font-size: 24px; line-height: 1.1;">Feature Two</span>
-            <p style="text-align: left;"><span style="font-size:24px;font-weight:bold"></span><span style="color: rgb(51, 51, 51); font-family: arial; font-size: 12px; line-height: 17.142858505249px;">Choose a vibrant image and write an inspiring paragraph about it. It does not have to be long, but it should reinforce your image.</span></p>
-            </td>
-        </tr></tbody></table></div>
-</div>]]></field>
+            <field name="body_html"><![CDATA[<div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #ffffff repeat top /100%">
+                <table cellpadding="0" cellspacing="0" style="border-collapse:collapse" width="100%"><tbody><tr><td style="padding:10px 10px 10px 5px" valign="center" width="270"> <a style="text-decoration:none" href="http://www.example.com"><strong class="o_default_snippet_text">Your Company</strong></a> </td><td style="padding:10px 15px 10px 10px;vertical-align:middle" valign="center" width="270"><table align="right" border="0" cellpadding="0" cellspacing="0" style="border-collapse:collapse"><tbody><tr><td align="right"><a href="https://www.facebook.com/Odoo"><span class="fa fa-facebook-square fa-2x" style="color:#44B7B7;"></span></a></td><td align="right" style="padding-left:5px"><a href="https://www.facebook.com/Odoo"><span class="fa fa-google-plus-square fa-2x" style="color:#44B7B7;"></span></a></td><td align="right" style="padding-left:5px"><a href="https://www.facebook.com/Odoo"><span class="fa fa-linkedin-square fa-2x" style="color:#44B7B7;"></span></a></td><td align="right" style="padding-left:5px"><a href="https://www.facebook.com/Odoo"><span class="fa fa-twitter-square fa-2x" style="color:#44B7B7;"></span></a></td></tr></tbody></table></td></tr></tbody></table></div><div style="padding:0px;width:600px;margin:auto;background-color:#44B7B7;color:#168484" class=""><table cellpadding="0" cellspacing="0" style="width:100%;background-color:inherit;border-collapse:collapse;color:inherit"><tbody><tr><td class="col_mv bg-color" style="text-align:left; padding-left:20px;vertical-align:middle;font-size:14px"><p style="margin:0;font-size:20px;color:#fff" class="o_default_snippet_text">You get a 20% discount for signing up!</p><p style="margin:0" class="o_default_snippet_text">Discount Code: <strong class="o_default_snippet_text">45A9E77DGW8455</strong></p></td><td class="col_mv bg-color" style="padding:20px;text-align:center;vertical-align:middle">  <span class="fa fa-6x fa-ticket"></span>  </td></tr></tbody></table></div><div class="snippet_row bg-color" style="padding:0;width:600px;max-width:600px;margin:0 auto;background: #fff repeat top /100%;color:#168484"><table style="width:100%;text-align:justify;margin:0 auto;inherit;border-collapse:collapse;color:inherit"><tbody><tr><td style="padding:10px 30px;font-size:14px;line-height:20px"><p style="margin:0" class="o_default_snippet_text">Dear John</p><p style="margin:0" class="o_default_snippet_text">Great stories have personality. Consider telling a great story that provides personality. Writing a story with personality for potential clients will assist with making a relationship connection. This shows up in small quirks like word choices or phrases. Write from your point of view, not from someone else's experience.<br></p><p style="margin:0" class="o_default_snippet_text">Great stories are for everyone even when only written for just one person. If you try to write with a wide general audience in mind, your story will ring false and be bland. No one will be interested. Write for one person. If it’s genuine for the one, it’s genuine for the rest.</p><p style="margin:0" class="o_default_snippet_text">Kind Regards,</p><p style="margin:0" class="o_default_snippet_text">Michael Fletcher</p></td></tr></tbody></table></div><div style="padding:0;width:600px;max-width:600px;margin:0 auto" class=""><table style="width:100%;text-align:justify;margin:0 auto;background-color:inherit;border-collapse:collapse"><tbody><tr><td class="col_mv bg-color" style="padding:10px 0;background-color:#168484;color:#fff"><table style="border-collapse:collapse;background-color:inherit"><tbody><tr><td rowspan="2" style="padding-left:10px">  <span class="fa fa-check fa-3x"></span>  </td><td style="padding-left:10px;color:#fff;font-size:14px"><p style="font-weight:bold;font-size:18px;margin:0 0 3px 0" class="o_default_snippet_text">Step 1:</p><p style="margin:0" class="o_default_snippet_text">Place Order</p></td></tr></tbody></table></td><td class="col_mv bg-color" style="padding:10px 0;background-color:#FFFFFF;color:#808080"><table style="border-collapse:collapse;background-color:inherit"><tbody><tr><td rowspan="2" style="padding-left:10px">  <span class="fa fa-truck fa-3x"></span>  </td><td style="padding-left:10px;color:#808080;font-size:14px"><p style="font-weight:bold;font-size:18px;margin:0 0 3px 0" class="o_default_snippet_text">Step 2:</p><p style="margin:0" class="o_default_snippet_text">Shipping</p></td></tr></tbody></table></td><td class="col_mv bg-color" style="padding:10px 0;background-color:#FFFFFF;color:#808080"><table style="border-collapse:collapse;background-color:inherit"><tbody><tr><td rowspan="2" style="padding-left:10px">  <span class="fa fa-dollar fa-3x"></span>  </td><td style="padding-left:10px;color:#808080;font-size:14px"><p style="font-weight:bold;font-size:18px;margin:0 0 3px 0" class="o_default_snippet_text">Step 3:</p><p style="margin:0" class="o_default_snippet_text">Payment</p></td></tr></tbody></table></td></tr></tbody></table></div><div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #414141 repeat top /100%;color:#44B7B7"><div style="padding:10px"><table cellpadding="0" cellspacing="0" style="margin: 0 auto;width:100%;border-collapse:collapse;color:inherit;color:inherit"><tbody><tr><td style="text-align:center"> <a style="text-decoration: none;" href="https://www.facebook.com/Odoo"><span class="fa fa-facebook-square fa-2x"></span></a><a style="text-decoration: none;" href="https://plus.google.com/+Odooapps"><span class="fa fa-google-plus-square fa-2x"></span></a><a style="text-decoration: none;" href="https://www.linkedin.com/company/odoo"><span class="fa fa-linkedin-square fa-2x"></span></a><a style="text-decoration: none;" href="https://twitter.com/Odoo"><span class="fa fa-twitter-square fa-2x"></span></a> </td></tr><tr><td style="font-size:12px;text-align:center;padding-top:10px;padding-bottom:5px" class="o_default_snippet_text"> <a href="/unsubscribe_from_list" style="color:#44B7B7" class="o_default_snippet_text">Unsubscribe</a>|<a href="/page/contactus" style="color:#44B7B7" class="o_default_snippet_text">Contact</a> </td></tr></tbody></table></div>
+            </div>]]></field>
         </record>
 
         <!-- Create campaign and mailings -->
@@ -98,44 +67,9 @@
             <field name="mailing_domain">[('customer', '=', True)]</field>
             <field name="reply_to_mode">email</field>
             <field name="reply_to"><![CDATA[Info <info@yourcompany.example.com>]]></field>
-            <field name="body_html"><![CDATA[<div>
-<div class="snippet_row" style="padding: 0px; width: 600px; margin: auto; color: rgb(119, 119, 119); height: 80px; overflow: hidden; background-color: rgb(255, 255, 255);">
-<table cellpadding="0" cellspacing="0" style="border-collapse:collapse;background:inherit;color:inherit" width="100%"><tbody><tr><td style="text-align:center;padding-bottom:10px"><span style="color:#000000;"><span style="font-size:36px"></span></span>
-
-            <h2 style="font-family: arial; color: rgb(51, 51, 51); text-align: center; padding: 0px 5px;">A Punchy Headline</h2>
-            <span style="color:#000000;"><span style="font-size:36px"></span></span></td>
-        </tr><tr><td style="font-size:20px; text-align:center; padding: 0 5px"><span style="color:#000000;"></span></td>
-        </tr></tbody></table></div>
-
-<div style="padding:0px; margin:auto;width:600px;background-color:#fff;color:#777777">
-<table cellpadding="0" cellspacing="0" style="margin:auto;border-collapse:collapse;background:inherit;color:inherit" width="600"><tbody><tr><td align="left" class="col_mv color_picker" style="text-align:center"><img alt="image" src="/website/static/src/img/big_picture.png" style="height: auto; max-width: 600px; width: 535px;"></td>
-        </tr></tbody></table></div>
-
-<div class="snippet_row" style="padding:0px;width:600px;margin:auto;background-color:#fff;color:#777777">
-<table cellpadding="0" cellspacing="0" style="border-collapse:collapse;background:inherit;color:inherit" width="100%"><tbody><tr><td style="text-align:center;padding-bottom:10px"><span style="font-size:36px"></span>
-
-            <h3 style="font-family: arial; color: rgb(51, 51, 51); text-align: center; padding: 0px 5px; margin-top:20px;">A Small Subtitle for ${object.name}</h3>
-            <span style="font-size:36px"></span></td>
-        </tr><tr><td style="font-size:20px; text-align:center; padding: 0 5px"><span style="color: rgb(51, 51, 51); font-family: arial; font-size: 12px; line-height: 17.142858505249px; text-align: center;"><span style="color: rgb(51, 51, 51); font-family: arial; font-size: 12px; line-height: 17.142858505249px; text-align: center;">Choose a vibrant image and write an inspiring paragraph about it. It does not have to be long, but it should reinforce your image.</span></span></td>
-        </tr>
-    </tbody>
-</table></div>
-
-<div style="padding:0px;width:600px;margin:auto;background-color:#fff;color:#000;color:#777777">
-<table cellpadding="0" cellspacing="0" style="width:100%;border-collapse:collapse;background:inherit;color:inherit">
-    <tbody>
-        <tr>
-            <td class="col_mv color_picker" style="padding:30px 15px;width:33%;text-align:center;background-color:#fff;color:#777777"><img alt="column2 image" src="/website/static/src/img/desert_thumb.jpg" style="height: auto; max-width: 600px; padding: 20px 0px 30px; width: 270px;"><span style="color: rgb(51, 51, 51); font-family: arial; font-size: 24px; line-height: 1.1;">Feature One</span>
-
-            <p style="text-align: left;"><span style="font-size:24px;font-weight:bold"></span><span style="color: rgb(51, 51, 51); font-family: arial; font-size: 12px; line-height: 17.142858505249px;">Choose a vibrant image and write an inspiring paragraph about it. It does not have to be long, but it should reinforce your image.</span></p>
-            </td>
-            <td class="col_mv color_picker" style="vertical-align:top; padding: 30px 15px; width:33%;text-align:center;background-color:#fff;color:#777777"><img alt="column3 image" src="/website/static/src/img/deers_thumb.jpg" style="height: auto; max-width: 600px; padding: 20px 0px 30px; width: 270px;"><span style="color: rgb(51, 51, 51); font-family: arial; font-size: 24px; line-height: 1.1;">Feature Two</span>
-            <p style="text-align: left;"><span style="font-size:24px;font-weight:bold"></span><span style="color: rgb(51, 51, 51); font-family: arial; font-size: 12px; line-height: 17.142858505249px;">Choose a vibrant image and write an inspiring paragraph about it. It does not have to be long, but it should reinforce your image.</span></p>
-            </td>
-        </tr>
-    </tbody>
-</table></div>
-</div>]]></field>
+            <field name="body_html"><![CDATA[<div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #ffffff repeat top /100%">
+                <table cellpadding="0" cellspacing="0" style="border-collapse:collapse" width="100%"><tbody><tr><td style="padding:10px 10px 10px 5px" valign="center" width="270"> <a style="text-decoration:none" href="http://www.example.com"><strong class="o_default_snippet_text">Your Company</strong></a> </td><td style="padding:10px 15px 10px 10px;vertical-align:middle" valign="center" width="270"><table align="right" border="0" cellpadding="0" cellspacing="0" style="border-collapse:collapse"><tbody><tr><td align="right"><a href="https://www.facebook.com/Odoo"><span class="fa fa-facebook-square fa-2x" style="color:#44B7B7;"></span></a></td><td align="right" style="padding-left:5px"><a href="https://www.facebook.com/Odoo"><span class="fa fa-google-plus-square fa-2x" style="color:#44B7B7;"></span></a></td><td align="right" style="padding-left:5px"><a href="https://www.facebook.com/Odoo"><span class="fa fa-linkedin-square fa-2x" style="color:#44B7B7;"></span></a></td><td align="right" style="padding-left:5px"><a href="https://www.facebook.com/Odoo"><span class="fa fa-twitter-square fa-2x" style="color:#44B7B7;"></span></a></td></tr></tbody></table></td></tr></tbody></table></div><div style="padding:0px;width:600px;margin:auto;background-color:#44B7B7;color:#168484" class=""><table cellpadding="0" cellspacing="0" style="width:100%;background-color:inherit;border-collapse:collapse;color:inherit"><tbody><tr><td class="col_mv bg-color" style="text-align:left; padding-left:20px;vertical-align:middle;font-size:14px"><p style="margin:0;font-size:20px;color:#fff" class="o_default_snippet_text">You get a 20% discount for signing up!</p><p style="margin:0" class="o_default_snippet_text">Discount Code: <strong class="o_default_snippet_text">45A9E77DGW8455</strong></p></td><td class="col_mv bg-color" style="padding:20px;text-align:center;vertical-align:middle">  <span class="fa fa-6x fa-ticket"></span>  </td></tr></tbody></table></div><div class="snippet_row bg-color" style="padding:0;width:600px;max-width:600px;margin:0 auto;background: #fff repeat top /100%;color:#168484"><table style="width:100%;text-align:justify;margin:0 auto;inherit;border-collapse:collapse;color:inherit"><tbody><tr><td style="padding:10px 30px;font-size:14px;line-height:20px"><p style="margin:0" class="o_default_snippet_text">Dear John</p><p style="margin:0" class="o_default_snippet_text">Great stories have personality. Consider telling a great story that provides personality. Writing a story with personality for potential clients will assist with making a relationship connection. This shows up in small quirks like word choices or phrases. Write from your point of view, not from someone else's experience.<br></p><p style="margin:0" class="o_default_snippet_text">Great stories are for everyone even when only written for just one person. If you try to write with a wide general audience in mind, your story will ring false and be bland. No one will be interested. Write for one person. If it’s genuine for the one, it’s genuine for the rest.</p><p style="margin:0" class="o_default_snippet_text">Kind Regards,</p><p style="margin:0" class="o_default_snippet_text">Michael Fletcher</p></td></tr></tbody></table></div><div style="padding:0;width:600px;max-width:600px;margin:0 auto" class=""><table style="width:100%;text-align:justify;margin:0 auto;background-color:inherit;border-collapse:collapse"><tbody><tr><td class="col_mv bg-color" style="padding:10px 0;background-color:#168484;color:#fff"><table style="border-collapse:collapse;background-color:inherit"><tbody><tr><td rowspan="2" style="padding-left:10px">  <span class="fa fa-check fa-3x"></span>  </td><td style="padding-left:10px;color:#fff;font-size:14px"><p style="font-weight:bold;font-size:18px;margin:0 0 3px 0" class="o_default_snippet_text">Step 1:</p><p style="margin:0" class="o_default_snippet_text">Place Order</p></td></tr></tbody></table></td><td class="col_mv bg-color" style="padding:10px 0;background-color:#FFFFFF;color:#808080"><table style="border-collapse:collapse;background-color:inherit"><tbody><tr><td rowspan="2" style="padding-left:10px">  <span class="fa fa-truck fa-3x"></span>  </td><td style="padding-left:10px;color:#808080;font-size:14px"><p style="font-weight:bold;font-size:18px;margin:0 0 3px 0" class="o_default_snippet_text">Step 2:</p><p style="margin:0" class="o_default_snippet_text">Shipping</p></td></tr></tbody></table></td><td class="col_mv bg-color" style="padding:10px 0;background-color:#FFFFFF;color:#808080"><table style="border-collapse:collapse;background-color:inherit"><tbody><tr><td rowspan="2" style="padding-left:10px">  <span class="fa fa-dollar fa-3x"></span>  </td><td style="padding-left:10px;color:#808080;font-size:14px"><p style="font-weight:bold;font-size:18px;margin:0 0 3px 0" class="o_default_snippet_text">Step 3:</p><p style="margin:0" class="o_default_snippet_text">Payment</p></td></tr></tbody></table></td></tr></tbody></table></div><div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #414141 repeat top /100%;color:#44B7B7"><div style="padding:10px"><table cellpadding="0" cellspacing="0" style="margin: 0 auto;width:100%;border-collapse:collapse;color:inherit;color:inherit"><tbody><tr><td style="text-align:center"> <a style="text-decoration: none;" href="https://www.facebook.com/Odoo"><span class="fa fa-facebook-square fa-2x"></span></a><a style="text-decoration: none;" href="https://plus.google.com/+Odooapps"><span class="fa fa-google-plus-square fa-2x"></span></a><a style="text-decoration: none;" href="https://www.linkedin.com/company/odoo"><span class="fa fa-linkedin-square fa-2x"></span></a><a style="text-decoration: none;" href="https://twitter.com/Odoo"><span class="fa fa-twitter-square fa-2x"></span></a> </td></tr><tr><td style="font-size:12px;text-align:center;padding-top:10px;padding-bottom:5px" class="o_default_snippet_text"> <a href="/unsubscribe_from_list" style="color:#44B7B7" class="o_default_snippet_text">Unsubscribe</a>|<a href="/page/contactus" style="color:#44B7B7" class="o_default_snippet_text">Contact</a> </td></tr></tbody></table></div>
+        </div>]]></field>
             <field name="attachment_ids" eval="[(4, ref('mass_mail_attach_1'))]"/>
         </record>
         <record id="mass_mail_2" model="mail.mass_mailing">