From 12b818d3759fc9eba19fa8a8ae8d050fe0c5fdc1 Mon Sep 17 00:00:00 2001
From: stefanorigano <sri@odoo.com>
Date: Tue, 8 Aug 2017 09:22:41 +0200
Subject: [REF] mail: introduce new chatter/discuss design

- Improve overall design
- Better use of UI colours
- Replace planned activities icon
- Vertically align kanban icons
- Remove the 'bell shtcut' and followers caret
- Use a mixin to style the chatter (inline, not inline, compact)
---
 addons/mail/static/src/xml/composer.xml | 40 +++++++++++++++------------------
 1 file changed, 18 insertions(+), 22 deletions(-)

(limited to 'addons/mail/static/src/xml/composer.xml')

diff --git a/addons/mail/static/src/xml/composer.xml b/addons/mail/static/src/xml/composer.xml
index 032a71edbcd..7e6501d0889 100644
--- a/addons/mail/static/src/xml/composer.xml
+++ b/addons/mail/static/src/xml/composer.xml
@@ -1,31 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templates xml:space="preserve">
 
-     <div t-name="mail.ChatComposer" class="o_chat_composer">
-         <div class="o_composer_attachments_list"/>
-         <t t-if="widget.extended">
-             <div class="o_composer_subject">
-                 <input tabindex="1" type="text" class="o_input" placeholder="Subject"></input>
-                 <div class="btn-group o_composer_buttons">
-                    <button tabindex="3" class="btn btn-sm btn-primary o_composer_button_send" type="button"><t t-esc="widget.options.send_text"/></button>
-                    <button tabindex="4" class="btn btn-sm btn-icon fa fa-smile-o o_composer_button_emoji" type="button" data-toggle="popover"/>
-                    <button tabindex="5" class="btn btn-sm btn-icon fa fa-paperclip o_composer_button_add_attachment" type="button"/>
-                 </div>
+     <div t-name="mail.ChatComposer" t-attf-class="o_chat_composer #{widget.extended ? 'o_chat_composer_extended' : ''}">
+         <div class="o_composer_container">
+             <!-- TODO: Use real user avatar -->
+             <img height="36" width="36" class="o_thread_message_sidebar o_chatter_avatar img-circle" src="https://pbs.twimg.com/profile_images/885832422667038720/NmqlCWGq_400x400.jpg"/>
+             <div t-if="widget.extended" class="o_composer_subject">
+                 <input tabindex="1" type="text" placeholder="Subject" class="o_input"/>
              </div>
-         </t>
-         <div t-attf-class="o_composer #{widget.extended ? 'o_extended_composer' : ''}">
-             <div class="o_composer_input">
-                 <textarea class="o_input o_composer_text_field" tabindex="2" placeholder="Write something..."/>
+             <div t-attf-class="o_composer #{widget.extended ? 'o_extended_composer' : ''}">
+                <div class="o_composer_input">
+                    <textarea class="o_input o_composer_text_field" tabindex="2" placeholder="Write something..."/>
+                    <div class="o_chatter_composer_tools">
+                        <button tabindex="4" class="btn btn-sm btn-icon fa fa-smile-o o_composer_button_emoji" type="button" data-toggle="popover"/>
+                        <button tabindex="5" class="btn btn-sm btn-icon fa fa-paperclip o_composer_button_add_attachment" type="button"/>
+                    </div>
+                </div>
              </div>
-             <t t-if="!widget.extended">
-                 <div class="btn-group o_composer_buttons">
-                    <button tabindex="3" class="btn btn-sm btn-primary o_composer_button_send" type="button"><t t-esc="widget.options.send_text"/></button>
-                    <button tabindex="4" class="btn btn-sm btn-icon fa fa-smile-o o_composer_button_emoji" type="button" data-toggle="popover"/>
-                    <button tabindex="5" class="btn btn-sm btn-icon fa fa-paperclip o_composer_button_add_attachment" type="button"/>
-                 </div>
-             </t>
+             <div class="o_composer_attachments_list"/>
+         </div>
+         <div class="o_composer_send">
+             <button tabindex="3" class="btn btn-sm btn-primary o_composer_button_send" type="button"><t t-esc="widget.options.send_text"/></button>
          </div>
-
          <span class="hide">
             <t t-call="HiddenInputFile">
                 <t t-set="fileupload_id" t-value="widget.fileupload_id"/>
-- 
cgit v1.2.3