diff options
| author | Thibault Delavallée <tde@openerp.com> | 2013-05-22 13:42:36 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2013-05-22 13:42:36 +0200 |
| commit | cd278d83abd291209d7c3f18ee8eb9ab43a4158a (patch) | |
| tree | 8d866ce7e1d365667e0a4fe9e85b10f15d36ea3d /addons/mail/static/src/xml | |
| parent | c1cb8bf7653d98153c43e0ee35eb3558438e0b78 (diff) | |
| parent | d4d6e882668cfdc7c4634a0e30a047d0c83c75a7 (diff) | |
[MERGE] Sync with trunk
bzr revid: tde@openerp.com-20130522103305-yi5ql1chdx9qxxlx
bzr revid: tde@openerp.com-20130522114236-qi2s3i2dl2lemdvh
Diffstat (limited to 'addons/mail/static/src/xml')
| -rw-r--r-- | addons/mail/static/src/xml/mail.xml | 4 | ||||
| -rw-r--r-- | addons/mail/static/src/xml/mail_followers.xml | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index 7e7d772397a..ab82d650f30 100644 --- a/addons/mail/static/src/xml/mail.xml +++ b/addons/mail/static/src/xml/mail.xml @@ -144,7 +144,9 @@ <t t-foreach='widget.recipients' t-as='recipient'> <label t-attf-title="Add as recipient and follower (reason: #{recipient.reason})"> <input type="checkbox" t-att-checked="recipient.checked ? 'checked' : undefined" t-att-data="recipient.email_address"/> - <t t-raw="recipient.name"/> (<t t-raw="recipient.email_address"/>) + <t t-raw="recipient.name"/> + <t t-if="recipient.email_address">(<t t-raw="recipient.email_address"/>)</t> + <t t-if="!recipient.email_address">(no email address)</t> </label> </t> </div> diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml index f3317223f1d..5ad3ff09bb3 100644 --- a/addons/mail/static/src/xml/mail_followers.xml +++ b/addons/mail/static/src/xml/mail_followers.xml @@ -19,7 +19,7 @@ </div> <div class='oe_follower_title_box'> <h4 class='oe_follower_title'>Followers</h4> - <button t-if="widget.view_is_editable" href='#' class="oe_invite">Invite people</button> + <a t-if="widget.view_is_editable" href='#' class="oe_invite">Add others</a> </div> <div class="oe_follower_list"></div> </div> |