diff options
| author | Denis Ledoux <dle@odoo.com> | 2015-12-23 16:28:45 +0100 |
|---|---|---|
| committer | Denis Ledoux <dle@odoo.com> | 2015-12-23 16:28:45 +0100 |
| commit | aa5a7c2ee7280a654390d59ffbc9fc425c39d3b6 (patch) | |
| tree | bdf379aaace598a1365edacaa8319907a5a0f3d4 /addons/mail/static/src/xml/composer.xml | |
| parent | 34348ebf8d99bf455e7ad6478a2403880d665a0e (diff) | |
| parent | 24eee9d7ba9a6084d78c942428b679ec782fc94d (diff) | |
[MERGE] forward port of branch 9.0 up to 24eee9d
Diffstat (limited to 'addons/mail/static/src/xml/composer.xml')
| -rw-r--r-- | addons/mail/static/src/xml/composer.xml | 35 |
1 files changed, 23 insertions, 12 deletions
diff --git a/addons/mail/static/src/xml/composer.xml b/addons/mail/static/src/xml/composer.xml index 71afe4d1695..4e1a9295e3b 100644 --- a/addons/mail/static/src/xml/composer.xml +++ b/addons/mail/static/src/xml/composer.xml @@ -2,17 +2,21 @@ <templates xml:space="preserve"> <div t-name="mail.ChatComposer" class="o_chat_composer"> - <div class="o_composer_attachments_list"/> - <div class="o_composer"> - <textarea class="o_composer_input" placeholder="Write something..."/> - <div class="btn-group o_composer_buttons"> - <button class="btn btn-sm btn-primary o_composer_button_send" type="button"><t t-esc="widget.options.send_text"/></button> - <button class="btn btn-sm btn-icon fa fa-smile-o o_composer_button_emoji" type="button" data-toggle="popover"/> - <button class="btn btn-sm btn-icon fa fa-paperclip o_composer_button_add_attachment" type="button"/> - </div> - </div> + <div class="o_composer_attachments_list"/> + <t t-if="widget.extended"> + <div class="o_composer_subject"> + <input placeholder="Subject"></input> + <t t-call="mail.ChatComposer.Buttons"></t> + </div> + </t> + <div class="o_composer"> + <textarea class="o_composer_input" placeholder="Write something..."/> + <t t-if="!widget.extended"> + <t t-call="mail.ChatComposer.Buttons"></t> + </t> + </div> - <span class="hide"> + <span class="hide"> <t t-call="HiddenInputFile"> <t t-set="fileupload_id" t-value="widget.fileupload_id"/> <t t-set="fileupload_action" t-translation="off">/web/binary/upload_attachment</t> @@ -20,10 +24,17 @@ <input type="hidden" name="id" value="0"/> <input type="hidden" name="session_id" t-att-value="widget.session.session_id"/> </t> - </span> - <span class="o_composer_emoji"></span> + </span> + <span class="o_composer_emoji"></span> </div> + <t t-name="mail.ChatComposer.Buttons"> + <div class="btn-group o_composer_buttons"> + <button class="btn btn-sm btn-primary o_composer_button_send" type="button"><t t-esc="widget.options.send_text"/></button> + <button class="btn btn-sm btn-icon fa fa-smile-o o_composer_button_emoji" type="button" data-toggle="popover"/> + <button class="btn btn-sm btn-icon fa fa-paperclip o_composer_button_add_attachment" type="button"/> + </div> + </t> <t t-name="mail.ChatComposer.emojis"> <t t-foreach="emojis" t-as="emoji"> <span t-att-data-emoji="emoji.source" class="o_mail_emoji" t-att-title="emoji.description"> |