From ccc56e28a39c48926437d191caa12a4254d1c266 Mon Sep 17 00:00:00 2001 From: Mohammed Shekha Date: Wed, 7 Oct 2020 12:01:05 +0000 Subject: [PATCH] [IMP] *: replace fa-spinner with fa-circle-o-notch Slightly improve the overall UI of Odoo with a more modern feel by updating the current 'loading' icons that look quite old school. Use fa-circle-o-notch instead of old style fa-spinner task-2346142 closes odoo/odoo#59454 Related: odoo/enterprise#13908 Signed-off-by: Aaron Bohy (aab) --- addons/im_livechat/static/src/legacy/public_livechat.xml | 4 ++-- addons/mail/static/src/components/attachment/attachment.xml | 2 +- .../src/components/chatter_container/chatter_container.xml | 2 +- .../static/src/components/chatter_topbar/chatter_topbar.xml | 2 +- addons/mail/static/src/components/discuss/discuss.xml | 2 +- .../static/src/components/message_list/message_list.xml | 2 +- .../static/src/components/messaging_menu/messaging_menu.xml | 4 ++-- .../mail/static/src/components/thread_view/thread_view.xml | 2 +- addons/mail/static/src/xml/web_kanban_activity.xml | 2 +- .../static/src/xml/ChromeWidgets/ProxyStatus.xml | 2 +- .../static/src/xml/ChromeWidgets/SyncNotification.xml | 2 +- .../PaymentScreen/PaymentScreenElectronicPayment.xml | 4 ++-- .../point_of_sale/static/tests/unit/test_PaymentScreen.js | 6 +++--- addons/portal/views/portal_templates.xml | 2 +- addons/web/static/src/js/fields/relational_fields.js | 2 +- addons/web/static/src/js/public/public_root.js | 2 +- addons/web/static/src/xml/base.xml | 4 ++-- addons/web_editor/static/src/js/editor/snippets.editor.js | 2 +- addons/website/static/src/js/backend/dashboard.js | 2 +- addons/website/static/src/js/menu/new_content.js | 2 +- .../website_event_meet/views/event_meet_templates_page.xml | 2 +- .../views/event_track_templates_page.xml | 2 +- addons/website_jitsi/static/src/xml/chat_room_modal.xml | 2 +- .../static/src/js/website_sale_delivery.js | 3 ++- .../website_slides/static/src/xml/website_slides_upload.xml | 2 +- 25 files changed, 32 insertions(+), 31 deletions(-) diff --git a/addons/im_livechat/static/src/legacy/public_livechat.xml b/addons/im_livechat/static/src/legacy/public_livechat.xml index 821edc30cfb..b5cf12a6ff8 100644 --- a/addons/im_livechat/static/src/legacy/public_livechat.xml +++ b/addons/im_livechat/static/src/legacy/public_livechat.xml @@ -113,7 +113,7 @@
- + Please wait...
@@ -636,7 +636,7 @@
- Loading older messages... + Loading older messages... diff --git a/addons/mail/static/src/components/attachment/attachment.xml b/addons/mail/static/src/components/attachment/attachment.xml index 93b8e1620f7..af543ce44a5 100644 --- a/addons/mail/static/src/components/attachment/attachment.xml +++ b/addons/mail/static/src/components/attachment/attachment.xml @@ -79,7 +79,7 @@
- +
diff --git a/addons/mail/static/src/components/chatter_container/chatter_container.xml b/addons/mail/static/src/components/chatter_container/chatter_container.xml index c1d8d22067c..94e0d210017 100644 --- a/addons/mail/static/src/components/chatter_container/chatter_container.xml +++ b/addons/mail/static/src/components/chatter_container/chatter_container.xml @@ -7,7 +7,7 @@
-
Please wait...
+
Please wait...
diff --git a/addons/mail/static/src/components/chatter_topbar/chatter_topbar.xml b/addons/mail/static/src/components/chatter_topbar/chatter_topbar.xml index 5d4029e6158..fb1c03aae17 100644 --- a/addons/mail/static/src/components/chatter_topbar/chatter_topbar.xml +++ b/addons/mail/static/src/components/chatter_topbar/chatter_topbar.xml @@ -43,7 +43,7 @@ - + diff --git a/addons/mail/static/src/components/discuss/discuss.xml b/addons/mail/static/src/components/discuss/discuss.xml index 1fadb224ce1..997683aa58c 100644 --- a/addons/mail/static/src/components/discuss/discuss.xml +++ b/addons/mail/static/src/components/discuss/discuss.xml @@ -9,7 +9,7 @@ }" > -
Please wait...
+
Please wait...
diff --git a/addons/mail/static/src/components/message_list/message_list.xml b/addons/mail/static/src/components/message_list/message_list.xml index b7675a938ba..67bef1fdb6d 100644 --- a/addons/mail/static/src/components/message_list/message_list.xml +++ b/addons/mail/static/src/components/message_list/message_list.xml @@ -95,7 +95,7 @@
- + Loading...
diff --git a/addons/mail/static/src/components/messaging_menu/messaging_menu.xml b/addons/mail/static/src/components/messaging_menu/messaging_menu.xml index fc779231dd8..72392081ba0 100644 --- a/addons/mail/static/src/components/messaging_menu/messaging_menu.xml +++ b/addons/mail/static/src/components/messaging_menu/messaging_menu.xml @@ -6,7 +6,7 @@ - + @@ -17,7 +17,7 @@
- +
diff --git a/addons/point_of_sale/static/tests/unit/test_PaymentScreen.js b/addons/point_of_sale/static/tests/unit/test_PaymentScreen.js index f8f07ab7601..5dcc828b5fb 100644 --- a/addons/point_of_sale/static/tests/unit/test_PaymentScreen.js +++ b/addons/point_of_sale/static/tests/unit/test_PaymentScreen.js @@ -279,15 +279,15 @@ odoo.define('point_of_sale.tests.PaymentScreen', function (require) { parent.line.setPaymentStatus('waiting'); await testUtils.nextTick(); - assert.ok(parent.el.querySelector('.paymentline i.fa-spinner')); + assert.ok(parent.el.querySelector('.paymentline i.fa-circle-o-notch')); parent.line.setPaymentStatus('waitingCancel'); await testUtils.nextTick(); - assert.ok(parent.el.querySelector('.paymentline i.fa-spinner')); + assert.ok(parent.el.querySelector('.paymentline i.fa-circle-o-notch')); parent.line.setPaymentStatus('reversing'); await testUtils.nextTick(); - assert.ok(parent.el.querySelector('.paymentline i.fa-spinner')); + assert.ok(parent.el.querySelector('.paymentline i.fa-circle-o-notch')); parent.line.setPaymentStatus('done'); await testUtils.nextTick(); diff --git a/addons/portal/views/portal_templates.xml b/addons/portal/views/portal_templates.xml index 1ca10a05b65..cfc20516330 100644 --- a/addons/portal/views/portal_templates.xml +++ b/addons/portal/views/portal_templates.xml @@ -178,7 +178,7 @@ - +
diff --git a/addons/web/static/src/js/fields/relational_fields.js b/addons/web/static/src/js/fields/relational_fields.js index d52bb7f48eb..505e49f9897 100644 --- a/addons/web/static/src/js/fields/relational_fields.js +++ b/addons/web/static/src/js/fields/relational_fields.js @@ -231,7 +231,7 @@ var FieldMany2One = AbstractField.extend({ _addAutocompleteSource: function (method, params) { this._autocompleteSources.push({ method: method, - placeholder: (params.placeholder ? _t(params.placeholder) : _t('Loading...')) + '' , + placeholder: (params.placeholder ? _t(params.placeholder) : _t('Loading...')) + '' , validation: params.validation, loading: false, order: params.order || 999 diff --git a/addons/web/static/src/js/public/public_root.js b/addons/web/static/src/js/public/public_root.js index b5d7ad06985..1bbb98bd22b 100644 --- a/addons/web/static/src/js/public/public_root.js +++ b/addons/web/static/src/js/public/public_root.js @@ -305,7 +305,7 @@ var PublicRoot = publicWidget.RootWidget.extend({ var $buttons = $(ev.currentTarget).find('button[type="submit"], a.a-submit'); _.each($buttons, function (btn) { var $btn = $(btn); - $btn.html(' ' + $btn.text()); + $btn.prepend(' '); $btn.prop('disabled', true); }); }, diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 47850e1b058..f7a5bb592cd 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1659,7 +1659,7 @@
-
+
@@ -1847,7 +1847,7 @@
- +
diff --git a/addons/web_editor/static/src/js/editor/snippets.editor.js b/addons/web_editor/static/src/js/editor/snippets.editor.js index 44b10c38fc9..0b06fad2c0c 100644 --- a/addons/web_editor/static/src/js/editor/snippets.editor.js +++ b/addons/web_editor/static/src/js/editor/snippets.editor.js @@ -2638,7 +2638,7 @@ var SnippetsMenu = Widget.extend({ }, }, { text: _t("Install in progress"), - icon: 'fa-spin fa-spinner fa-pulse mr8', + icon: 'fa-spin fa-circle-o-notch fa-spin mr8', classes: 'btn-primary disabled o_hidden', }, { text: _t("Cancel"), diff --git a/addons/website/static/src/js/backend/dashboard.js b/addons/website/static/src/js/backend/dashboard.js index 3752c46aa78..2eb3c13cf90 100644 --- a/addons/website/static/src/js/backend/dashboard.js +++ b/addons/website/static/src/js/backend/dashboard.js @@ -685,7 +685,7 @@ var Dashboard = AbstractAction.extend({ // Utility functions addLoader: function(selector) { - var loader = ''; + var loader = ''; selector.html("
" + loader + "
"); }, getValue: function(d) { return d[1]; }, diff --git a/addons/website/static/src/js/menu/new_content.js b/addons/website/static/src/js/menu/new_content.js index c5d6814c2d5..67268f7245d 100644 --- a/addons/website/static/src/js/menu/new_content.js +++ b/addons/website/static/src/js/menu/new_content.js @@ -307,7 +307,7 @@ var NewContentMenu = websiteNavbarData.WebsiteNavbarActionWidget.extend({ } // change style to use spinner $i.removeClass() - .addClass('fa fa-spin fa-spinner fa-pulse') + .addClass('fa fa-spin fa-circle-o-notch fa-spin') .css('background-image', 'none'); $p.removeClass('o_uninstalled_module') .text(_.str.sprintf(self.newContentText.installPleaseWait, name)); diff --git a/addons/website_event_meet/views/event_meet_templates_page.xml b/addons/website_event_meet/views/event_meet_templates_page.xml index 38c5b14cbd7..43dd2be16c2 100644 --- a/addons/website_event_meet/views/event_meet_templates_page.xml +++ b/addons/website_event_meet/views/event_meet_templates_page.xml @@ -60,7 +60,7 @@
- + Loading your room...
diff --git a/addons/website_event_track_live/views/event_track_templates_page.xml b/addons/website_event_track_live/views/event_track_templates_page.xml index 3ea643f783a..81eb1a2f171 100644 --- a/addons/website_event_track_live/views/event_track_templates_page.xml +++ b/addons/website_event_track_live/views/event_track_templates_page.xml @@ -24,7 +24,7 @@ t-att-data-track-website-image-url="track.website_image_url" t-att-data-youtube-video-id="track.youtube_video_id">
- + Loading Video...
diff --git a/addons/website_jitsi/static/src/xml/chat_room_modal.xml b/addons/website_jitsi/static/src/xml/chat_room_modal.xml index d076a31739f..7ab8727c4dd 100644 --- a/addons/website_jitsi/static/src/xml/chat_room_modal.xml +++ b/addons/website_jitsi/static/src/xml/chat_room_modal.xml @@ -6,7 +6,7 @@