diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-01-05 15:51:49 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-01-05 15:51:49 +0100 |
| commit | 31ce19bd7c8ff90aa3a3f34ba13dfbbe00865b3b (patch) | |
| tree | 4f24c985d7f4f7d08af1830f8199b120f35018f7 /addons/mail/static/src/xml/composer.xml | |
| parent | 9b5311e0c94ea2b3ad6c36bc9a4ea63228779b66 (diff) | |
| parent | 97e87a42cdfaed04a6f50d928d86ac6e3bec9f91 (diff) | |
[MERGE] forward port of branch 9.0 up to 97e87a4
Diffstat (limited to 'addons/mail/static/src/xml/composer.xml')
| -rw-r--r-- | addons/mail/static/src/xml/composer.xml | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/addons/mail/static/src/xml/composer.xml b/addons/mail/static/src/xml/composer.xml index 4e1a9295e3b..9af882c4062 100644 --- a/addons/mail/static/src/xml/composer.xml +++ b/addons/mail/static/src/xml/composer.xml @@ -5,14 +5,22 @@ <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> + <input type="text" placeholder="Subject"></input> + <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> </t> - <div class="o_composer"> + <div t-attf-class="o_composer #{widget.extended ? 'o_extended_composer' : ''}"> <textarea class="o_composer_input" placeholder="Write something..."/> <t t-if="!widget.extended"> - <t t-call="mail.ChatComposer.Buttons"></t> + <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> </div> @@ -28,13 +36,6 @@ <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"> |