odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] Chatter: mailboxes do not have "Share a message or Log a note", but the good ol' textarea like chatter. 

bzr revid: tde@openerp.com-20130226100155-x38ub426vdpxr7b5
This commit is contained in:
Thibault Delavallée 2013-02-26 11:01:55 +01:00
parent 9247cc219b
commit 4d7579b357
3 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
addons/mail/static/src/css/mail.css
View File

@ -231,18 +231,24 @@
height: 24px;
width: 100%;
padding: 2px 4px;
/*border: 1px solid #CCC;*/
/*-moz-border-radius: 3px;*/
/*-webkit-border-radius: 3px;*/
/*border-radius: 3px;*/
/*background: white;*/
font-size: 13px;
color: #AAA;
font-style: bold;
text-align: center;
word-spacing: 3px;
cursor: text;
}
.openerp .oe_mail .oe_msg.oe_msg_composer_compact .oe_compact_record{
font-size: 13px;
font-style: bold;
text-align: center;
}
.openerp .oe_mail .oe_msg.oe_msg_composer_compact .oe_compact_inbox {
border: 1px solid #CCC;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
background: white;
font-size: 14px;
font-style: italic;
}
/* d) I.E. tweaks for Message action icons */

1
addons/mail/static/src/js/mail.js
View File

@ -506,6 +506,7 @@ openerp.mail = function (session) {
bind_events: function () {
var self = this;
this.$('.oe_compact_inbox').on('click', self.on_toggle_quick_composer);
this.$('.oe_compose_post').on('click', self.on_toggle_quick_composer);
this.$('.oe_compose_log').on('click', self.on_toggle_quick_composer);
this.$('input.oe_form_binary_file').on('change', _.bind( this.on_attachment_change, this));

23
addons/mail/static/src/xml/mail.xml
View File

@ -41,15 +41,22 @@
</div>
</div>
<div t-if="widget.show_compact_message and !widget.show_composer and !widget.options.readonly" t-attf-class="oe_msg oe_msg_composer_compact #{widget.thread_level and widget.options.display_indented_thread > -1 ? 'oe_msg_indented' : ''}">
<div class="field_text oe_compact">
<a class="oe_compose_post">
<t t-if="widget.options.view_mailbox">
<div class="field_text oe_compact oe_compact_inbox">
<t t-if="widget.options.compose_placeholder" t-raw="widget.options.compose_placeholder"/>
<t t-if="!widget.options.compose_placeholder and !widget.options.view_mailbox">Share a message</t>
<t t-if="!widget.options.compose_placeholder and widget.options.view_mailbox">Share with my followers</t>
</a>
<span class="oe_grey">or</span>
<a class="oe_compose_log">Log a note</a>
</div>
<t t-if="!widget.options.compose_placeholder and widget.options.view_mailbox">Share with my followers...</t>
</div>
</t>
<t t-if="!widget.options.view_mailbox">
<div class="field_text oe_compact oe_compact_record">
<a class="oe_compose_post">
<t t-if="widget.options.compose_placeholder" t-raw="widget.options.compose_placeholder"/>
<t t-if="!widget.options.compose_placeholder and !widget.options.view_mailbox">Share a message</t>
</a>
<span class="oe_grey">or</span>
<a class="oe_compose_log">Log a note</a>
</div>
</t>
</div>
<span t-if="!(widget.show_compact_message and !widget.show_composer) and !widget.show_composer" class="oe_placeholder_compose"></span>
</t>