From 30003dbce3e93069bbd0c3e09a9b9d2e8b2ab4d4 Mon Sep 17 00:00:00 2001 From: Aaron Bohy Date: Thu, 24 Dec 2015 12:57:58 +0100 Subject: [PATCH] [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/im_livechat/static/src/js/im_livechat.js | 4 ++-- .../views/im_livechat_channel_views.xml | 2 +- addons/mail/models/mail_channel.py | 2 +- 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 ++-- addons/mail/views/mail_channel_views.xml | 4 ++-- 9 files changed, 25 insertions(+), 18 deletions(-) diff --git a/addons/im_livechat/static/src/js/im_livechat.js b/addons/im_livechat/static/src/js/im_livechat.js index c2f0a37f5ba..bc4dc4356cb 100644 --- a/addons/im_livechat/static/src/js/im_livechat.js +++ b/addons/im_livechat/static/src/js/im_livechat.js @@ -276,9 +276,9 @@ var Feedback = Widget.extend({ }; return session.rpc('/im_livechat/feedback', args).then(function () { if (options.close) { - var content = _.str.sprintf(_t("I rated you with :rating_%d"), self.rating); + var content = _.str.sprintf(_t("Rating: :rating_%d"), self.rating); if (options.reason) { - content += _.str.sprintf(_t(" for the following reason: %s"), options.reason); + content += " \n" + options.reason; } self.trigger("send_message", {content: content}); self.trigger("feedback_sent"); // will close the chat diff --git a/addons/im_livechat/views/im_livechat_channel_views.xml b/addons/im_livechat/views/im_livechat_channel_views.xml index 12ae74c9155..1c6749d0c64 100644 --- a/addons/im_livechat/views/im_livechat_channel_views.xml +++ b/addons/im_livechat/views/im_livechat_channel_views.xml @@ -115,7 +115,7 @@

- Copy and paste this code into your website, within the &lt;head&gt; tag: + Copy and paste this code into your website, within the <head> tag:

diff --git a/addons/mail/models/mail_channel.py b/addons/mail/models/mail_channel.py index d746c78d5a4..c4fa5d98e4e 100644 --- a/addons/mail/models/mail_channel.py +++ b/addons/mail/models/mail_channel.py @@ -46,7 +46,7 @@ class Channel(models.Model): 'Channel Type', default='channel') description = fields.Text('Description') uuid = fields.Char('UUID', size=50, select=True, default=lambda self: '%s' % uuid.uuid4()) - email_send = fields.Boolean('Email Sent', default=False) + email_send = fields.Boolean('Send messages by email', default=False) # multi users channel channel_last_seen_partner_ids = fields.One2many('mail.channel.partner', 'channel_id', string='Last Seen') channel_partner_ids = fields.Many2many('res.partner', 'mail_channel_partner', 'channel_id', 'partner_id', string='Listeners') 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 @@ # - + @@ -97,9 +97,9 @@ - - - + + + 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 @@

- +
-
+