diff options
Diffstat (limited to 'addons/mail/static/src/xml')
| -rw-r--r-- | addons/mail/static/src/xml/mail.xml | 43 |
1 files changed, 30 insertions, 13 deletions
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index 0f49902b6b3..f034b04311d 100644 --- a/addons/mail/static/src/xml/mail.xml +++ b/addons/mail/static/src/xml/mail.xml @@ -2,13 +2,17 @@ <template> <div t-name="Wall" class="oe_mail_wall"> - <div class="oe_mail_wall_search"> + <div class="oe_view_manager_header"> + <div class="oe_view_manager_row"> + <h2 class="oe_view_title">All Feeds</h2> + </div> </div> <div class="oe_mail_wall_left"> <div class="oe_mail_wall_act"> - <textarea class="oe_mail oe_mail_wall_action_textarea" placeholder="Add a personnal message here..."/><br /> - <button class="oe_mail_wall_button_comment" type="button">Post comment</button> + <textarea class="oe_mail oe_mail_wall_action_textarea" placeholder="Add a personnal message here..."/> + <button class="oe_mail_oe_right oe_mail_wall_button_comment" type="button">Post comment</button> </div> + <div class="oe_clear"></div> <div class="oe_mail_wall_threads"> </div> <div class="oe_mail_wall_more"> @@ -27,8 +31,8 @@ </div> <div class="oe_mail_recthread_right"> <div class="oe_mail_recthread_actions"> - <button type="button" class="oe_mail_button_follow">Not following</button> - <button type="button" class="oe_mail_button_unfollow">Following</button> + <button type="button" class="oe_mail_button_follow oe_mail_button_mouseout">Not following</button> + <button type="button" class="oe_mail_button_unfollow oe_mail_button_mouseout">Following</button> <button type="button" class="oe_mail_button_followers">Display followers</button> </div> <div class="oe_mail_recthread_followers"> @@ -39,11 +43,11 @@ </div> </div> - <ul t-name="Thread" class="oe_mail_thread oe_mail"> + <ul t-name="Thread" class="oe_mail oe_mail_thread"> <div class="oe_mail_thread_act"> <img class="oe_mail_msg_image oe_mail_oe_left" alt="User img"/> <div class="oe_mail_msg_content"> - <textarea class="oe_mail_action_textarea oe_mail" placeholder="Add your comment here..." onfocus="this.value = '';"/><br /> + <textarea class="oe_mail oe_mail_action_textarea" placeholder="Add your comment here..." onfocus="this.value = '';"/><br /> </div> </div> <div class="oe_mail_thread_display"></div> @@ -52,8 +56,8 @@ </div> </ul> - <li t-name="ThreadMsg" t-attf-class="oe_mail_thread_msg oe_mail"> - <div t-attf-class="{record.type}"> + <li t-name="ThreadMsg" t-attf-class="oe_mail oe_mail_thread_msg"> + <div t-attf-class="oe_mail_msg_#{record.type}"> <img class="oe_mail_msg_image oe_mail_oe_left" t-att-src="record.mini_url"/> <div class="oe_mail_msg_content"> <t t-if="record.type == 'email'"><t t-call="EmailDisplay" /></t> @@ -65,7 +69,9 @@ <t t-name="NoteDisplay"> <p class="oe_mail_msg"> - <a href="#" class="intlink oe_mail_oe_intlink" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}'><t t-raw="record.record_name"/></a> + <t t-if="params.thread_level > 0"> + <a href="#" class="intlink oe_mail_oe_intlink" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}'><t t-raw="record.record_name"/></a> + </t> <span class="oe_mail_msg_body"><t t-raw="record.body"/></span> <t t-if="record.tr_body"><span class="oe_mail_msg_body_short"><t t-raw="record.tr_body"/></span></t> <br /> @@ -73,18 +79,22 @@ <a href="#" class="intlink oe_mail_oe_intlink" data-res-model='res.users' t-attf-data-res-id='{record.user_id[0]}'><t t-raw="record.user_id[1]"/></a> on <t t-raw="record.date"/> </span> - <t t-if="display['show_reply']"><span class="oe_mail_oe_space"><a href="#" class="oe_mail_msg_reply oe_mail_oe_intlink">Reply</a></span></t> + <t t-if="display['show_reply']"><a href="#" class="oe_mail_oe_space oe_mail_msg_reply oe_mail_oe_intlink"> Reply</a> </t> <t t-if="display['show_delete']"> - <t t-if="thread._is_author(record.user_id[0])"><span class="oe_mail_oe_space"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_delete oe_mail_oe_intlink">Delete</a></span></t> + <t t-if="thread._is_author(record.user_id[0])"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_oe_space oe_mail_msg_delete oe_mail_oe_intlink"> Delete </a></t> </t> <t t-if="display['show_hide']"> - <t t-if="!(thread._is_author(record.user_id[0]))"><span class="oe_mail_oe_space"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_hide oe_mail_oe_intlink">Hide</a></span></t> + <t t-if="!(thread._is_author(record.user_id[0]))"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_oe_space oe_mail_msg_hide oe_mail_oe_intlink">Hide</a></t> </t> </p> </t> <t t-name="EmailDisplay"> <p class="oe_mail_msg oe_mail_msg_p_email_header"> + <t t-if="params.thread_level > 0"> + <a href="#" class="intlink oe_mail_oe_intlink" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}'><t t-raw="record.record_name"/></a> + </t> + <br /> <span class="oe_mail_oe_bold">From:</span> <t t-esc="record.email_from"/> on <span class="oe_mail_oe_fade"><t t-raw="record.date"/></span><br /> <span class="oe_mail_oe_bold">To:</span> <t t-esc="record.email_to"/><br /> <span class="oe_mail_oe_bold">Subject:</span> <t t-esc="record.subject"/><br /> @@ -92,6 +102,13 @@ <p class="oe_mail_msg"> <span class="oe_mail_msg_body"><t t-raw="record.body"/></span> <t t-if="record.tr_body"><span class="oe_mail_msg_body_short"><t t-raw="record.tr_body"/></span></t> + <br /> + <t t-if="display['show_delete']"> + <t t-if="thread._is_author(record.user_id[0])"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_delete oe_mail_oe_intlink"> Delete </a></t> + </t> + <t t-if="display['show_hide']"> + <t t-if="!(thread._is_author(record.user_id[0]))"><span class="oe_mail_oe_space"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_hide oe_mail_oe_intlink">Hide</a></span></t> + </t> </p> </t> |