pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] mail: nocontent helper discuss (inbox & starred)

Browse Source 
Revision on https://github.com/odoo/odoo/commit/a87d761fdbf345ada5dc93e0a686b08a0f5a0417

From the UX/UI changes above, we also changed the style for empty
inbox and starred in Discuss.

There are two issues with the empty boxes message:

    1. The text is not centered at all (one word per line,
       and everything is stuck on the left-side of the screen)
    2. The style is inconsistent with nocontent message on search

In this commit, inbox and starred use the same style as the no_content
message from a search. The style of the nocontent from a search has been
slightly changed to mimick the intended style for inbox and starred:

    - centered text
    - title is in bold 125% font size
    - other text is not in bold, 115% font size.
This commit is contained in:
Alexandre Kühn
2018-03-08 09:30:37 +01:00
parent 4aa5ec3fa5
commit 60bbce2e53
4 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mail/static/src/less/discuss.less
+2 -6
View File
@@ -321,15 +321,11 @@
.o_mail_chat_content {
.o-flex(1, 0, 0);
margin-left: 0;
margin-left: 10px;
margin-right: 10px;
background-color: transparent;
.o_mail_no_content {
.o-position-absolute(@top: 30%);
text-align: center;
}
}
.o_mail_chat_tab_pane {
overflow-x: scroll;
.o_mail_add_channel {
addons/mail/static/src/less/thread.less
+5 -2
View File
@@ -208,11 +208,14 @@
.o_thread_title {
margin-top: 20px;
margin-bottom: 20px;
font-size: 20px;
font-weight: bold;
font-size: 125%;
}
.o_mail_no_content {
.o-webclient-padding();
.o-position-absolute(30%, 0, 0, 0);
text-align: center;
font-size: 115%;
}
.o_thread_message .o_thread_message_core .o_mail_read_more {
addons/mail/static/src/xml/thread.xml
+8 -12
View File
@@ -110,18 +110,14 @@
<!-- When a channel is empty-->
<div t-name="mail.EmptyChannel" class="o_mail_no_content">
<div class="o_view_nocontent">
<div class="o_nocontent_help">
<t t-if="options.channel_id==='channel_inbox'">
<p>Congratulations, your inbox is empty</p>
<p>New messages appear here.</p>
</t>
<t t-if="options.channel_id==='channel_starred'">
<p>No starred message</p>
<p>You can mark any message as 'starred', and it shows up in this channel.</p>
</t>
</div>
</div>
<t t-if="options.channel_id==='channel_inbox'">
<div class="o_thread_title">Congratulations, your inbox is empty</div>
<div>New messages appear here.</div>
</t>
<t t-if="options.channel_id==='channel_starred'">
<div class="o_thread_title">No starred message</div>
<div>You can mark any message as 'starred', and it shows up in this channel.</div>
</t>
</div>
<t t-name="mail.ChatThread.Content">
addons/mail/static/tests/discuss_tests.js
+2 -3
View File
@@ -44,10 +44,9 @@ QUnit.test('basic rendering', function (assert) {
assert.strictEqual($sidebar.length, 1,
"should have rendered a sidebar");
var $nocontent = discuss.$('.o_mail_chat_content');
assert.strictEqual($nocontent.length, 1,
assert.strictEqual(discuss.$('.o_mail_chat_content').length, 1,
"should have rendered the content");
assert.strictEqual($nocontent.find('.o_mail_no_content').length, 1,
assert.strictEqual(discuss.$('.o_mail_no_content').length, 1,
"should display no content message");
var $inbox = $sidebar.find('.o_mail_chat_channel_item[data-channel-id=channel_inbox]');