diff options
| author | Amit Bhavsar (Open ERP) <amb@tinyerp.com> | 2013-05-28 14:49:41 +0530 |
|---|---|---|
| committer | Amit Bhavsar (Open ERP) <amb@tinyerp.com> | 2013-05-28 14:49:41 +0530 |
| commit | 24848a8dccf0b8acc77b2e9fd007f613bbf1736b (patch) | |
| tree | 343ca29c494e3310c1d6fa4b4f2e97a396e21c8e /addons/mail/static/src/xml | |
| parent | 1b08798b52df8f0a3a72d116577cd7451b45b30c (diff) | |
| parent | 814a121dabbbe45a1c9ee671222b3a2bf261059a (diff) | |
[MERGE] merge with latest trunk
bzr revid: bde@tinyerp.com-20130522095432-1sl1b6uu6ewod4md
bzr revid: amb@tinyerp.com-20130528091941-wak8fnembuvewwjf
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> |