diff options
| author | Aaron Bohy <aab@odoo.com> | 2015-12-24 12:57:58 +0100 |
|---|---|---|
| committer | Aaron Bohy <aab@odoo.com> | 2015-12-28 10:19:22 +0100 |
| commit | 30003dbce3e93069bbd0c3e09a9b9d2e8b2ab4d4 (patch) | |
| tree | 500eb12093f7eb3b1212f3cd8efafc21a6c93e85 /addons/mail | |
| parent | e6a92e523ff12ab4ecabbf212c7dacbed036d572 (diff) | |
[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
Diffstat (limited to 'addons/mail')
| -rw-r--r-- | addons/mail/models/mail_channel.py | 2 | ||||
| -rw-r--r-- | addons/mail/static/src/js/chat_manager.js | 2 | ||||
| -rw-r--r-- | addons/mail/static/src/less/client_action.less | 16 | ||||
| -rw-r--r-- | addons/mail/static/src/less/composer.less | 1 | ||||
| -rw-r--r-- | addons/mail/static/src/xml/client_action.xml | 8 | ||||
| -rw-r--r-- | addons/mail/static/src/xml/composer.xml | 4 | ||||
| -rw-r--r-- | addons/mail/views/mail_channel_views.xml | 4 |
7 files changed, 22 insertions, 15 deletions
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 @@ </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> diff --git a/addons/mail/views/mail_channel_views.xml b/addons/mail/views/mail_channel_views.xml index 9ec6e9a7e50..04bb865cc07 100644 --- a/addons/mail/views/mail_channel_views.xml +++ b/addons/mail/views/mail_channel_views.xml @@ -109,7 +109,7 @@ <field name="name" default_focus="1" placeholder="Name" readonly="0"/> </h1> </div> - <group> + <group class="o_label_nowrap"> <field name="email_send"/> <field name="description" placeholder="Topics discussed in this group..."/> </group> @@ -127,7 +127,7 @@ </group> <notebook> <page string="Privacy"> - <group> + <group class="o_label_nowrap"> <field name="public" widget="radio" string="Who can follow the group's activities?"/> <field name="group_public_id" attrs="{'invisible': [('public','<>','groups')], 'required': [('public','=','groups')]}" |
