Merge remote-tracking branch 'dgzurita/website_mail_snippet_fixed' into website_mail_snippet_fixed

website_mail_snippet_fixed/__openerp__.py

@@ -22,6 +22,7 @@
         "views/snippet_1_col.xml",
         "views/snippet_2_cols.xml",
         "views/snippet_3_cols.xml",
+        "views/snippet_event_date.xml",
         "views/snippet_hr.xml",
         "views/snippet_img_text.xml",
         "views/snippet_text_img.xml",

website_mail_snippet_fixed/views/snippet_1_col.xml

@@ -13,7 +13,7 @@
             <t t-set="title">Big image + Text + Button (1 column)</t>
             <tbody>
                 <tr>
-                    <td><a href="#" target="_blank"><img src="http://placehold.it/560x200/333333/ffffff?text=width 560px" style="display: block; color: #000000;  font-family: Arial, sans-serif; font-size: 9pt; width: 560px;" border="0"/> </a></td>
+                    <td><a href="#" target="_blank"><img src="http://placehold.it/560x200/aaaaaa/ffffff?text=width 560px" style="display: block; color: #000000;  font-family: Arial, sans-serif; font-size: 9pt; width: 560px;" border="0" width="570"/> </a></td>
                 </tr>
                 <tr>
                     <td style="padding:0 20px;">

website_mail_snippet_fixed/views/snippet_2_cols.xml

@@ -19,10 +19,10 @@
                             <tbody>
                                 <tr>
                                     <td style="padding: 20px 10px 20px 20px;">
-                                        <table style="border-collapse:collapse;background:inherit;color:inherit; background:#FFFFFF" cellpadding="0" cellspacing="0" align="center" class="bg_color_picker">
+                                        <table style="border-collapse:collapse;background:inherit;color:inherit;" cellpadding="0" cellspacing="0" align="center">
                                             <tbody>
                                                 <tr>
-                                                    <td><a href="#" target="_blank"><img src="http://placehold.it/250x200/333333/ffffff?text=width 250px" style="display: block; color: #000000;  font-family: Arial, sans-serif; font-size: 9pt; width: 250px;" width="250" border="0"/></a></td>
+                                                    <td><a href="#" target="_blank"><img src="http://placehold.it/250x200/aaaaaa/ffffff?text=width 250px" style="display: block; color: #000000;  font-family: Arial, sans-serif; font-size: 9pt; width: 250px;" width="250" border="0"/></a></td>
                                                 </tr>
                                                 <tr>
                                                     <td style="padding:0;">
@@ -63,16 +63,17 @@
                                 </tr>
                             </tbody>
                         </table>
-
+                        </td>
+                        <td style="padding: 0;" valign="top">
                         <!-- RIGHT COLUMN -->
                         <table style="width:280px;" border="0" cellpadding="0" cellspacing="0" align="left">
                             <tbody>
                                 <tr>
                                     <td style="padding: 20px 20px 20px 10px;">
-                                        <table style="border-collapse:collapse;background:inherit;color:inherit; background:#FFFFFF" cellpadding="0" cellspacing="0" align="center" class="bg_color_picker">
+                                        <table style="border-collapse:collapse;background:inherit;color:inherit;" cellpadding="0" cellspacing="0" align="center">
                                             <tbody>
                                                 <tr>
-                                                    <td><a href="#" target="_blank"><img src="http://placehold.it/250x200/333333/ffffff?text=width 250px" style="display: block; color: #000000;  font-family: Arial, sans-serif; font-size: 9pt; width: 50% width: 250px;" width="250" border="0"/></a></td>
+                                                    <td><a href="#" target="_blank"><img src="http://placehold.it/250x200/aaaaaa/ffffff?text=width 250px" style="display: block; color: #000000;  font-family: Arial, sans-serif; font-size: 9pt; width: 50% width: 250px;" width="250" border="0"/></a></td>
                                                 </tr>
                                                 <tr>
                                                     <td style="padding:0;">

website_mail_snippet_fixed/views/snippet_3_cols.xml

@@ -21,7 +21,7 @@
                      <tbody>
                        <tr>
                         <td style="padding: 20px 10px 20px 20px;">
-                            <table align="center" bgcolor="#FFFFFF" cellpadding="0" cellspacing="0" style="border-collapse:collapse;background:inherit;color:inherit; background:#FFFFFF" width="160">
+                            <table align="center" cellpadding="0" cellspacing="0" style="border-collapse:collapse;background:inherit;color:inherit;" width="160">
                                 <tbody>
                                     <tr>
                                         <td><a href="#" target="_blank"><img src="http://placehold.it/160x160/aaaaaa/ffffff?text=width%20160px" style="display: block; color: #000000;  font-family: Arial, sans-serif; font-size: 9pt;width: 100%; width:160px;" border="0" width="160"/></a></td>
@@ -49,7 +49,7 @@
                                                                                 <table border="0" cellpadding="0" cellspacing="0">
                                                                                     <tbody>
                                                                                         <tr>
-                                                                                            <td align="center"><a href="#" style="font-size: 9pt; font-family: Arial, sans-serif; font-weight: normal; color: #ffffff; text-decoration: none; background-color: #00B518; border-top: 10px solid #00B518; border-bottom: 10px solid #00B518; border-left: 20px solid #00B518; border-right: 20px solid #00B518; border-radius: 3px; -webkit-border-radius: 3px; -moz-border-radius: 3px; display: inline-block;" target="_blank">Learn more</a></td>
+                                                                                            <td align="center"><a href="#" style="font-size: 9pt; font-family: Arial, sans-serif; font-weight: normal; color: #ffffff; text-decoration: none; background-color: #00B518; border-top: 10px solid #00B518; border-bottom: 10px solid #00B518; border-left: 20px solid #00B518; border-right: 20px solid #00B518; border-radius: 3px; -webkit-border-radius: 3px; -moz-border-radius: 3px; display: inline-block;" class="bg_color_picker" target="_blank">Learn more</a></td>
                                                                                         </tr>
                                                                                     </tbody>
                                                                                 </table>
@@ -76,7 +76,7 @@
                     <tbody>
                         <tr>
                             <td style="padding: 20px 10px 20px 10px;">
-                                <table align="center" bgcolor="#FFFFFF" cellpadding="0" cellspacing="0" style="border-collapse:collapse;background:inherit;color:inherit; background:#FFFFFF" width="160">
+                                <table align="center" cellpadding="0" cellspacing="0" style="border-collapse:collapse;background:inherit;color:inherit;" width="160">
                                     <tbody>
                                         <tr>
                                             <td><a href="#" target="_blank"><img src="http://placehold.it/160x160/aaaaaa/ffffff?text=width%20160px" style="display: block; color: #000000;  font-family: Arial, sans-serif; font-size: 9pt;width: 100%; width:160px;" border="0" width="160"/></a></td>
@@ -102,7 +102,7 @@
                                                                                     <table border="0" cellpadding="0" cellspacing="0">
                                                                                         <tbody>
                                                                                             <tr>
-                                                                                                <td align="center"><a href="#" style="font-size: 9pt; font-family: Arial, sans-serif; font-weight: normal; color: #ffffff; text-decoration: none; background-color: #00B518; border-top: 10px solid #00B518; border-bottom: 10px solid #00B518; border-left: 20px solid #00B518; border-right: 20px solid #00B518; border-radius: 3px; -webkit-border-radius: 3px; -moz-border-radius: 3px; display: inline-block;" target="_blank">Learn more</a></td>
+                                                                                                <td align="center"><a href="#" style="font-size: 9pt; font-family: Arial, sans-serif; font-weight: normal; color: #ffffff; text-decoration: none; background-color: #00B518; border-top: 10px solid #00B518; border-bottom: 10px solid #00B518; border-left: 20px solid #00B518; border-right: 20px solid #00B518; border-radius: 3px; -webkit-border-radius: 3px; -moz-border-radius: 3px; display: inline-block;" class="bg_color_picker" target="_blank">Learn more</a></td>
                                                                                             </tr>
                                                                                         </tbody>
                                                                                     </table>
@@ -129,7 +129,7 @@
                         <tbody>
                             <tr>
                                 <td style="padding: 20px 20px 20px 10px;">
-                                    <table align="center" bgcolor="#FFFFFF" cellpadding="0" cellspacing="0" style="border-collapse:collapse;background:inherit;color:inherit; background:#FFFFFF" width="160">
+                                    <table align="center" cellpadding="0" cellspacing="0" style="border-collapse:collapse;background:inherit;color:inherit;" width="160">
                                         <tbody>
                                             <tr>
                                                 <td><a href="#" target="_blank"><img src="http://placehold.it/160x160/aaaaaa/ffffff?text=width%20160px" style="display: block; color: #000000;  font-family: Arial, sans-serif; font-size: 9pt;width: 100%; width:160px;" border="0" width="160"/></a></td>
@@ -157,7 +157,7 @@
                                                                                         <table border="0" cellpadding="0" cellspacing="0">
                                                                                             <tbody>
                                                                                                 <tr>
-                                                                                                    <td align="center"><a href="#" style="font-size: 9pt; font-family: Arial, sans-serif; font-weight: normal; color: #ffffff; text-decoration: none; background-color: #00B518; border-top: 10px solid #00B518; border-bottom: 10px solid #00B518; border-left: 20px solid #00B518; border-right: 20px solid #00B518; border-radius: 3px; -webkit-border-radius: 3px; -moz-border-radius: 3px; display: inline-block;" target="_blank">Learn more</a></td>
+                                                                                                    <td align="center"><a href="#" style="font-size: 9pt; font-family: Arial, sans-serif; font-weight: normal; color: #ffffff; text-decoration: none; background-color: #00B518; border-top: 10px solid #00B518; border-bottom: 10px solid #00B518; border-left: 20px solid #00B518; border-right: 20px solid #00B518; border-radius: 3px; -webkit-border-radius: 3px; -moz-border-radius: 3px; display: inline-block;" class="bg_color_picker" target="_blank">Learn more</a></td>
                                                                                                 </tr>
                                                                                             </tbody>
                                                                                         </table>

website_mail_snippet_fixed/views/snippet_event_date.xml

@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- © 2016 Antiun Ingeniería S.L. - Jairo Llopis
+     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -->
+
+<openerp>
+<data>
+
+<template id="snippet_event_date"
+          inherit_id="560px_section">
+    <xpath expr=".">
+        <t t-call="website_mail_snippet_fixed.snippet">
+            <t t-set="image" t-value="'snippet_event_date'"/>
+            <t t-set="title">Date + Text + Button (2 columns)</t>
+            <tbody>
+                <tr><td align="left" colspan="2" style="font-size: 11pt; font-family: Arial, sans-serif; font-weight: bold; color: #000; padding: 20px 10px 0 20px;">Title</td></tr>
+                <tr>
+                    <td style="padding: 0;" valign="top"><!-- LEFT COLUMN -->
+                        <table align="left" border="0" cellpadding="0" cellspacing="0" width="50%">
+                            <tbody>
+                                <tr>
+                                    <td style="padding: 20px 0 20px 40px;">
+                                        <table align="center" bgcolor="#FFFFFF" cellpadding="0" cellspacing="0" style="border-collapse:collapse;background:inherit;color:inherit; background:#000000">
+                                            <tbody>
+                                                <tr>
+                                                    <td style="padding:1px;">
+                                                        <table border="0" cellpadding="0" cellspacing="0" width="200" height="200" style="background:#FFFFFF">
+                                                            <tbody>
+                                                                <tr>
+                                                                    <td align="center" style="font-size: 65pt; text-align: center; line-height:50pt; font-weight: bold; font-family: Arial, sans-serif; color: #000000; padding: 30px 0 0 0;">07</td>
+                                                                </tr>
+                                                                <tr>
+                                                                    <td align="center" style="padding: 10px 0 0 0; font-size: 16pt; text-align: center; font-weight: bold;  letter-spaccing:2px; text-transform: uppercase; line-height: 20px; font-family: Arial, sans-serif; color: #000000;">December</td>
+                                                                </tr>
+                                                                <tr>
+                                                                    <td align="center" style="padding: 0 0 30px 0; font-size: 16pt; text-align: center; font-weight: bold;  letter-spaccing:2px; text-transform: uppercase; line-height: 20px; font-family: Arial, sans-serif; color: #000000;">18:00</td>
+                                                                </tr>
+                                                            </tbody>
+                                                        </table>
+                                                    </td>
+                                                </tr>
+                                            </tbody>
+                                        </table>
+                                    </td>
+                                </tr>
+                            </tbody>
+                        </table>
+                    </td>
+                    <!-- RIGHT COLUMN -->
+                    <td>
+                        <table align="left" border="0" cellpadding="0" cellspacing="0" width="50%">
+                            <tbody>
+                                <tr>
+                                    <td style="padding: 20px 20px 20px 10px;">
+                                        <table align="center" cellpadding="0" cellspacing="0" style="border-collapse:collapse;background:inherit;color:inherit;" width="250">
+                                            <tbody>
+
+                                                <tr>
+                                                    <td style="padding:0;">
+                                                        <table border="0" cellpadding="0" cellspacing="0" width="100%">
+                                                            <tbody>
+                                                                <tr>
+                                                                    <td style="font-size: 18pt; font-family: Arial, sans-serif; color: #000000; padding-top: 10px;" align="left">Event Title</td>
+                                                                </tr>
+
+                                                                <tr>
+                                                                    <td align="left" style="padding: 10px 0 0 0; font-size: 9pt; line-height: 20px; font-family: Arial, sans-serif; color: #000000;">Lorem ipsum dolor sit amet, consectetur adipiscing elit.</td>
+                                                                </tr>
+
+                                                                <tr>
+                                                                    <td align="left">
+                                                                        <table border="0" cellpadding="0" cellspacing="0" width="100%">
+                                                                            <tbody>
+                                                                                <tr>
+                                                                                    <td style="padding: 25px 0;" align="left">
+                                                                                        <table border="0" cellpadding="0" cellspacing="0">
+                                                                                            <tbody>
+                                                                                                <tr>
+                                                                                                    <td align="center"><a href="#" style="font-size: 9pt; font-family: Arial, sans-serif; font-weight: normal; color: #ffffff; text-decoration: none; background-color: #00B518; border-top: 10px solid #00B518; border-bottom: 10px solid #00B518; border-left: 20px solid #00B518; border-right: 20px solid #00B518; border-radius: 3px; -webkit-border-radius: 3px; -moz-border-radius: 3px; display: inline-block;" class="bg_color_picker" target="_blank">Learn more</a></td>
+                                                                                                </tr>
+                                                                                            </tbody>
+                                                                                        </table>
+                                                                                    </td>
+                                                                                </tr>
+                                                                            </tbody>
+                                                                        </table>
+                                                                    </td>
+                                                                </tr>
+                                                            </tbody>
+                                                        </table>
+                                                    </td>
+                                                </tr>
+                                            </tbody>
+                                        </table>
+                                    </td>
+                                </tr>
+                            </tbody>
+                        </table>
+                    </td>
+                </tr>
+            </tbody>
+        </t>
+    </xpath>
+</template>
+
+</data>
+</openerp>

website_mail_snippet_fixed/views/snippet_img_text.xml

@@ -18,7 +18,7 @@
                             <tbody>
                                 <tr>
                                     <td style="padding: 20px 10px 20px 20px;">
-                                        <table align="center" bgcolor="#FFFFFF" cellpadding="0" cellspacing="0" style="border-collapse:collapse;background:inherit;color:inherit; background:#FFFFFF" width="250">
+                                        <table align="center" cellpadding="0" cellspacing="0" style="border-collapse:collapse;background:inherit;color:inherit;" width="250">
                                             <tbody>
                                                 <tr>
                                                     <td><a href="#" target="_blank"><img src="http://placehold.it/250x200/aaaaaa/ffffff?text=width%20250px" style="display: block; color: #000000;  font-family: Arial, sans-serif; font-size: 9pt; width: 250px;" border="0" width="250"/></a></td>
@@ -37,7 +37,7 @@
                             <tbody>
                                 <tr>
                                     <td style="padding: 20px 20px 20px 10px;">
-                                        <table align="center" bgcolor="#FFFFFF" cellpadding="0" cellspacing="0" style="border-collapse:collapse;background:inherit;color:inherit; background:#FFFFFF" width="250">
+                                        <table align="center" cellpadding="0" cellspacing="0" style="border-collapse:collapse;background:inherit;color:inherit;" width="250">
                                             <tbody>
 
                                                 <tr>
@@ -61,7 +61,7 @@
                                                                                         <table border="0" cellpadding="0" cellspacing="0">
                                                                                             <tbody>
                                                                                                 <tr>
-                                                                                                    <td align="center"><a href="#" style="font-size: 9pt; font-family: Arial, sans-serif; font-weight: normal; color: #ffffff; text-decoration: none; background-color: #00B518; border-top: 10px solid #00B518; border-bottom: 10px solid #00B518; border-left: 20px solid #00B518; border-right: 20px solid #00B518; border-radius: 3px; -webkit-border-radius: 3px; -moz-border-radius: 3px; display: inline-block;" target="_blank">Learn more</a></td>
+                                                                                                    <td align="center"><a href="#" style="font-size: 9pt; font-family: Arial, sans-serif; font-weight: normal; color: #ffffff; text-decoration: none; background-color: #00B518; border-top: 10px solid #00B518; border-bottom: 10px solid #00B518; border-left: 20px solid #00B518; border-right: 20px solid #00B518; border-radius: 3px; -webkit-border-radius: 3px; -moz-border-radius: 3px; display: inline-block;" class="bg_color_picker" target="_blank">Learn more</a></td>
                                                                                                 </tr>
                                                                                             </tbody>
                                                                                         </table>

website_mail_snippet_fixed/views/snippet_text_img.xml

@@ -18,7 +18,7 @@
                             <tbody>
                                 <tr>
                                     <td style="padding: 20px 10px 20px 20px;">
-                                        <table align="center" bgcolor="#FFFFFF" cellpadding="0" cellspacing="0" style="border-collapse:collapse;background:inherit;color:inherit; background:#FFFFFF" width="250">
+                                        <table align="center" cellpadding="0" cellspacing="0" style="border-collapse:collapse;background:inherit;color:inherit;" width="250">
                                             <tbody>
 
                                                 <tr>
@@ -42,7 +42,7 @@
                                                                                         <table border="0" cellpadding="0" cellspacing="0">
                                                                                             <tbody>
                                                                                                 <tr>
-                                                                                                    <td align="center"><a href="#" style="font-size: 9pt; font-family: Arial, sans-serif; font-weight: normal; color: #ffffff; text-decoration: none; background-color: #00B518; border-top: 10px solid #00B518; border-bottom: 10px solid #00B518; border-left: 20px solid #00B518; border-right: 20px solid #00B518; border-radius: 3px; -webkit-border-radius: 3px; -moz-border-radius: 3px; display: inline-block;" target="_blank">Learn more</a></td>
+                                                                                                    <td align="center"><a href="#" style="font-size: 9pt; font-family: Arial, sans-serif; font-weight: normal; color: #ffffff; text-decoration: none; background-color: #00B518; border-top: 10px solid #00B518; border-bottom: 10px solid #00B518; border-left: 20px solid #00B518; border-right: 20px solid #00B518; border-radius: 3px; -webkit-border-radius: 3px; -moz-border-radius: 3px; display: inline-block;" class="bg_color_picker" target="_blank">Learn more</a></td>
                                                                                                 </tr>
                                                                                             </tbody>
                                                                                         </table>