[MERGE] Merged with main addons.

bzr revid: tde@openerp.com-20120515073246-73t1llk8rmt2z4a7

4 files changed, 18 insertions, 25 deletions

diff --git a/addons/mail/res_users_view.xml b/addons/mail/res_users_view.xml
index 93a60e1cdb1..072f2fc3ba5 100644
--- a/addons/mail/res_users_view.xml
+++ b/addons/mail/res_users_view.xml
@@ -9,9 +9,9 @@
             <field name="inherit_id" ref="base.view_users_form_simple_modif"/>
             <field name="arch" type="xml">
             <data>
-                <xpath expr="/form/group/group[@name='preferences']/field[@name='menu_tips']" position="after">
+                <field name="menu_tips" position="after">
                     <field name="notification_email_pref" readonly="0"/>
-                </xpath>
+                </field>
             </data>
             </field>
         </record>
@@ -23,11 +23,13 @@
             <field name="inherit_id" ref="base.view_users_form"/>
             <field name="arch" type="xml">
             <data>
-                <xpath expr="/form/notebook/page[@string='User']/group/group/group[@name='preferences']/field[@name='menu_tips']" position="after">
+                <field name="menu_tips" position="after">
                     <field name="notification_email_pref"/>
-                </xpath>
-                <xpath expr="/form/notebook" position="after">
-                    <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+                </field>
+                <xpath expr="/form/sheet" position="after">
+                    <div class="oe_form_sheet_width">
+                        <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+                    </div>
                 </xpath>
             </data>
             </field>
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 0576ba59f84..45263d84a63 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -319,16 +319,6 @@
     margin: 0;
 }
 
-.openerp .oe_mail_oe_right {
-    float: right;
-    margin-right: 8px;
-}
-
-.openerp .oe_mail_oe_left {
-    float: left;
-    margin-right: 8px;
-}
-
 .openerp a.oe_mail_oe_intlink {
     color: #8786b7;
 }
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 36352a9a999..d9d79832c61 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -584,7 +584,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.appendTo(this.$element.find('.oe_view_manager_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 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>