summaryrefslogtreecommitdiff
path: root/addons/mail/static/src/xml
diff options
context:
space:
mode:
authorGéry Debongnie <ged@odoo.com>2015-10-30 15:43:27 +0100
committerAaron Bohy <aab@odoo.com>2015-11-03 16:19:35 +0100
commitf99231a8f4c84f79b40d3c4cc8a03d5bb536555c (patch)
tree4d70f44fe2e4e9a80f3749e5ec9f07db391c18fa /addons/mail/static/src/xml
parent0a0df28fd9529605ad3c78599abfa2468c8fc19e (diff)
[IMP] mail: various ui improvements
- display hash before text in create channel input - increase limit for message fetching from 20 to 100 - 'Show more messages' renamed ino 'Show older messages' - remove border top and bottom on selected messages
Diffstat (limited to 'addons/mail/static/src/xml')
-rw-r--r--addons/mail/static/src/xml/client_action.xml3
-rw-r--r--addons/mail/static/src/xml/thread.xml2
2 files changed, 4 insertions, 1 deletions
diff --git a/addons/mail/static/src/xml/client_action.xml b/addons/mail/static/src/xml/client_action.xml
index 7c8564c8146..db2a3483913 100644
--- a/addons/mail/static/src/xml/client_action.xml
+++ b/addons/mail/static/src/xml/client_action.xml
@@ -23,6 +23,7 @@
<t t-set="channel_title">Channels</t>
</t>
<t t-call="mail.chat.SidebarItems">
+ <t t-set="display_hash">true</t>
<t t-set="input_placeholder">Add a channel</t>
</t>
@@ -41,6 +42,7 @@
</t>
<t t-call="mail.chat.SidebarItems">
<t t-set="input_placeholder">Add a channel</t>
+ <t t-set="display_hash">true</t>
</t>
</div>
</t>
@@ -76,6 +78,7 @@
</div>
</t>
<div t-if="!disable_add_channel" class="o_mail_add_channel" t-attf-data-type="#{channel_type}">
+ <span t-if="display_hash">#</span>
<input type="text" t-attf-placeholder="#{input_placeholder}"/>
</div>
</t>
diff --git a/addons/mail/static/src/xml/thread.xml b/addons/mail/static/src/xml/thread.xml
index 3f840881d86..c2d09d1db57 100644
--- a/addons/mail/static/src/xml/thread.xml
+++ b/addons/mail/static/src/xml/thread.xml
@@ -144,7 +144,7 @@
<t t-name="mail.ChatThread.LoadMore">
<div t-if="!all_messages_loaded" class="o_thread_show_more">
- <button class="btn btn-sm btn-link">-------- Show more messages --------</button>
+ <button class="btn btn-sm btn-link">-------- Show older messages --------</button>
</div>
</t>