From 9aae22e06b16a74a5c4115cb92e9e3a45f3dcb1f Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Fri, 11 May 2012 12:37:17 +0200
Subject: [PATCH] changed header to table in mail addons

bzr revid: mit@openerp.com-20120511103717-c1fgqdmshj1rc9u3
---
 addons/mail/static/src/js/mail.js   |  2 +-
 addons/mail/static/src/xml/mail.xml | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 4ac7f0d5e3e..bed8faea5e0 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -646,7 +646,7 @@ openerp.mail = function(session) {
         load_search_view: function (view_id, defaults, hidden) {
             var self = this;
             this.searchview = new session.web.SearchView(this, this.ds_msg, view_id || false, defaults || {}, hidden || false);
-            var search_view_loaded = this.searchview.prependTo(this.$element.find('.oe_header_row'));
+            var search_view_loaded = this.searchview.appendTo(this.$element.find('.oe_view_manager_view_search'));
             return $.when(search_view_loaded).then(function () {
                 self.searchview.on_search.add(self.do_searchview_search);
             });
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 81c311daacf..657a9c3a89e 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -2,11 +2,12 @@
 <template>
 
     <div t-name="Wall" class="oe_mail_wall">
-        <div class="oe_view_manager_header">
-            <div class="oe_header_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..."/>