diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-09-24 16:59:15 +0000 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-09-24 17:45:37 +0000 |
| commit | d67b2483e5bfa5d8c1e6ef1a64fb933f5e080ad5 (patch) | |
| tree | 25a7fd39ac993f3c04c5d8408beb628b3c9948ce /addons/mail/static/src/xml | |
| parent | 38d8b0526f0fccc32df5a11f5d086a3522ed5fcf (diff) | |
| parent | 9ed4872ea03f28012118ed48a43d0800617a84f3 (diff) | |
[MERGE] forward port branch saas-12.4 up to 9ed4872ea03
closes odoo/odoo#37372
Signed-off-by: Christophe Simonis <chs@odoo.com>
Diffstat (limited to 'addons/mail/static/src/xml')
| -rw-r--r-- | addons/mail/static/src/xml/discuss.xml | 9 | ||||
| -rw-r--r-- | addons/mail/static/src/xml/systray.xml | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/addons/mail/static/src/xml/discuss.xml b/addons/mail/static/src/xml/discuss.xml index 71138ae1f24..3b21d7f230a 100644 --- a/addons/mail/static/src/xml/discuss.xml +++ b/addons/mail/static/src/xml/discuss.xml @@ -8,8 +8,15 @@ --> <t t-name="mail.discuss"> <div class="o_mail_discuss"> - <div class="o_mail_discuss_sidebar"/> + <div class="o_mail_discuss_sidebar"> + <div class="o_mail_discuss_loading"> + <i class="fa fa-spinner fa-spin"/> Please wait... + </div> + </div> <div class="o_mail_discuss_content"> + <div class="o_mail_discuss_loading"> + <i class="fa fa-spinner fa-spin"/> Please wait... + </div> </div> </div> </t> diff --git a/addons/mail/static/src/xml/systray.xml b/addons/mail/static/src/xml/systray.xml index dfa1d02b76c..dc275079e28 100644 --- a/addons/mail/static/src/xml/systray.xml +++ b/addons/mail/static/src/xml/systray.xml @@ -7,7 +7,7 @@ <t t-name="mail.systray.MessagingMenu"> <li class="o_mail_systray_item"> <a class="dropdown-toggle o-no-caret" data-toggle="dropdown" data-display="static" aria-expanded="false" title="Conversations" href="#" role="button"> - <i class="fa fa-comments" role="img" aria-label="Messages"/> <span class="o_notification_counter badge badge-pill"/> + <i class="o_mail_messaging_menu_icon fa fa-comments fa-spinner fa-spin" role="img" aria-label="Messages"/> <span class="o_notification_counter badge badge-pill"/> </a> <div class="o_mail_systray_dropdown dropdown-menu dropdown-menu-right" role="menu"> <t t-if="widget.isMobile()"> |