summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorGéry Debongnie <ged@odoo.com>2015-11-05 16:22:18 +0100
committerGéry Debongnie <ged@odoo.com>2015-11-06 09:43:49 +0100
commitd17f656de4ca109b718902de7f4222e809ebf57e (patch)
tree0b8aff44075d673ed6eed41873a4d9722c9a846c /addons
parent8e56b0114b7ff15ec1694f23ff87bd28f3d7d53b (diff)
[IMP] mail: various ui improvements
- less tweaks - improve default channel name - clean origin channel names in Inbox and Starred - reduce fadeout duration in threads
Diffstat (limited to 'addons')
-rw-r--r--addons/mail/data/mail_channel_demo.xml6
-rw-r--r--addons/mail/static/src/js/thread.js3
-rw-r--r--addons/mail/static/src/less/client_action.less23
-rw-r--r--addons/mail/static/src/less/thread.less4
-rw-r--r--addons/mail/static/src/xml/thread.xml2
5 files changed, 18 insertions, 20 deletions
diff --git a/addons/mail/data/mail_channel_demo.xml b/addons/mail/data/mail_channel_demo.xml
index f5f7907f037..4999d5f6342 100644
--- a/addons/mail/data/mail_channel_demo.xml
+++ b/addons/mail/data/mail_channel_demo.xml
@@ -4,15 +4,15 @@
<!-- Discussion groups, done in 2 steps to remove creator from followers -->
<record model="mail.channel" id="channel_1">
- <field name="name">Best Sales Practices</field>
+ <field name="name">sales</field>
<field name="description">Discussion about best sales practices and deals.</field>
</record>
<record model="mail.channel" id="channel_2">
- <field name="name">Board meetings</field>
+ <field name="name">board-meetings</field>
<field name="description">Board meetings, budgets, strategic plans</field>
</record>
<record model="mail.channel" id="channel_3">
- <field name="name">R&amp;D</field>
+ <field name="name">rd</field>
<field name="description">Research and development discussion group</field>
</record>
diff --git a/addons/mail/static/src/js/thread.js b/addons/mail/static/src/js/thread.js
index 76d10ed3cdd..6667a635d65 100644
--- a/addons/mail/static/src/js/thread.js
+++ b/addons/mail/static/src/js/thread.js
@@ -132,7 +132,8 @@ var Thread = Widget.extend({
remove_message_and_render: function (message_id, messages, options) {
var self = this;
this.$('.o_thread_message[data-message-id=' + message_id + ']').fadeOut({
- done: function () { self.render(messages, options); }
+ done: function () { self.render(messages, options); },
+ duration: 200,
});
},
diff --git a/addons/mail/static/src/less/client_action.less b/addons/mail/static/src/less/client_action.less
index 2204a2eb49c..dbb6b89c1d5 100644
--- a/addons/mail/static/src/less/client_action.less
+++ b/addons/mail/static/src/less/client_action.less
@@ -15,9 +15,10 @@
.o-flex-flow(row, nowrap);
.o_mail_chat_sidebar {
- .o-flex(0, 0, 200px);
+ .o-flex(0, 0, 220px);
overflow: auto;
padding: 8px 0;
+ font-weight: 300;
@media (max-width: @screen-xs-max) {
flex: none;
@@ -25,32 +26,30 @@
}
.o_mail_sidebar_title {
- .o-webclient-padding(@top: 5px, @bottom: 5px);
.o-flex-display();
+ padding: 5px 8px 5px @odoo-horizontal-padding;
align-items: center;
justify-content: space-between;
h4 {
text-transform: uppercase;
}
.o_add {
- padding: 8px;
+ padding: 6px;
}
}
.o_mail_chat_channel_item {
width: 100%;
- .o-webclient-padding(@top: 5px, @bottom: 5px);
- padding-left: 1.5*@odoo-horizontal-padding; // larger padding than titles
+ padding: 5px 8px 5px 1.5*@odoo-horizontal-padding; // larger padding-left than titles
> .badge {
margin: 0;
}
.o_mail_partner_unpin {
- padding: 2px 8px;
+ padding: 2px 6px;
}
}
.o_mail_add_channel {
width: 100%;
- .o-webclient-padding(@top: 5px, @bottom: 5px);
- padding-left: 1.5*@odoo-horizontal-padding; // larger padding than titles
+ padding: 5px 8px 5px 1.5*@odoo-horizontal-padding; // larger padding-left than titles
position: relative;
> input {
@@ -109,8 +108,8 @@
@sidebar-icon-opacity: 0.6;
.o_mail_chat {
.o_mail_chat_sidebar {
- background-color: @gray;
- color: @gray-lighter;
+ background-color: darken(@gray, 8%);
+ color: lighten(@gray, 50%);
.o_mail_chat_channel_item {
overflow: hidden;
@@ -118,13 +117,13 @@
cursor: pointer;
&:hover {
- background-color: darken(@gray, 8%);;
+ background-color: darken(@gray, 12%);;
.o_mail_partner_unpin {
opacity: @sidebar-icon-opacity;
}
}
&.o_active {
- background-color: @gray-dark;
+ background-color: darken(@gray, 15%);
}
.o_mail_partner_unpin {
opacity: 0;
diff --git a/addons/mail/static/src/less/thread.less b/addons/mail/static/src/less/thread.less
index a02e730d595..7f27ab228cc 100644
--- a/addons/mail/static/src/less/thread.less
+++ b/addons/mail/static/src/less/thread.less
@@ -73,14 +73,12 @@
.o_mail_mailto, .o_mail_mailto:hover {
.text-muted();
}
- .o_channel_redirect {
- color: gray;
- }
}
.o_thread_message_star, .o_thread_message_needaction {
cursor: pointer;
opacity: 0;
+ padding: 4px;
&.fa-star {
opacity: @mail-thread-icon-opacity;
color: gold;
diff --git a/addons/mail/static/src/xml/thread.xml b/addons/mail/static/src/xml/thread.xml
index 006a4306876..d10318c5a17 100644
--- a/addons/mail/static/src/xml/thread.xml
+++ b/addons/mail/static/src/xml/thread.xml
@@ -84,7 +84,7 @@
on <a class="o_mail_redirect" href="#" t-att-data-oe-model="message.model" t-att-data-oe-id="message.res_id"><t t-esc="message.record_name"/></a>
</t>
<t t-if="message.origin_id &amp;&amp; (message.origin_id !== options.channel_id)">
- (in channel <a class="o_channel_redirect" t-att-data-oe-id="message.origin_id" href="#"><t t-esc="message.origin_name"/>)</a>
+ (from <a class="o_channel_redirect" t-att-data-oe-id="message.origin_id" href="#"><t t-esc="message.origin_name"/>)</a>
</t>
</p>
<t t-if="message.tracking_value_ids &amp;&amp; message.tracking_value_ids.length &gt; 0">