diff options
| author | Ravish (Open ERP) <rmu@tinyerp.com> | 2013-05-16 10:44:37 +0530 |
|---|---|---|
| committer | Ravish (Open ERP) <rmu@tinyerp.com> | 2013-05-16 10:44:37 +0530 |
| commit | fa9f18359fccc836a460736d2d07fe9b9ba0463a (patch) | |
| tree | 24f77e99fd00eee9f8ed833b4ad45aee22f628a7 /addons/mail/static/src/xml/mail.xml | |
| parent | dd81c8f9c340ed78db09f3c9c0b273ad86faa056 (diff) | |
| parent | 1bb278384c4a3e6053a8f9072f4515d2e42d0455 (diff) | |
[merge] with lateset 7.0
bzr revid: rmu@tinyerp.com-20130516051437-1bdcjgxey3efpw31
Diffstat (limited to 'addons/mail/static/src/xml/mail.xml')
| -rw-r--r-- | addons/mail/static/src/xml/mail.xml | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index 2b3e0129959..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> @@ -226,7 +228,7 @@ <!-- default layout --> <t t-name="mail.thread.message"> - <div t-attf-class="oe_msg #{widget.thread_level and widget.options.display_indented_thread > -1 ? 'oe_msg_indented' : ''} #{widget.partner_ids.length == 0 ? 'oe_msg_nobody' : ''} oe_msg_#{widget.type}"> + <div t-attf-class="oe_msg #{widget.thread_level and widget.options.display_indented_thread > -1 ? 'oe_msg_indented' : ''} #{widget.subtype ? '' : 'oe_msg_nobody'} oe_msg_#{widget.type}"> <div class='oe_msg_left'> <a t-if="widget.options.show_link" t-attf-href="#model=res.partner&id=#{widget.author_id[0]}" t-att-title="widget.author_id[1]"> @@ -250,7 +252,7 @@ <t t-raw="widget.record_name"/> </a> <span t-if="!widget.options.show_link and widget.show_record_name"><t t-raw="widget.record_name"/></span> - <t t-if="widget.subject">: </t> + <t t-if="widget.show_record_name and widget.subject">: </t> <t t-if="widget.subject" t-raw="widget.subject"/> </h1> <div class="oe_msg_body"> @@ -263,13 +265,23 @@ </t> <a t-if="widget.author_id and widget.options.show_link and widget.author_id[0]" t-attf-href="#model=res.partner&id=#{widget.author_id[0]}"><t t-raw="widget.author_id[2]"/></a> <span t-if="widget.author_id and (!widget.options.show_link or !widget.author_id[0])"><t t-raw="widget.author_id[2]"/></span> - <t t-if="widget.partner_ids.length == 0"> + <t t-if="widget.type == 'notification'"> + updated document + <t t-if="widget.partner_ids.length > 0"> + <span class='oe_subtle'>•</span> + </t> + </t> + <t t-if="widget.type == 'comment' and ! widget.subtype"> logged a note </t> - <t t-if="widget.partner_ids.length > 0"> + <t t-if="(widget.type == 'comment' or widget.type == 'email') and widget.subtype"> to + <t t-if="widget.partner_ids.length == 0"> + nobody + </t> </t> - <t t-foreach="widget.partner_ids.slice(0, 3)" t-as="partner"> + <t t-if="widget.type == 'notification' or ( (widget.type == 'email' or widget.type == 'comment') and widget.subtype)" + t-foreach="widget.partner_ids.slice(0, 3)" t-as="partner"> <span t-attf-class="oe_partner_follower"> <a t-if="widget.options.show_link" t-attf-href="#model=res.partner&id=#{partner[0]}"><t t-raw="partner[1]"/></a> <t t-if="!widget.options.show_link" t-raw="partner[1]"/> @@ -279,6 +291,9 @@ <t t-if="widget.partner_ids.length > 3"> <span t-att-title="widget.extra_partners_str">and <t t-raw="widget.extra_partners_nbr"/> more</span> </t> + <t t-if="widget.type == 'notification' and widget.partner_ids.length > 0"> + notified + </t> <span class='oe_subtle'>•</span> <span t-att-title="widget.date"><t t-if="widget.timerelative" t-raw="widget.timerelative"/><t t-if="!widget.timerelative" t-raw="widget.date"/></span> <span t-if="!widget.options.readonly" class='oe_subtle'>•</span> |