diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-09-30 17:23:30 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-09-30 17:23:30 +0200 |
| commit | c8cc54559b75a621e4444ecdca6abd901b45e494 (patch) | |
| tree | 92141325d4dbbf70bbfb8e0c040d4435c8d2378f /addons/mail/data/mail_data.xml | |
| parent | b2804b1d2ae5fd7ec5c0eca79a8db77476badc84 (diff) | |
| parent | 91a14488250bc2bb405cc6d300359aa272642484 (diff) | |
[MERGE] forward port branch 10.0 up to 91a1448
Diffstat (limited to 'addons/mail/data/mail_data.xml')
| -rw-r--r-- | addons/mail/data/mail_data.xml | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/addons/mail/data/mail_data.xml b/addons/mail/data/mail_data.xml index 3645ba2e337..c229ef0f54e 100644 --- a/addons/mail/data/mail_data.xml +++ b/addons/mail/data/mail_data.xml @@ -67,7 +67,7 @@ <field name="auto_delete" eval="True"/> <field name="body_html"><![CDATA[ <div> -% if ctx.get('button_access'): +% if ctx.get('has_button_access'): <div itemscope itemtype="http://schema.org/EmailMessage"> <div itemprop="potentialAction" itemscope itemtype="http://schema.org/ViewAction"> <link itemprop="target" href="${ctx['button_access']['url']}"/> @@ -76,31 +76,31 @@ </div> </div> % endif -% if not ctx['is_discussion'] or not len(ctx['actions']) == 0 or ctx.get('button_access'): -<div summary="o_mail_notification"> -<table cellspacing="0" cellpadding="0" border="0" style="width: 100%; margin-top: 5px;"> +% if not ctx['is_discussion'] or not len(ctx['actions']) == 0 or ctx.get('has_button_access'): +<div summary="o_mail_notification" style="padding: 0px; width:600px;"> +<table cellspacing="0" cellpadding="0" border="0" style="width: 600px; margin-top: 5px;"> <tbody><tr> <td valign="center"> - % if ctx.get('button_access') or ctx.get('button_follow') or ctx.get('button_unfollow'): - <a href="${ctx['button_access']['url']}" style="padding: 8px 12px; font-size: 12px; text-decoration: none; color: #FFFFFF; text-decoration:none !important; font-weight: 400; background-color: #a24689; border: 0px solid #a24689; border-radius:3px">${ctx['button_access']['title']}</a> + % if ctx.get('has_button_access'): + <a href="${ctx['button_access']['url']}" style="padding: 8px 12px; font-size: 12px; color: #FFFFFF; text-decoration: none !important; font-weight: 400; background-color: #a24689; border: 0px solid #a24689; border-radius:3px">${ctx['button_access']['title']}</a> % endif - % if ctx.get('button_follow'): - % if ctx.get('actions'): + % if ctx.get('has_button_follow'): + % if ctx.get('has_button_access'): | % endif - <a href="${ctx['button_follow']['url']}" style="text-decoration:none; color: #a24689; text-decoration:none !important;">${ctx['button_follow']['title']}</a> - % elif ctx.get('button_unfollow'): - % if ctx.get('actions'): + <a href="${ctx['button_follow']['url']}" style="color: #a24689; text-decoration: none !important;">${ctx['button_follow']['title']}</a> + % elif ctx.get('has_button_unfollow'): + % if ctx.get('has_button_access'): | % endif - <a href="${ctx['button_unfollow']['url']}" style="text-decoration:none; color: #a24689; text-decoration:none !important;">${ctx['button_unfollow']['title']}</a> + <a href="${ctx['button_unfollow']['url']}" style="color: #a24689; text-decoration: none !important;">${ctx['button_unfollow']['title']}</a> % endif % if ctx.get('actions'): % for action in ctx['actions']: | - <a href="${action['url']}" style="text-decoration:none; color: #a24689; text-decoration:none !important;">${action['title']}</a> + <a href="${action['url']}" style="color: #a24689; text-decoration:none !important;">${action['title']}</a> % endfor % endif </td> |