diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-01-27 12:23:09 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-01-27 12:23:09 +0100 |
| commit | 7e44ddcda3f21c7e6401173539dc0fe93f9a7dd2 (patch) | |
| tree | 322d7f2ce86ce328c27197c5c1b31c9f4a2b2c5c /addons/mail/static/src/xml/composer.xml | |
| parent | 3c7b08c030daf84323279b3d87361214e4f1b729 (diff) | |
| parent | 6f923cbdcdc9a78d1999999b3bbd917eb8b4e921 (diff) | |
[MERGE] forward port of branch saas-7 up to 6f923cb
Diffstat (limited to 'addons/mail/static/src/xml/composer.xml')
| -rw-r--r-- | addons/mail/static/src/xml/composer.xml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/addons/mail/static/src/xml/composer.xml b/addons/mail/static/src/xml/composer.xml index 9af882c4062..25f9ba6bfda 100644 --- a/addons/mail/static/src/xml/composer.xml +++ b/addons/mail/static/src/xml/composer.xml @@ -14,7 +14,9 @@ </div> </t> <div t-attf-class="o_composer #{widget.extended ? 'o_extended_composer' : ''}"> - <textarea class="o_composer_input" placeholder="Write something..."/> + <div class="o_composer_input"> + <textarea placeholder="Write something..."/> + </div> <t t-if="!widget.extended"> <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> @@ -33,7 +35,7 @@ <input type="hidden" name="session_id" t-att-value="widget.session.session_id"/> </t> </span> - <span class="o_composer_emoji"></span> + <span t-att-class="widget.emoji_container_classname"></span> </div> <t t-name="mail.ChatComposer.emojis"> |