diff options
| author | Thibault Delavallée <tde@openerp.com> | 2013-02-22 15:39:53 +0100 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2013-02-22 15:39:53 +0100 |
| commit | 86720d6c1e8307551a60e9e6add4b1e0d36d54f2 (patch) | |
| tree | 50732aacdae4d91ff29e9af7b10b58301ff2ad8e /addons/mail/static/src/xml/mail.xml | |
| parent | 0193a293351253192db098dbb203a33c43fe7766 (diff) | |
[IMP] Chatter: Post and Log a note dead; now choice is done before posting, 2 links before opening the compose box.
bzr revid: tde@openerp.com-20130222143953-u89kmui5314zh09g
Diffstat (limited to 'addons/mail/static/src/xml/mail.xml')
| -rw-r--r-- | addons/mail/static/src/xml/mail.xml | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index 8253b2f75e4..260b51c5406 100644 --- a/addons/mail/static/src/xml/mail.xml +++ b/addons/mail/static/src/xml/mail.xml @@ -32,17 +32,23 @@ </div> <div class="oe_msg_footer"> <div class="oe_msg_attachment_list"></div> - <button class="oe_post">Send to followers</button> - or <button class="oe_log" data-is_log="true">Log a note</button> + <button class="oe_post"> + <t t-if="!widget.is_log">Post</t> + <t t-if="widget.is_log">Log a note</t> + </button> <t t-call="mail.compose_message.add_attachment"/> </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 class="field_text oe_compact"> - <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">Write to the followers of this document...</t> - <t t-if="!widget.options.compose_placeholder and widget.options.view_mailbox">Share with my followers...</t> + <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> + <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> </div> <span t-if="!(widget.show_compact_message and !widget.show_composer) and !widget.show_composer" class="oe_placeholder_compose"></span> @@ -129,7 +135,7 @@ <a class="oe_more_hidden"><<<</a> </t> </div> - <div class="oe_recipients"> + <div class="oe_recipients" t-if="!widget.is_log"> <t t-foreach='widget.recipients' t-as='recipient'> <label title="Add as recipient and follower"> <input type="checkbox" t-att-checked="recipient.checked ? 'checked' : undefined" t-att-data="recipient.email_address"/> |