[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:
parent
9247cc219b
commit
4d7579b357
|
@ -231,18 +231,24 @@
|
||||||
height: 24px;
|
height: 24px;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
padding: 2px 4px;
|
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;
|
color: #AAA;
|
||||||
font-style: bold;
|
|
||||||
text-align: center;
|
|
||||||
word-spacing: 3px;
|
word-spacing: 3px;
|
||||||
cursor: text;
|
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 */
|
/* d) I.E. tweaks for Message action icons */
|
||||||
|
|
||||||
|
|
|
@ -506,6 +506,7 @@ openerp.mail = function (session) {
|
||||||
|
|
||||||
bind_events: function () {
|
bind_events: function () {
|
||||||
var self = this;
|
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_post').on('click', self.on_toggle_quick_composer);
|
||||||
this.$('.oe_compose_log').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));
|
this.$('input.oe_form_binary_file').on('change', _.bind( this.on_attachment_change, this));
|
||||||
|
|
|
@ -41,15 +41,22 @@
|
||||||
</div>
|
</div>
|
||||||
</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 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">
|
<t t-if="widget.options.view_mailbox">
|
||||||
<a class="oe_compose_post">
|
<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" 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>
|
||||||
<t t-if="!widget.options.compose_placeholder and widget.options.view_mailbox">Share with my followers</t>
|
</div>
|
||||||
</a>
|
</t>
|
||||||
<span class="oe_grey">or</span>
|
<t t-if="!widget.options.view_mailbox">
|
||||||
<a class="oe_compose_log">Log a note</a>
|
<div class="field_text oe_compact oe_compact_record">
|
||||||
</div>
|
<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>
|
</div>
|
||||||
<span t-if="!(widget.show_compact_message and !widget.show_composer) and !widget.show_composer" class="oe_placeholder_compose"></span>
|
<span t-if="!(widget.show_compact_message and !widget.show_composer) and !widget.show_composer" class="oe_placeholder_compose"></span>
|
||||||
</t>
|
</t>
|
||||||
|
|
Loading…
Reference in New Issue