diff options
| author | Jignesh Rathod (OpenERP) <jir@tinyerp.com> | 2013-06-07 11:16:38 +0530 |
|---|---|---|
| committer | Jignesh Rathod (OpenERP) <jir@tinyerp.com> | 2013-06-07 11:16:38 +0530 |
| commit | 42f27a15275effd9c43dfe99e32c395ca6b3fd8a (patch) | |
| tree | aaa49ee7000db1fdfe063903b3e56949bcf336f4 /addons/mail/static/src/xml | |
| parent | f7bb48d3b173abb6f9a57ff86870ff4e36e46fe1 (diff) | |
| parent | d5d2f88b010315913bfde469e905fc100e7d1b76 (diff) | |
Merge with latest code.
bzr revid: jir@tinyerp.com-20130607054638-61sdf0oip5kk20eg
Diffstat (limited to 'addons/mail/static/src/xml')
| -rw-r--r-- | addons/mail/static/src/xml/mail.xml | 6 | ||||
| -rw-r--r-- | addons/mail/static/src/xml/mail_followers.xml | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index 7e7d772397a..f5004941a8d 100644 --- a/addons/mail/static/src/xml/mail.xml +++ b/addons/mail/static/src/xml/mail.xml @@ -143,8 +143,10 @@ <div class="oe_recipients" t-if="!widget.is_log"> <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"/>) + <input type="checkbox" t-att-checked="recipient.checked ? 'checked' : undefined" t-att-data="recipient.full_name"/> + <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> |