diff options
| author | stefanorigano <stefano.rigano@gmail.com> | 2016-09-21 13:45:03 +0200 |
|---|---|---|
| committer | qsm-odoo <qsm@odoo.com> | 2016-09-23 11:16:16 +0200 |
| commit | 5ffe7dcafbcd0f37a01aaf3599bc6ff78bdcd4b5 (patch) | |
| tree | cde9cda88d0fd9ffc51c8f1e83d562811e16541e /addons/mass_mailing/views/snippets_themes.xml | |
| parent | 3f5a27e2869def78f8efa764634abc7957f31ef4 (diff) | |
[FIX] mass_mailing: editable social links
* Move social links out of tables so that they will not trigger at
td data-selectors
* Use o_mail_no_resize class to specify that the td container is not
resizable (otherwise oe_handles will overlap the icons)
* Adapt email templates
Diffstat (limited to 'addons/mass_mailing/views/snippets_themes.xml')
| -rw-r--r-- | addons/mass_mailing/views/snippets_themes.xml | 116 |
1 files changed, 48 insertions, 68 deletions
diff --git a/addons/mass_mailing/views/snippets_themes.xml b/addons/mass_mailing/views/snippets_themes.xml index 0f35177295a..16321faf6a9 100644 --- a/addons/mass_mailing/views/snippets_themes.xml +++ b/addons/mass_mailing/views/snippets_themes.xml @@ -97,46 +97,36 @@ <div class="o_mail_snippet_general"> <table align="center" cellspacing="0" cellpadding="0" border="0" class="o_mail_table_styles"> <tr> - <td width="80%" class="o_mail_logo_container o_mail_h_padding o_mail_v_padding"> + <td width="70%" class="o_mail_logo_container o_mail_h_padding o_mail_v_padding"> &nbsp; <a t-att-href="(company_id.website) or '#'" style="text-decoration:none;float:none;"> <img border="0" src="/web/image/mass_mailing.s_default_image_logo" style="height:auto;max-width:400px;" alt="Your Logo" /> </a> &nbsp; </td> - <td width="20%"> - <table t-if="website" class="o_mail_header_social" border="0" cellpadding="0" cellspacing="0" align="right" style="border-collapse:separate;"> - <tr> - <t t-if="website.social_facebook"> - <td align="right"> - <a t-att-href="website.social_facebook"> - <span class="fa fa-facebook"></span> - </a> - </td> - </t> - <t t-if="website.social_googleplus"> - <td align="right" style="padding-left:10px"> - <a t-att-href="website.social_googleplus"> - <span class="fa fa-google-plus"></span> - </a> - </td> - </t> - <t t-if="website.social_linkedin"> - <td align="right" style="padding-left:10px"> - <a t-att-href="website.social_linkedin"> - <span class="fa fa-linkedin"></span> - </a> - </td> - </t> - <t t-if="website.social_twitter"> - <td align="right" style="padding-left:10px"> - <a t-att-href="website.social_twitter"> - <span class="fa fa-twitter"></span> - </a> - </td> - </t> - </tr> - </table> + <td width="30%" class="text-right o_mail_no_resize"> + <div t-if="website" class="o_mail_header_social"> + <t t-if="website.social_facebook"> + <a t-att-href="website.social_facebook"> + <span class="fa fa-facebook"></span> + </a> + </t> + <t t-if="website.social_googleplus"> + <a t-att-href="website.social_googleplus" style="margin-left:10px"> + <span class="fa fa-google-plus"></span> + </a> + </t> + <t t-if="website.social_linkedin"> + <a t-att-href="website.social_linkedin" style="margin-left:10px"> + <span class="fa fa-linkedin"></span> + </a> + </t> + <t t-if="website.social_twitter"> + <a t-att-href="website.social_twitter" style="margin-left:10px"> + <span class="fa fa-twitter"></span> + </a> + </t> + </div> </td> </tr> </table> @@ -149,7 +139,7 @@ <div class="o_mail_snippet_general"> <table align="center" cellspacing="0" cellpadding="0" border="0" class="o_mail_table_styles"> <tr> - <td width="80%" class="o_mail_h_padding o_mail_v_padding"> + <td width="70%" class="o_mail_h_padding o_mail_v_padding"> &nbsp; <h3> <a t-att-href="(company_id.website) or '#'"> @@ -158,39 +148,29 @@ </h3> &nbsp; </td> - <td valign="center" width="20%"> - <table t-if="website" class="o_mail_header_social" border="0" cellpadding="0" cellspacing="0" align="right" style="border-collapse:separate;"> - <tr> - <t t-if="website.social_facebook"> - <td align="right"> - <a t-att-href="website.social_facebook"> - <span class="fa fa-facebook"></span> - </a> - </td> - </t> - <t t-if="website.social_googleplus"> - <td align="right" style="padding-left:10px"> - <a t-att-href="website.social_googleplus"> - <span class="fa fa-google-plus"></span> - </a> - </td> - </t> - <t t-if="website.social_linkedin"> - <td align="right" style="padding-left:10px"> - <a t-att-href="website.social_linkedin"> - <span class="fa fa-linkedin"></span> - </a> - </td> - </t> - <t t-if="website.social_twitter"> - <td align="right" style="padding-left:10px"> - <a t-att-href="website.social_twitter"> - <span class="fa fa-twitter"></span> - </a> - </td> - </t> - </tr> - </table> + <td width="30%" class="text-right o_mail_no_resize"> + <div t-if="website" class="o_mail_header_social"> + <t t-if="website.social_facebook"> + <a t-att-href="website.social_facebook"> + <span class="fa fa-facebook"></span> + </a> + </t> + <t t-if="website.social_googleplus"> + <a t-att-href="website.social_googleplus" style="margin-left:10px"> + <span class="fa fa-google-plus"></span> + </a> + </t> + <t t-if="website.social_linkedin"> + <a t-att-href="website.social_linkedin" style="margin-left:10px"> + <span class="fa fa-linkedin"></span> + </a> + </t> + <t t-if="website.social_twitter"> + <a t-att-href="website.social_twitter" style="margin-left:10px"> + <span class="fa fa-twitter"></span> + </a> + </t> + </div> </td> </tr> </table> |