diff options
| author | Ajay Chauhan (OpenERP) <cha@tinyerp.com> | 2012-10-01 14:47:30 +0530 |
|---|---|---|
| committer | Ajay Chauhan (OpenERP) <cha@tinyerp.com> | 2012-10-01 14:47:30 +0530 |
| commit | d2b51d4e149e8542f77fd2a171d0a4498352be2d (patch) | |
| tree | 0e10ae6b0e694692df4260a65f2b7ac88c9573ca /addons/mail/static/src/xml | |
| parent | 826e2b8fdbb267efab4feff67e373e0e0c1c1568 (diff) | |
| parent | 3686a01df372b01dcec9a5438ba9b16256895c5e (diff) | |
[MERGE] merge with lp:openobject-addons
bzr revid: cha@tinyerp.com-20121001091730-q6sbcvj7nu53t91h
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 | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index e3586e723e4..c54bd4dbb2d 100644 --- a/addons/mail/static/src/xml/mail.xml +++ b/addons/mail/static/src/xml/mail.xml @@ -140,7 +140,7 @@ <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> + <li t-if="record.author_id"><a t-attf-href="#model=res.partner&id=#{record.author_id[0]}"><t t-raw="record.author_id[1]"/></a></li> <li><span t-att-title="record.date"><t t-raw="record.timerelative"/></span></li> <t t-call="mail.thread.message.vote"/> <li t-if="options.show_reply"><a class="oe_mail_msg_reply">Reply</a></li> @@ -185,7 +185,7 @@ <t t-if='record.vote_user_ids.length > 0'> <span class="oe_left oe_mail_vote_count"><t t-esc="record.vote_user_ids.length"/> votes</span> </t> - <button t-attf-class="oe_mail_msg_vote oe_mail_msg_vote_#{record.has_voted}" t-attf-data-msg_id="{record.id}"> + <button t-attf-class="oe_mail_msg_vote oe_tag" t-attf-data-msg_id="{record.id}"> <t t-if="! record.has_voted"><span>+1</span></t> <t t-if="record.has_voted"><span>-1</span></t> </button> diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml index cf31ab3e24c..203a7bce789 100644 --- a/addons/mail/static/src/xml/mail_followers.xml +++ b/addons/mail/static/src/xml/mail_followers.xml @@ -7,7 +7,6 @@ --> <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_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> @@ -18,7 +17,7 @@ </div> <div class="oe_mail_recthread_followers"> <t t-if="widget.options.title"> - <h4><t t-raw="widget.options.title"/></h4> + <h4><t t-raw="widget.options.title"/></h4><span class="oe_mail_invite_wrapper"> ยท <a class="oe_mail_invite" >Invite partners</a></span> </t> <ul class="oe_mail_followers_display"></ul> </div> |