diff options
| author | Christophe Matthieu <chm@openerp.com> | 2012-09-26 09:17:09 +0200 |
|---|---|---|
| committer | Christophe Matthieu <chm@openerp.com> | 2012-09-26 09:17:09 +0200 |
| commit | 4ddb50dbf920a02bbb6f1c210a1215abd8a0b428 (patch) | |
| tree | ac2757b7008e88ce25c51a75ce654c58e3beae2e /addons/mail/static/src/xml | |
| parent | bf3cb4bcd6de46ec86b9bb335008a3722e817276 (diff) | |
[IMP] mail: subtype adapted for css onhover box
bzr revid: chm@openerp.com-20120926071709-v51ra4mzn2hp121j
Diffstat (limited to 'addons/mail/static/src/xml')
| -rw-r--r-- | addons/mail/static/src/xml/mail.xml | 13 | ||||
| -rw-r--r-- | addons/mail/static/src/xml/mail_followers.xml | 16 |
2 files changed, 17 insertions, 12 deletions
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index f610e00c629..49ca8ac03ba 100644 --- a/addons/mail/static/src/xml/mail.xml +++ b/addons/mail/static/src/xml/mail.xml @@ -67,7 +67,7 @@ <div class="oe_mail_msg_content"> <!-- contains the composition form --> <!-- default content: old basic textarea --> - <textarea class="oe_mail_compose_textarea" placeholder="Add your comment here..." onfocus="this.value = '';"/> + <textarea class="oe_mail_compose_textarea" placeholder="Add your comment here..."/> </div> <div class="oe_clear"/> </div> @@ -107,11 +107,12 @@ </ul> <!-- default layout --> - <li t-name="mail.thread.message" class="oe_mail oe_mail_thread_msg"> + <li t-name="mail.thread.message" class="oe_mail oe_mail_thread_msg" t-attf-data-msg_id="{record.id}"> <div t-attf-class="oe_mail_msg_#{record.type} oe_semantic_html_override"> <img class="oe_mail_icon oe_mail_frame oe_left" t-att-src="record.avatar"/> <div class="oe_mail_msg_content"> <!-- dropdown menu with message options and actions --> + <span class="placeholder-mail-thread-message-vote"/> <span class="oe_dropdown_toggle oe_dropdown_arrow"> <ul class="oe_dropdown_menu"> <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> @@ -162,7 +163,7 @@ </li> <!-- expandable message layout --> - <li t-name="mail.thread.message.expandable" class="oe_mail oe_mail_thread_msg"> + <li t-name="mail.thread.message.expandable" class="oe_mail oe_mail_thread_msg" t-attf-data-msg_id="{record.id}"> <div t-attf-class="oe_mail_msg_expandable oe_semantic_html_override"> <div class="oe_mail_msg_content"> <!-- message itself --> @@ -198,11 +199,11 @@ --> <li t-name="mail.thread.message.vote"> <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> + <span class="oe_left oe_mail_vote_count"><t t-esc="record.vote_user_ids.length"/> people agree</span> </t> <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> + <t t-if="! record.has_voted"><span>Agree</span></t> + <t t-if="record.has_voted"><span>Unagree</span></t> </button> </li> diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml index 9d0543bbdca..ec8e19e2376 100644 --- a/addons/mail/static/src/xml/mail_followers.xml +++ b/addons/mail/static/src/xml/mail_followers.xml @@ -7,15 +7,19 @@ --> <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"><p>Follow</p><span class="oe_e">S</span></button> - <button type="button" class="oe_mail_button_unfollow oe_mail_button_mouseout"><p>Following</p><span class="oe_e">S</span></button> - <button type="button" class="oe_mail_button_invite"><p>Invite</p></button> - <div class="oe_mail_recthread_subtypes"> - <h4>Message types to follow</h4> - <ul class="oe_mail_subtypes"></ul> + <div class="oe_mouse_subtypes"> + <button type="button" class="oe_follower oe_notfollow"> + <span class="oe_follow">Follow</span> + <span class="oe_unfollow">Unfollow</span> + <span class="oe_following">Following</span> + </button> + <div class="oe_recthread_subtypes"> + <ul class="oe_subtypes"></ul> + </div> </div> </div> <div class="oe_mail_recthread_followers"> + <button type="button" class="oe_invite"><span>Invite</span></button> <t t-if="widget.options.title"> <h4><t t-raw="widget.options.title"/></h4> </t> |