From cf294f723f78744a2d4839445e64e218517586af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= <ged@odoo.com>
Date: Mon, 11 Jan 2016 10:56:12 +0100
Subject: [PATCH] [FIX] mail: prevent double scrollbar with notification bar

when the bar asking for notification permission appears, it can cause
two scrollbars to appear in the client action.  This commit moves the
notification bar inside the chat content, which solves the issue.
---
 addons/mail/static/src/js/client_action.js   |  2 +-
 addons/mail/static/src/xml/client_action.xml | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/addons/mail/static/src/js/client_action.js b/addons/mail/static/src/js/client_action.js
index 6480b8c37b2..a0c22add842 100644
--- a/addons/mail/static/src/js/client_action.js
+++ b/addons/mail/static/src/js/client_action.js
@@ -210,7 +210,7 @@ var ChatAction = Widget.extend(ControlPanelMixin, {
         this.extended_composer.on('post_message', this, this.on_post_message);
         this.extended_composer.on('input_focused', this, this.on_composer_input_focused);
 
-        var def1 = this.thread.prependTo(this.$('.o_mail_chat_content'));
+        var def1 = this.thread.appendTo(this.$('.o_mail_chat_content'));
         var def2 = this.basic_composer.appendTo(this.$('.o_mail_chat_content'));
         var def3 = this.extended_composer.appendTo(this.$('.o_mail_chat_content'));
         var def4 = this.searchview.appendTo($("<div>"));
diff --git a/addons/mail/static/src/xml/client_action.xml b/addons/mail/static/src/xml/client_action.xml
index 18fef4a4ed6..da2e29057e0 100644
--- a/addons/mail/static/src/xml/client_action.xml
+++ b/addons/mail/static/src/xml/client_action.xml
@@ -4,14 +4,15 @@
     <!-- Client Action -->
     <t t-name="mail.client_action">
         <div class="o_mail_chat">
-            <t t-if="widget.notification_bar">
-                <div class="o_mail_annoying_notification_bar">
-                    <span class="o_mail_request_permission">Odoo needs your permission to <a href="#"> enable desktop notifications</a>.</span>
-                    <span class="fa fa-close"></span>
-                </div>
-            </t>
             <div class="o_mail_chat_sidebar"/>
-            <div class="o_mail_chat_content"/>
+            <div class="o_mail_chat_content">
+                <t t-if="widget.notification_bar">
+                    <div class="o_mail_annoying_notification_bar">
+                        <span class="o_mail_request_permission">Odoo needs your permission to <a href="#"> enable desktop notifications</a>.</span>
+                        <span class="fa fa-close"></span>
+                    </div>
+                </t>
+            </div>
         </div>
     </t>
     <t t-name="mail.chat.Sidebar">