diff options
| author | Aaron Bohy <aab@odoo.com> | 2015-08-28 14:30:26 +0200 |
|---|---|---|
| committer | Aaron Bohy <aab@odoo.com> | 2015-09-01 21:04:33 +0200 |
| commit | 9b14aa46489d2ccf4d4870292ba4beb6619828df (patch) | |
| tree | 3eb9c0cd74d6bc19b5b0e508c1a9553bc492beb8 /addons/mail/static/src/xml | |
| parent | 09b4893e12f118b5d8eb99423a739938f9539c7f (diff) | |
[IMP] mail: mail_thread layout
Diffstat (limited to 'addons/mail/static/src/xml')
| -rw-r--r-- | addons/mail/static/src/xml/mail_chat_backend.xml | 2 | ||||
| -rw-r--r-- | addons/mail/static/src/xml/mail_thread.xml | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/addons/mail/static/src/xml/mail_chat_backend.xml b/addons/mail/static/src/xml/mail_chat_backend.xml index 55589892cff..4e7ec58643f 100644 --- a/addons/mail/static/src/xml/mail_chat_backend.xml +++ b/addons/mail/static/src/xml/mail_chat_backend.xml @@ -66,7 +66,7 @@ </div> <!-- Content --> <div class="o_mail_chat_content"> - <div class="container-fluid o_mail_chat_messages"/> + <div class="o_mail_chat_messages"/> <div class="o_mail_chat_composer_wrapper"/> </div> </div> diff --git a/addons/mail/static/src/xml/mail_thread.xml b/addons/mail/static/src/xml/mail_thread.xml index e056613cd5b..f4aad0754b1 100644 --- a/addons/mail/static/src/xml/mail_thread.xml +++ b/addons/mail/static/src/xml/mail_thread.xml @@ -89,7 +89,7 @@ <t t-name="mail.Thread.messages"> <t t-set="current_day" t-value="0"/> <t t-foreach="widget.get('messages')" t-as="message"> - <div t-if="current_day != message.date.split(' ')[0]" class="row o_mail_thread_date_separator"> + <div t-if="current_day != message.date.split(' ')[0]" class="o_mail_thread_date_separator"> <div class="o_mail_thread_date_wrapper"> <div class="o_mail_thread_date_separator_title"> <t t-raw="moment(message.date, 'YYYY-MM-DD hh:mm:ss').format('LL')"/> @@ -97,14 +97,14 @@ </div> <t t-set="current_day" t-value="message.date.split(' ')[0]"/> </div> - <div class="row o_mail_thread_message" t-att-data-message-id="message.id"> - <div class="col-md-1 col-sm-1 o_mail_thread_message_avatar"> + <div class="o_mail_thread_message" t-att-data-message-id="message.id"> + <div class="o_mail_thread_message_avatar"> <img t-if="message.message_type == 'email' && (!message.author_id || !message.author_id[0]) && message.email_from" src="/mail/static/src/img/email_icon.png" alt="avatar" class="o_mail_thread_avatar img-rounded"/> <img t-if="message.message_type == 'email' && (message.author_id && message.author_id[0]) && !message.email_from" t-att-src="'/web/image/res.partner/'+message.author_id[0]+'/image_small'" class="o_mail_thread_avatar img-rounded"/> <img t-if="message.message_type !== 'email' && (message.author_id && message.author_id[0])" t-att-src="'/web/image/res.partner/'+message.author_id[0]+'/image_small'" class="o_mail_thread_avatar img-rounded"/> <img t-if="message.message_type !== 'email' && (!message.author_id || !message.author_id[0])" src="/mail/static/src/img/smiley/avatar.jpg" class="o_mail_thread_avatar img-rounded"/> </div> - <div t-att-class="'col-md-11 col-sm-11 o_mail_thread_message_core ' + 'o_mail_thread_message_type_' + message.message_type + ' ' + (message.is_note ? 'o_mail_thread_message_subtype_note' : '')"> + <div t-att-class="'o_mail_thread_message_core ' + 'o_mail_thread_message_type_' + message.message_type + ' ' + (message.is_note ? 'o_mail_thread_message_subtype_note' : '')"> <!-- actions --> <span class="pull-right"> <i t-if="message.is_needaction && widget.options.display_needaction_button" class="fa fa-check o_mail_thread_message_needaction" t-att-data-message-id="message.id" t-att-title="_t('Mark as Done')"/> |