From ac584e171dec0f495e52a17fe110989cb9866559 Mon Sep 17 00:00:00 2001 From: Romeo Fragomeli Date: Fri, 21 Jan 2022 11:39:37 +0000 Subject: [PATCH] [REF] *: BS5: Migrate Badge From [1]: > Dropped all .badge-* color classes for background utilities > (e.g., use .bg-primary instead of .badge-primary). We now have to manage constrast for some badge. It's why we add 'text-dark' at some point. Note: Due to the backport of 'text-bg-#{theme}', we can use this to avoid to use 'text-dark'. Ref: [1] https://getbootstrap.com/docs/5.1/migration/#badges Task ID: 2766483 Part-of: odoo/odoo#95450 --- .../static/src/xml/res_config_invite_users.xml | 2 +- .../google_calendar/static/src/js/google_calendar.js | 2 +- .../static/src/scss/google_calendar.scss | 2 +- .../static/src/scss/timesheets_task_form.scss | 6 ------ addons/hr_timesheet/views/project_views.xml | 10 +++++----- .../mail/static/src/js/views/activity/activity_cell.js | 2 +- addons/mail/static/src/xml/web_kanban_activity.xml | 2 +- .../static/src/js/microsoft_calendar.js | 2 +- .../static/src/scss/microsoft_calendar.scss | 2 +- addons/mrp/views/mrp_production_views.xml | 2 +- addons/point_of_sale/views/point_of_sale_dashboard.xml | 2 +- addons/project/static/src/css/project.css | 8 -------- addons/web/static/src/legacy/js/fields/basic_fields.js | 2 +- .../web/static/src/legacy/js/fields/upgrade_fields.js | 2 +- .../fields/label_selection/label_selection_field.xml | 2 +- addons/website/data/website_demo.xml | 8 ++++---- addons/website/views/snippets/s_badge.xml | 2 +- addons/website_blog/views/website_blog_posts_loop.xml | 2 +- addons/website_blog/views/website_blog_templates.xml | 2 +- .../views/website_customer_templates.xml | 2 +- .../static/src/scss/event_templates_common.scss | 6 ------ addons/website_event/views/event_templates_list.xml | 4 ++-- addons/website_forum/static/src/js/website_forum.js | 8 ++++---- addons/website_forum/views/ir_qweb.xml | 6 +++--- .../static/tests/tours/website_sale_wishlist.js | 2 +- .../static/src/js/slides_slide_toggle_is_preview.js | 8 ++++---- .../website_slides/static/src/js/tours/slides_tour.js | 2 +- addons/website_slides/static/src/xml/slide_quiz.xml | 6 +++--- 28 files changed, 43 insertions(+), 63 deletions(-) diff --git a/addons/base_setup/static/src/xml/res_config_invite_users.xml b/addons/base_setup/static/src/xml/res_config_invite_users.xml index cfb67afdbfa..1e00ab09577 100644 --- a/addons/base_setup/static/src/xml/res_config_invite_users.xml +++ b/addons/base_setup/static/src/xml/res_config_invite_users.xml @@ -10,7 +10,7 @@

Pending Invitations:

- +
diff --git a/addons/google_calendar/static/src/js/google_calendar.js b/addons/google_calendar/static/src/js/google_calendar.js index bba15cb074f..ccd47ba3a29 100644 --- a/addons/google_calendar/static/src/js/google_calendar.js +++ b/addons/google_calendar/static/src/js/google_calendar.js @@ -217,7 +217,7 @@ const GoogleCalendarRenderer = CalendarRenderer.include({ _initGooglePillButton: function() { // hide the pending button this.$calendarSyncContainer.find('#google_sync_pending').hide(); - const switchBadgeClass = elem => elem.toggleClass(['badge-primary', 'badge-danger']); + const switchBadgeClass = elem => elem.toggleClass(['bg-primary', 'bg-danger']); this.$('#google_sync_configured').hover(() => { switchBadgeClass(this.$calendarSyncContainer.find('#google_sync_configured')); this.$calendarSyncContainer.find('#google_check').hide(); diff --git a/addons/google_calendar/static/src/scss/google_calendar.scss b/addons/google_calendar/static/src/scss/google_calendar.scss index f844263657d..0fae7059926 100644 --- a/addons/google_calendar/static/src/scss/google_calendar.scss +++ b/addons/google_calendar/static/src/scss/google_calendar.scss @@ -1,5 +1,5 @@ .o_calendar_sidebar { - .badge-primary { + .bg-primary { background-color: $o-enterprise-primary-color; } .o_google_sync_button { diff --git a/addons/hr_timesheet/static/src/scss/timesheets_task_form.scss b/addons/hr_timesheet/static/src/scss/timesheets_task_form.scss index 1d21b3f60ef..b08d3b80783 100644 --- a/addons/hr_timesheet/static/src/scss/timesheets_task_form.scss +++ b/addons/hr_timesheet/static/src/scss/timesheets_task_form.scss @@ -4,11 +4,5 @@ } .o_project_kanban .oe_kanban_align.badge { - background: inherit; color: inherit; - border: 1px solid var(--success); -} - -.o_project_kanban .oe_kanban_align.badge-danger { - border-color: var(--danger); } diff --git a/addons/hr_timesheet/views/project_views.xml b/addons/hr_timesheet/views/project_views.xml index 35e1d2fd485..b397511c83f 100644 --- a/addons/hr_timesheet/views/project_views.xml +++ b/addons/hr_timesheet/views/project_views.xml @@ -301,12 +301,12 @@ - - + +
+ t-attf-class="oe_kanban_align badge {{ badgeColor }}" t-att-title="title">
@@ -328,8 +328,8 @@
- - + +
diff --git a/addons/mail/static/src/js/views/activity/activity_cell.js b/addons/mail/static/src/js/views/activity/activity_cell.js index fe5b4e204f8..c790d924aa6 100644 --- a/addons/mail/static/src/js/views/activity/activity_cell.js +++ b/addons/mail/static/src/js/views/activity/activity_cell.js @@ -39,7 +39,7 @@ const ActivityCell = KanbanActivity.extend({ this.$('a').html($date); if (this.record.data.activity_ids.res_ids.length > 1) { this.$('a').append($('', { - class: 'badge badge-light badge-pill border-0 ' + this.record.data.activity_state, + class: 'badge bg-light rounded-pill border-0 ' + this.record.data.activity_state, text: this.record.data.activity_ids.res_ids.length, })); } diff --git a/addons/mail/static/src/xml/web_kanban_activity.xml b/addons/mail/static/src/xml/web_kanban_activity.xml index 1a71cff1ad3..a1a8929756b 100644 --- a/addons/mail/static/src/xml/web_kanban_activity.xml +++ b/addons/mail/static/src/xml/web_kanban_activity.xml @@ -36,7 +36,7 @@
  • - +
    • diff --git a/addons/microsoft_calendar/static/src/js/microsoft_calendar.js b/addons/microsoft_calendar/static/src/js/microsoft_calendar.js index 4a1c8c22687..1b74b341eb2 100644 --- a/addons/microsoft_calendar/static/src/js/microsoft_calendar.js +++ b/addons/microsoft_calendar/static/src/js/microsoft_calendar.js @@ -216,7 +216,7 @@ const MicrosoftCalendarRenderer = CalendarRenderer.include({ _initMicrosoftPillButton: function() { // hide the pending button this.$calendarSyncContainer.find('#microsoft_sync_pending').hide(); - const switchBadgeClass = elem => elem.toggleClass(['badge-primary', 'badge-danger']); + const switchBadgeClass = elem => elem.toggleClass(['bg-primary', 'bg-danger']); this.$('#microsoft_sync_configured').hover(() => { switchBadgeClass(this.$calendarSyncContainer.find('#microsoft_sync_configured')); this.$calendarSyncContainer.find('#microsoft_check').hide(); diff --git a/addons/microsoft_calendar/static/src/scss/microsoft_calendar.scss b/addons/microsoft_calendar/static/src/scss/microsoft_calendar.scss index 2687faf3394..de4057e3d5b 100644 --- a/addons/microsoft_calendar/static/src/scss/microsoft_calendar.scss +++ b/addons/microsoft_calendar/static/src/scss/microsoft_calendar.scss @@ -1,5 +1,5 @@ .o_calendar_sidebar { - .badge-primary { + .bg-primary { background-color: $o-enterprise-primary-color; } .o_microsoft_sync_button { diff --git a/addons/mrp/views/mrp_production_views.xml b/addons/mrp/views/mrp_production_views.xml index a710e914cee..53dab5bc41a 100644 --- a/addons/mrp/views/mrp_production_views.xml +++ b/addons/mrp/views/mrp_production_views.xml @@ -440,7 +440,7 @@
    - +
    diff --git a/addons/point_of_sale/views/point_of_sale_dashboard.xml b/addons/point_of_sale/views/point_of_sale_dashboard.xml index 21f33c677b6..e328e43a802 100644 --- a/addons/point_of_sale/views/point_of_sale_dashboard.xml +++ b/addons/point_of_sale/views/point_of_sale_dashboard.xml @@ -79,7 +79,7 @@
    Closing Control
     -
    To Close
    diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index 5bcdb719187..42f5be82671 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -23,14 +23,6 @@ border: 1px solid var(--success); } -.o_kanban_project_tasks .oe_kanban_align.badge-warning { - border-color: var(--warning); -} - -.o_kanban_project_tasks .oe_kanban_align.badge-danger { - border-color: var(--danger); -} - .o_kanban_project_tasks .o_field_one2many_sub_task { margin-top:2px; margin-right: 6px; diff --git a/addons/web/static/src/legacy/js/fields/basic_fields.js b/addons/web/static/src/legacy/js/fields/basic_fields.js index bfafef604a9..870fb9be9cb 100644 --- a/addons/web/static/src/legacy/js/fields/basic_fields.js +++ b/addons/web/static/src/legacy/js/fields/basic_fields.js @@ -2987,7 +2987,7 @@ var LabelSelection = AbstractField.extend({ _render: function () { this.classes = this.nodeOptions && this.nodeOptions.classes || {}; var labelClass = this.classes[this.value] || 'primary'; - this.$el.addClass('badge badge-' + labelClass).text(this._formatValue(this.value)); + this.$el.addClass('badge text-bg-' + labelClass).text(this._formatValue(this.value)); }, }); diff --git a/addons/web/static/src/legacy/js/fields/upgrade_fields.js b/addons/web/static/src/legacy/js/fields/upgrade_fields.js index 36af39567ac..141aa616c92 100644 --- a/addons/web/static/src/legacy/js/fields/upgrade_fields.js +++ b/addons/web/static/src/legacy/js/fields/upgrade_fields.js @@ -94,7 +94,7 @@ var AbstractFieldUpgrade = { this._super.apply(this, arguments); this._insertEnterpriseLabel($("", { text: "Enterprise", - 'class': "badge badge-primary oe_inline o_enterprise_label" + 'class': "badge bg-primary oe_inline o_enterprise_label" })); }, /** diff --git a/addons/web/static/src/views/fields/label_selection/label_selection_field.xml b/addons/web/static/src/views/fields/label_selection/label_selection_field.xml index ef15996bb13..803e496292b 100644 --- a/addons/web/static/src/views/fields/label_selection/label_selection_field.xml +++ b/addons/web/static/src/views/fields/label_selection/label_selection_field.xml @@ -2,7 +2,7 @@ - + diff --git a/addons/website/data/website_demo.xml b/addons/website/data/website_demo.xml index 0582b78725e..231ee267c2d 100644 --- a/addons/website/data/website_demo.xml +++ b/addons/website/data/website_demo.xml @@ -19,20 +19,20 @@

    Badge

    - +

    Pill

    - +

    Link

    - +

    Autosizing

    - +
    diff --git a/addons/website/views/snippets/s_badge.xml b/addons/website/views/snippets/s_badge.xml index e4ae7580989..4eba4ddc000 100644 --- a/addons/website/views/snippets/s_badge.xml +++ b/addons/website/views/snippets/s_badge.xml @@ -13,7 +13,7 @@ + data-color-prefix="bg-"/>
    diff --git a/addons/website_blog/views/website_blog_posts_loop.xml b/addons/website_blog/views/website_blog_posts_loop.xml index 149694186d4..4f738c4a25d 100644 --- a/addons/website_blog/views/website_blog_posts_loop.xml +++ b/addons/website_blog/views/website_blog_posts_loop.xml @@ -211,7 +211,7 @@ according to the enabled options.
    diff --git a/addons/website_blog/views/website_blog_templates.xml b/addons/website_blog/views/website_blog_templates.xml index 0d233ee2b81..acd96834538 100644 --- a/addons/website_blog/views/website_blog_templates.xml +++ b/addons/website_blog/views/website_blog_templates.xml @@ -274,7 +274,7 @@ list of filtered posts (by date or tag).
    diff --git a/addons/website_customer/views/website_customer_templates.xml b/addons/website_customer/views/website_customer_templates.xml index 5017b537c64..02868bdbd8e 100644 --- a/addons/website_customer/views/website_customer_templates.xml +++ b/addons/website_customer/views/website_customer_templates.xml @@ -135,7 +135,7 @@
  • All
  • -
    • diff --git a/addons/website_event/static/src/scss/event_templates_common.scss b/addons/website_event/static/src/scss/event_templates_common.scss index d5569607780..ffc7dec40cf 100644 --- a/addons/website_event/static/src/scss/event_templates_common.scss +++ b/addons/website_event/static/src/scss/event_templates_common.scss @@ -75,12 +75,6 @@ max-height: 250px; overflow-y: auto; } - .dropdown-item { - &.active .badge { // Invert badge display when the item is active - background-color: color-contrast(theme-color('primary')); - color: theme-color('primary'); - } - } } /* diff --git a/addons/website_event/views/event_templates_list.xml b/addons/website_event/views/event_templates_list.xml index 273c8dc517f..cceaded513b 100644 --- a/addons/website_event/views/event_templates_list.xml +++ b/addons/website_event/views/event_templates_list.xml @@ -102,7 +102,7 @@ - +     @@ -209,7 +209,7 @@
    + t-attf-class="badge mr4 #{'bg-primary' if tag in search_tags else ''} #{'o_tag_color_%s' % tag.color if tag.color else ''}"> diff --git a/addons/website_forum/static/src/js/website_forum.js b/addons/website_forum/static/src/js/website_forum.js index 33c1da54df5..9586e214e38 100644 --- a/addons/website_forum/static/src/js/website_forum.js +++ b/addons/website_forum/static/src/js/website_forum.js @@ -82,7 +82,7 @@ publicWidget.registry.websiteForum = publicWidget.Widget.extend({ }, formatResult: function (term) { if (term.isNew) { - return 'New ' + _.escape(term.text); + return 'New ' + _.escape(term.text); } else { return _.escape(term.text); } @@ -331,8 +331,8 @@ publicWidget.registry.websiteForum = publicWidget.Widget.extend({ elem.innerText = _t(' Flagged'); elem.prepend(child); if (countFlaggedPosts) { - countFlaggedPosts.classList.remove('badge-light'); - countFlaggedPosts.classList.add('badge-danger'); + countFlaggedPosts.classList.remove('bg-light'); + countFlaggedPosts.classList.add('bg-danger'); countFlaggedPosts.innerText = parseInt(countFlaggedPosts.innerText, 10) + 1; } $(elem).next('#flag_validator').removeClass('d-none'); @@ -530,7 +530,7 @@ publicWidget.registry.websiteForum = publicWidget.Widget.extend({ flaggedButton.innerText = _t(' Flag'); flaggedButton.prepend(child); if (count === 0) { - countFlaggedPosts.classList.add("badge-light"); + countFlaggedPosts.classList.add("bg-light"); } countFlaggedPosts.innerText = count; }, diff --git a/addons/website_forum/views/ir_qweb.xml b/addons/website_forum/views/ir_qweb.xml index 56241969352..c0e8f9c4704 100644 --- a/addons/website_forum/views/ir_qweb.xml +++ b/addons/website_forum/views/ir_qweb.xml @@ -14,11 +14,11 @@
    | - + - + - +
    diff --git a/addons/website_sale_wishlist/static/tests/tours/website_sale_wishlist.js b/addons/website_sale_wishlist/static/tests/tours/website_sale_wishlist.js index 7fbe818f830..967131b3155 100644 --- a/addons/website_sale_wishlist/static/tests/tours/website_sale_wishlist.js +++ b/addons/website_sale_wishlist/static/tests/tours/website_sale_wishlist.js @@ -356,7 +356,7 @@ tour.register('shop_wishlist', { }, { content: "Added into the wishlist", - trigger: '.my_wish_quantity.badge-primary:contains(1)', + trigger: '.my_wish_quantity.text-bg-primary:contains(1)', run: function () {}, }, { diff --git a/addons/website_slides/static/src/js/slides_slide_toggle_is_preview.js b/addons/website_slides/static/src/js/slides_slide_toggle_is_preview.js index bcb5181ed7c..ad44013a92d 100644 --- a/addons/website_slides/static/src/js/slides_slide_toggle_is_preview.js +++ b/addons/website_slides/static/src/js/slides_slide_toggle_is_preview.js @@ -17,11 +17,11 @@ }, }).then(function (isPreview) { if (isPreview) { - $slideTarget.removeClass('badge-light badge-hide border'); - $slideTarget.addClass('badge-success'); + $slideTarget.removeClass('bg-light bg-hide border'); + $slideTarget.addClass('bg-success'); } else { - $slideTarget.removeClass('badge-success'); - $slideTarget.addClass('badge-light badge-hide border'); + $slideTarget.removeClass('bg-success'); + $slideTarget.addClass('bg-light bg-hide border'); } }); }, diff --git a/addons/website_slides/static/src/js/tours/slides_tour.js b/addons/website_slides/static/src/js/tours/slides_tour.js index 341f265b14c..dc964696fe7 100644 --- a/addons/website_slides/static/src/js/tours/slides_tour.js +++ b/addons/website_slides/static/src/js/tours/slides_tour.js @@ -64,7 +64,7 @@ tour.register('slides_tour', { position: 'bottom', width: 285, }, { - trigger: 'span.badge-info:contains("New")', + trigger: 'span.bg-info:contains("New")', content: Markup(_t("Congratulations! Your first lesson is available. Let's see the options available here. The tag \"New\" indicates that this lesson was created less than 7 days ago.")), position: 'bottom', }, { diff --git a/addons/website_slides/static/src/xml/slide_quiz.xml b/addons/website_slides/static/src/xml/slide_quiz.xml index d53ca24fd91..e2a9a8c3aa4 100644 --- a/addons/website_slides/static/src/xml/slide_quiz.xml +++ b/addons/website_slides/static/src/xml/slide_quiz.xml @@ -66,7 +66,7 @@     - + + XP @@ -83,7 +83,7 @@ - + + XP @@ -101,7 +101,7 @@ class="btn btn-primary text-uppercase font-weight-bold o_wslides_js_lesson_quiz_submit">Check your answers Done ! - + + XP