diff options
| author | Quentin (OpenERP) <qdp-launchpad@openerp.com> | 2012-05-15 12:57:29 +0200 |
|---|---|---|
| committer | Quentin (OpenERP) <qdp-launchpad@openerp.com> | 2012-05-15 12:57:29 +0200 |
| commit | a841dad3d6cfd07e1ed0b23764d77ea66a0ef0b0 (patch) | |
| tree | 92cfb9aa91ff16b46258e14b665e63734614d1d2 /addons/mail/static/src/xml/mail.xml | |
| parent | 9ca5ec4f23e046599411dc6b31bddd9b7195e42a (diff) | |
| parent | acd27e307a3439de8524172f12518ef37e5c7cca (diff) | |
[MERGE] merged with main trunk
bzr revid: qdp-launchpad@openerp.com-20120515105729-6vywpfya0ztukqph
Diffstat (limited to 'addons/mail/static/src/xml/mail.xml')
| -rw-r--r-- | addons/mail/static/src/xml/mail.xml | 17 |
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 f034b04311d..657a9c3a89e 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> @@ -58,7 +59,7 @@ <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"/> + <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> |