diff options
| author | Amit Patel <apa@tinyerp.com> | 2012-09-14 10:37:33 +0530 |
|---|---|---|
| committer | Amit Patel <apa@tinyerp.com> | 2012-09-14 10:37:33 +0530 |
| commit | 4eac135e0859b70d7e87d92478ff5a609eaef6ed (patch) | |
| tree | 55aaa3d2c0eb1c463a15dff97483a430d5273677 /addons/mail/static/src/xml | |
| parent | 23951e1e0d86fe86732928a143c9029e2fcf6862 (diff) | |
| parent | 9df7381ced04b44e470fe0a060b6b82773f20c84 (diff) | |
[MERGE]:trunk
bzr revid: apa@tinyerp.com-20120914050733-9euo3vftm8fee6sq
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 | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index 4d3b56cf62f..bf339f21f1c 100644 --- a/addons/mail/static/src/xml/mail.xml +++ b/addons/mail/static/src/xml/mail.xml @@ -114,7 +114,7 @@ <!-- dropdown menu with message options and actions --> <span class="oe_dropdown_toggle oe_dropdown_arrow"> <ul class="oe_dropdown_menu"> - <li t-if="record.is_author & options.show_dd_delete"><a class="oe_mail_msg_delete" t-attf-data-id='{record.id}'>Delete</a></li> + <li t-if="record.is_author and options.show_dd_delete"><a class="oe_mail_msg_delete" t-attf-data-id='{record.id}'>Delete</a></li> <li t-if="options.show_dd_hide"><a class="oe_mail_msg_hide" t-attf-data-id='{record.id}'>Remove notification</a></li> <!-- Uncomment when adding subtype hiding <li t-if="display['show_hide']"> @@ -130,14 +130,14 @@ <t t-raw="record.subject"/> </h1> <div class="oe_mail_msg_body"> - <t t-if="options.show_record_name & (!record.subject) & (options.thread_level > 0)"> + <t t-if="options.show_record_name and record.record_name and (!record.subject) and (options.thread_level > 0)"> <a t-attf-href="#model=#{record.model}&id=#{record.res_id}"><t t-raw="record.record_name"/></a> </t> <t t-raw="record.body"/> </div> <div class="oe_clear"/> <ul class="oe_mail_msg_footer"> - <li t-if="options.show_record_name & record.subject & options.thread_level > 0"> + <li t-if="options.show_record_name and record.record_name and record.subject and options.thread_level > 0"> <a t-attf-href="#model=#{record.model}&id=#{record.res_id}"><t t-raw="record.record_name"/></a> </li> <li><a t-attf-href="#model=res.partner&id=#{record.author_id[0]}"><t t-raw="record.author_id[1]"/></a></li> diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml index 39622f42abf..32ce34d48d1 100644 --- a/addons/mail/static/src/xml/mail_followers.xml +++ b/addons/mail/static/src/xml/mail_followers.xml @@ -7,7 +7,8 @@ --> <div t-name="mail.followers" class="oe_mail_recthread_aside oe_semantic_html_override"> <div class="oe_mail_recthread_actions"> - <button type="button" class="oe_mail_button_follow oe_mail_button_mouseout">Not following</button> + <button type="button" class="oe_mail_button_invite">Invite</button> + <button type="button" class="oe_mail_button_follow">Follow</button> <button type="button" class="oe_mail_button_unfollow oe_mail_button_mouseout">Following</button> </div> <div class="oe_mail_recthread_followers"> |