From 30003dbce3e93069bbd0c3e09a9b9d2e8b2ab4d4 Mon Sep 17 00:00:00 2001
From: Aaron Bohy <aab@odoo.com>
Date: Thu, 24 Dec 2015 12:57:58 +0100
Subject: [FIX] im_livechat,mail: various ui fixes/improvements

im_livechat:
  - feedback message wording
  - livechat_channel form view typo

mail:
  - channel form view: email_send field label wording and layout
  - notifications preview extended
  - client action mass mailing composer fine tuning
  - client action mass mailing channels tooltip
  - client action idle bullet color
---
 addons/mail/static/src/js/chat_manager.js      |  2 +-
 addons/mail/static/src/less/client_action.less | 16 +++++++++++-----
 addons/mail/static/src/less/composer.less      |  1 +
 addons/mail/static/src/xml/client_action.xml   |  8 ++++----
 addons/mail/static/src/xml/composer.xml        |  4 ++--
 5 files changed, 19 insertions(+), 12 deletions(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/js/chat_manager.js b/addons/mail/static/src/js/chat_manager.js
index f9ec6cb9206..4f3a039b63d 100644
--- a/addons/mail/static/src/js/chat_manager.js
+++ b/addons/mail/static/src/js/chat_manager.js
@@ -11,7 +11,7 @@ var web_client = require('web.web_client');
 
 var _t = core._t;
 var LIMIT = 100;
-var preview_msg_max_size = 50;
+var preview_msg_max_size = 200;
 
 var MessageModel = new Model('mail.message', session.context);
 var ChannelModel = new Model('mail.channel', session.context);
diff --git a/addons/mail/static/src/less/client_action.less b/addons/mail/static/src/less/client_action.less
index feae99d5f89..f6c42c16b8d 100644
--- a/addons/mail/static/src/less/client_action.less
+++ b/addons/mail/static/src/less/client_action.less
@@ -103,12 +103,15 @@
                     margin-right: 5px;
                     border: none;
                 }
+                &.o_extended_composer .o_composer_input {
+                    margin-right: 0;
+                }
+            }
 
-                .o_composer_buttons {
-                    .o-flex(0, 0, auto);
-                    .o_composer_button_send {
-                        float: right;
-                    }
+            .o_composer_buttons {
+                .o-flex(0, 0, auto);
+                .o_composer_button_send {
+                    float: right;
                 }
             }
         }
@@ -223,4 +226,7 @@
     &.o_user_online {
         color: @odoo-brand-optional;
     }
+    &.o_user_idle {
+        color: orange;
+    }
 }
diff --git a/addons/mail/static/src/less/composer.less b/addons/mail/static/src/less/composer.less
index 3a0881d5da9..6dad1dac3d2 100644
--- a/addons/mail/static/src/less/composer.less
+++ b/addons/mail/static/src/less/composer.less
@@ -4,6 +4,7 @@
 
     > input {
         .o-flex(1, 1, auto);
+        padding: 5px;
         margin-right: 30px;
     }
 }
diff --git a/addons/mail/static/src/xml/client_action.xml b/addons/mail/static/src/xml/client_action.xml
index f9ff63e7686..0c254e7cf7f 100644
--- a/addons/mail/static/src/xml/client_action.xml
+++ b/addons/mail/static/src/xml/client_action.xml
@@ -84,7 +84,7 @@
                 </span>
                 <span t-if="display_hash" class="o_mail_hash">#</span>
                 <t t-esc="channel.name"/>
-                <i t-if="channel.mass_mailing" class="fa fa-envelope-o"/>
+                <i t-if="channel.mass_mailing" class="fa fa-envelope-o" title="Sends messages by email"/>
                 <t t-call="mail.chat.SidebarNeedaction"/>
                 <span t-attf-class="fa fa-times pull-right o_mail_partner_unpin #{counter ? 'hide' : ''}"
                       t-att-title="_t('Leave this channel')" t-att-data-channel-id="channel.id"/>
@@ -97,9 +97,9 @@
     </t>
 
     <t t-name="mail.chat.UserStatus">
-        <i t-if="status == 'online'" class="o_mail_user_status o_user_online fa fa-circle" t-attf-title="Online"/>
-        <i t-if="status == 'away'" class="o_mail_user_status fa fa-circle" t-attf-title="Idle"/>
-        <i t-if="status == 'offline'" class="o_mail_user_status fa fa-circle-o" t-attf-title="Offline"/>
+        <i t-if="status == 'online'" class="o_mail_user_status o_user_online fa fa-circle" title="Online"/>
+        <i t-if="status == 'away'" class="o_mail_user_status o_user_idle fa fa-circle" title="Idle"/>
+        <i t-if="status == 'offline'" class="o_mail_user_status fa fa-circle-o" title="Offline"/>
     </t>
 
     <t t-name="mail.chat.UndoSnackbar">
diff --git a/addons/mail/static/src/xml/composer.xml b/addons/mail/static/src/xml/composer.xml
index 4e1a9295e3b..2b651878b68 100644
--- a/addons/mail/static/src/xml/composer.xml
+++ b/addons/mail/static/src/xml/composer.xml
@@ -5,11 +5,11 @@
          <div class="o_composer_attachments_list"/>
          <t t-if="widget.extended">
              <div class="o_composer_subject">
-                 <input placeholder="Subject"></input>
+                 <input type="text" placeholder="Subject"></input>
                  <t t-call="mail.ChatComposer.Buttons"></t>
              </div>
          </t>
-         <div class="o_composer">
+         <div t-attf-class="o_composer #{widget.extended ? 'o_extended_composer' : ''}">
              <textarea class="o_composer_input" placeholder="Write something..."/>
              <t t-if="!widget.extended">
                  <t t-call="mail.ChatComposer.Buttons"></t>
-- 
cgit v1.2.3