diff options
| author | Aaron Bohy <aab@odoo.com> | 2015-12-29 14:31:39 +0100 |
|---|---|---|
| committer | Aaron Bohy <aab@odoo.com> | 2015-12-29 15:59:54 +0100 |
| commit | c4240b547fd78b030bc3af13c4fcc358d2372d81 (patch) | |
| tree | 201671cb421561a7ee8281b53b5805c996765c6a /addons/mail/static/src/xml/composer.xml | |
| parent | 3f370651c7035137a8fb71ce391d820e5e12bda4 (diff) | |
[FIX] mail: chatter composer: full composer button
The chatter composer extends the basic composer to, among other things, add
a button to open the full composer next to the button to add an attachment.
In a recent commit, the basic composer template has been slightly changed and
the buttons have been extracted in a sub-template, which seems to break the
template inheritance (the xpath refers to one of those buttons).
This solution simply removes the sub-template and duplicates the code.
Diffstat (limited to 'addons/mail/static/src/xml/composer.xml')
| -rw-r--r-- | addons/mail/static/src/xml/composer.xml | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/addons/mail/static/src/xml/composer.xml b/addons/mail/static/src/xml/composer.xml index 2b651878b68..9af882c4062 100644 --- a/addons/mail/static/src/xml/composer.xml +++ b/addons/mail/static/src/xml/composer.xml @@ -6,13 +6,21 @@ <t t-if="widget.extended"> <div class="o_composer_subject"> <input type="text" placeholder="Subject"></input> - <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> </div> </t> <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"> |