summaryrefslogtreecommitdiff
path: root/addons/mail/static/src/xml/mail.xml
diff options
context:
space:
mode:
authorThibault Delavallée <tde@openerp.com>2012-05-15 09:32:46 +0200
committerThibault Delavallée <tde@openerp.com>2012-05-15 09:32:46 +0200
commit91d00a198021b86e95a4d034243d64b8528c0bc5 (patch)
tree58a0fd3f3388a0773c1f5510b755a993859b6b14 /addons/mail/static/src/xml/mail.xml
parenta6c455e5ab93b8f62da41336e1b5d999c38e39aa (diff)
parentacd27e307a3439de8524172f12518ef37e5c7cca (diff)
[MERGE] Merged with main addons.
bzr revid: tde@openerp.com-20120515073246-73t1llk8rmt2z4a7
Diffstat (limited to 'addons/mail/static/src/xml/mail.xml')
-rw-r--r--addons/mail/static/src/xml/mail.xml17
1 files changed, 9 insertions, 8 deletions
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index b8adba6d01a..a11a5a2c6b8 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -2,15 +2,16 @@
<template>
<div t-name="Wall" class="oe_mail_wall">
- <div class="oe_view_manager_header">
- <div class="oe_view_manager_row">
- <h2 class="oe_view_title">All Feeds</h2>
- </div>
- </div>
+ <table class="oe_view_manager_header">
+ <tr class="oe_header_row">
+ <td><h2 class="oe_view_title">All Feeds</h2></td>
+ <td><div class="oe_view_manager_view_search" t-opentag="true"/></td>
+ </tr>
+ </table>
<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..."/>
- <button class="oe_mail_oe_right oe_mail_wall_button_comment" type="button">Post comment</button>
+ <button class="oe_right oe_mail_wall_button_comment" type="button">Post comment</button>
</div>
<div class="oe_clear"></div>
<div class="oe_mail_wall_threads">
@@ -45,7 +46,7 @@
<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"/>
+ <img class="oe_mail_msg_image oe_left" alt="User img"/>
<div class="oe_mail_msg_content">
<textarea class="oe_mail oe_mail_action_textarea" placeholder="Add your comment here..." onfocus="this.value = '';"/><br />
</div>
@@ -71,7 +72,7 @@
<li><a href="#" class="oe_mail_oe_intlink oe_mail_msg_hide_type" t-attf-data-subtype='{record.subtype}'>Hide '<t t-esc="record.subtype"/>' for this document</a></li>
</t>
</ul>
- <img class="oe_mail_msg_image oe_mail_oe_left" t-att-src="record.mini_url"/>
+ <img class="oe_mail_msg_image 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>
<t t-if="record.type == 'notification' || record.type == 'comment'"><t t-call="NoteDisplay"/></t>