diff options
| author | bth-openerp <bth@tinyerp.com> | 2013-05-23 10:55:42 +0530 |
|---|---|---|
| committer | bth-openerp <bth@tinyerp.com> | 2013-05-23 10:55:42 +0530 |
| commit | 4d4385d8ca5fd2e5ab3a3cf51ccd3bb04cf3c064 (patch) | |
| tree | 74c9ca6eef41aed6a11445ccb92c2b7c6f04d053 /addons/mail/static/src/xml | |
| parent | 6850809fab15d6d4093a5f51282d2965e1c023f7 (diff) | |
| parent | e16f5b6e11e924c9871db6001ae052c4b34a7d0a (diff) | |
[MERGE]Merge lp:openobject-addons.
bzr revid: bth@tinyerp.com-20130523052542-y1gs9h3na12pxlrr
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> |