diff options
Diffstat (limited to 'addons/web/static/src/js')
13 files changed, 32 insertions, 36 deletions
diff --git a/addons/web/static/src/js/core/dom.js b/addons/web/static/src/js/core/dom.js index 56d889bce69..a61caf480e4 100644 --- a/addons/web/static/src/js/core/dom.js +++ b/addons/web/static/src/js/core/dom.js @@ -378,12 +378,9 @@ var dom = { var $button = $('<button/>', jQueryParams); if (options.icon) { - var isFontAwesome = options.icon.match(/(fa[brs]* )*(fa-(.+))/); - if (isFontAwesome) { - var faClass = (isFontAwesome[1] !== undefined ? isFontAwesome[1] : 'fas'); - var faIcon = isFontAwesome[2]; + if (options.icon.substr(0, 3) === 'fa-') { $button.append($('<i/>', { - class: faClass + ' fa-fw o_button_icon ' + faIcon + class: 'fa fa-fw o_button_icon ' + options.icon, })); } else { $button.append($('<img/>', { diff --git a/addons/web/static/src/js/fields/basic_fields.js b/addons/web/static/src/js/fields/basic_fields.js index 6e6f85e1214..350dc5f5674 100644 --- a/addons/web/static/src/js/fields/basic_fields.js +++ b/addons/web/static/src/js/fields/basic_fields.js @@ -539,7 +539,7 @@ var LinkButton = AbstractField.extend({ */ _render: function () { if (this.value) { - var className = this.attrs.icon || 'fa-globe-americas'; + var className = this.attrs.icon || 'fa-globe'; this.$el.html("<span role='img'/>"); this.$el.addClass("fa "+ className); @@ -1393,7 +1393,7 @@ var ListFieldText = FieldText.extend({ var HandleWidget = AbstractField.extend({ description: _lt("Handle"), noLabel: true, - className: 'o_row_handle fas fa-expand-arrows-alt ui-sortable-handle', + className: 'o_row_handle fa fa-arrows ui-sortable-handle', widthInList: '33px', tagName: 'span', supportedFieldTypes: ['integer'], @@ -2147,10 +2147,9 @@ var PriorityWidget = AbstractField.extend({ .attr('title', tip) .attr('aria-label', tip) .attr('data-index', index) - .addClass('o_priority_star') - .toggleClass('fas', isFull) - .toggleClass('far', !isFull) - .addClass('fa-star'); + .addClass('o_priority_star fa') + .toggleClass('fa-star', isFull) + .toggleClass('fa-star-o', !isFull); }, //-------------------------------------------------------------------------- @@ -2195,8 +2194,8 @@ var PriorityWidget = AbstractField.extend({ */ _onMouseOver: function (event) { clearTimeout(this.hoverTimer); - this.$('.o_priority_star').removeClass('far').addClass('fas'); - $(event.currentTarget).nextAll().removeClass('fas').addClass('far'); + this.$('.o_priority_star').removeClass('fa-star-o').addClass('fa-star'); + $(event.currentTarget).nextAll().removeClass('fa-star').addClass('fa-star-o'); }, }); @@ -2352,8 +2351,8 @@ var FavoriteWidget = AbstractField.extend({ */ _render: function () { var tip = this.value ? _t('Remove from Favorites') : _t('Add to Favorites'); - var template = this.attrs.nolabel ? '<a href="#"><i class="%s" title="%s" aria-label="%s" role="img"></i></a>' : '<a href="#"><i class="%s" role="img" aria-label="%s"></i> %s</a>'; - this.$el.empty().append(_.str.sprintf(template, this.value ? 'fas fa-star' : 'far fa-star', tip, tip)); + var template = this.attrs.nolabel ? '<a href="#"><i class="fa %s" title="%s" aria-label="%s" role="img"></i></a>' : '<a href="#"><i class="fa %s" role="img" aria-label="%s"></i> %s</a>'; + this.$el.empty().append(_.str.sprintf(template, this.value ? 'fa-star' : 'fa-star-o', tip, tip)); }, //-------------------------------------------------------------------------- diff --git a/addons/web/static/src/js/fields/relational_fields.js b/addons/web/static/src/js/fields/relational_fields.js index ed0bcc3e8c8..51a9c434589 100644 --- a/addons/web/static/src/js/fields/relational_fields.js +++ b/addons/web/static/src/js/fields/relational_fields.js @@ -241,7 +241,7 @@ var FieldMany2One = AbstractField.extend({ _addAutocompleteSource: function (method, params) { this._autocompleteSources.push({ method: method, - placeholder: (params.placeholder ? _t(params.placeholder) : _t('Loading...')) + '<i class="fa fa-spinner fa-spin fa-pull-right"></i>' , + placeholder: (params.placeholder ? _t(params.placeholder) : _t('Loading...')) + '<i class="fa fa-spinner fa-spin pull-right"></i>' , validation: params.validation, loading: false, order: params.order || 999 diff --git a/addons/web/static/src/js/views/calendar/calendar_view.js b/addons/web/static/src/js/views/calendar/calendar_view.js index c90a9b40a62..b1a6ea7be13 100644 --- a/addons/web/static/src/js/views/calendar/calendar_view.js +++ b/addons/web/static/src/js/views/calendar/calendar_view.js @@ -21,7 +21,7 @@ var fieldsToGather = [ var CalendarView = AbstractView.extend({ display_name: _lt('Calendar'), - icon: 'far fa-calendar-alt', + icon: 'fa-calendar', jsLibs: ['/web/static/lib/fullcalendar/js/fullcalendar.js'], cssLibs: ['/web/static/lib/fullcalendar/css/fullcalendar.css'], config: _.extend({}, AbstractView.prototype.config, { diff --git a/addons/web/static/src/js/views/control_panel/search/favorite_menu.js b/addons/web/static/src/js/views/control_panel/search/favorite_menu.js index be989a7728a..b2dc25d9327 100644 --- a/addons/web/static/src/js/views/control_panel/search/favorite_menu.js +++ b/addons/web/static/src/js/views/control_panel/search/favorite_menu.js @@ -23,7 +23,7 @@ var FavoriteMenu = DropdownMenu.extend({ this.isMobile = config.device.isMobile; this.dropdownCategory = 'favorite'; this.dropdownTitle = _t('Favorites'); - this.dropdownIcon = 'fas fa-star'; + this.dropdownIcon = 'fa fa-star'; this.dropdownSymbol = this.isMobile ? 'fa fa-chevron-right float-right mt4' : false; this.dropdownStyle.mainButton.class = 'o_favorites_menu_button ' + this.dropdownStyle.mainButton.class; diff --git a/addons/web/static/src/js/views/control_panel/search/search_facet.js b/addons/web/static/src/js/views/control_panel/search/search_facet.js index aa83f13eb3e..22d957c030b 100644 --- a/addons/web/static/src/js/views/control_panel/search/search_facet.js +++ b/addons/web/static/src/js/views/control_panel/search/search_facet.js @@ -105,7 +105,7 @@ var SearchFacet = Widget.extend({ } else if (this.facet.type === 'favorite') { icon = 'fa-star'; } else if (this.facet.type === 'timeRange') { - icon = 'fa-calendar-alt'; + icon = 'fa-calendar'; } return icon; }, diff --git a/addons/web/static/src/js/views/graph/graph_view.js b/addons/web/static/src/js/views/graph/graph_view.js index 5a47002cdeb..c3ad22f6ced 100644 --- a/addons/web/static/src/js/views/graph/graph_view.js +++ b/addons/web/static/src/js/views/graph/graph_view.js @@ -21,7 +21,7 @@ var GROUPABLE_TYPES = controlPanelViewParameters.GROUPABLE_TYPES; var GraphView = AbstractView.extend({ display_name: _lt('Graph'), - icon: 'fa-chart-bar', + icon: 'fa-bar-chart', jsLibs: [ '/web/static/lib/Chart/Chart.js', ], diff --git a/addons/web/static/src/js/views/list/list_editable_renderer.js b/addons/web/static/src/js/views/list/list_editable_renderer.js index 2afa4cc2082..5cdde3e12dd 100644 --- a/addons/web/static/src/js/views/list/list_editable_renderer.js +++ b/addons/web/static/src/js/views/list/list_editable_renderer.js @@ -1167,7 +1167,7 @@ ListRenderer.include({ if (this.addTrashIcon) { var $icon = this.isMany2Many ? $('<button>', {'class': 'fa fa-times', 'name': 'unlink', 'aria-label': _t('Unlink row ') + (index + 1)}) : - $('<button>', {'class': 'far fa-trash-alt', 'name': 'delete', 'aria-label': _t('Delete row ') + (index + 1)}); + $('<button>', {'class': 'fa fa-trash-o', 'name': 'delete', 'aria-label': _t('Delete row ') + (index + 1)}); var $td = $('<td>', {class: 'o_list_record_remove'}).append($icon); $row.append($td); } diff --git a/addons/web/static/src/js/views/qweb/qweb_view.js b/addons/web/static/src/js/views/qweb/qweb_view.js index 11e7b4e9aff..0c858b5eb6c 100644 --- a/addons/web/static/src/js/views/qweb/qweb_view.js +++ b/addons/web/static/src/js/views/qweb/qweb_view.js @@ -174,7 +174,7 @@ var Controller = AbstractController.extend({ */ var QWebView = AbstractView.extend({ display_name: _lt('Freedom View'), - icon: 'fa-file-image', + icon: 'fa-file-picture-o', viewType: 'qweb', // groupable? enableTimeRangeMenu: true, diff --git a/addons/web/static/src/js/widgets/data_export.js b/addons/web/static/src/js/widgets/data_export.js index 4f5f4e73618..97ec75e6b47 100644 --- a/addons/web/static/src/js/widgets/data_export.js +++ b/addons/web/static/src/js/widgets/data_export.js @@ -138,9 +138,9 @@ var DataExport = Dialog.extend({ if (!$fieldList.find(".o_export_field[data-field_id='" + fieldID + "']").length) { $fieldList.append( $('<li>', {'class': 'o_export_field', 'data-field_id': fieldID}).append( - $('<span>', {'class': "fas fa-arrows-alt o_short_field mx-1"}), + $('<span>', {'class': "fa fa-arrows o_short_field mx-1"}), label, - $('<span>', {'class': 'far fa-trash-alt m-1 pull-right o_remove_field', 'title': _t("Remove field")}) + $('<span>', {'class': 'fa fa-trash m-1 pull-right o_remove_field', 'title': _t("Remove field")}) ) ); } diff --git a/addons/web/static/src/js/widgets/date_picker.js b/addons/web/static/src/js/widgets/date_picker.js index 307c5b717d1..9b6a92ea2f4 100644 --- a/addons/web/static/src/js/widgets/date_picker.js +++ b/addons/web/static/src/js/widgets/date_picker.js @@ -34,13 +34,13 @@ var DateWidget = Widget.extend({ maxDate: moment({ y: 9999, M: 11, d: 31 }), useCurrent: false, icons: { - time: 'far fa-clock', - date: 'far fa-calendar-alt', + time: 'fa fa-clock-o', + date: 'fa fa-calendar', up: 'fa fa-chevron-up', down: 'fa fa-chevron-down', previous: 'fa fa-chevron-left', next: 'fa fa-chevron-right', - today: 'far fa-calendar-alt-check', + today: 'fa fa-calendar-check-o', clear: 'fa fa-delete', close: 'fa fa-check primary', }, diff --git a/addons/web/static/src/js/widgets/notification.js b/addons/web/static/src/js/widgets/notification.js index 6e9dcd5fc0f..aad896bcd61 100644 --- a/addons/web/static/src/js/widgets/notification.js +++ b/addons/web/static/src/js/widgets/notification.js @@ -56,7 +56,7 @@ var Notification = Widget.extend({ this.icon = 'fa-exclamation'; this.className += ' bg-danger'; } else if (this.type === 'warning') { - this.icon = 'fa-lightbulb'; + this.icon = 'fa-lightbulb-o'; this.className += ' bg-warning'; } else if (this.type === 'success') { this.icon = 'fa-check'; @@ -67,7 +67,7 @@ var Notification = Widget.extend({ } if (this.buttons && this.buttons.length) { - this.icon = 'fa-question-circle'; + this.icon = 'fa-question-circle-o'; } }, /** diff --git a/addons/web/static/src/js/widgets/switch_company_menu.js b/addons/web/static/src/js/widgets/switch_company_menu.js index 2c3f137b9bc..75bc918768b 100644 --- a/addons/web/static/src/js/widgets/switch_company_menu.js +++ b/addons/web/static/src/js/widgets/switch_company_menu.js @@ -60,15 +60,15 @@ var SwitchCompanyMenu = Widget.extend({ var dropdownMenu = dropdownItem.parent(); var companyID = dropdownItem.data('company-id'); var allowed_company_ids = this.allowed_company_ids; - if (dropdownItem.find('.fa-square').length) { + if (dropdownItem.find('.fa-square-o').length) { // 1 enabled company: Stay in single company mode if (this.allowed_company_ids.length === 1) { - dropdownMenu.find('.fa-check-square').removeClass('fas fa-check-square').addClass('far fa-square'); - dropdownItem.find('.fa-square').removeClass('far fa-square').addClass('fas fa-check-square'); + dropdownMenu.find('.fa-check-square').removeClass('fa-check-square').addClass('fa-square-o'); + dropdownItem.find('.fa-square-o').removeClass('fa-square-o').addClass('fa-check-square'); allowed_company_ids = [companyID] } else { // Multi company mode allowed_company_ids.push(companyID); - dropdownItem.find('.fa-square').removeClass('far fa-square').addClass('fas fa-check-square'); + dropdownItem.find('.fa-square-o').removeClass('fa-square-o').addClass('fa-check-square'); } } session.setCompanies(companyID, allowed_company_ids); @@ -88,12 +88,12 @@ var SwitchCompanyMenu = Widget.extend({ var companyID = dropdownItem.data('company-id'); var allowed_company_ids = this.allowed_company_ids; var current_company_id = allowed_company_ids[0]; - if (dropdownItem.find('.fa-square').length) { + if (dropdownItem.find('.fa-square-o').length) { allowed_company_ids.push(companyID); - dropdownItem.find('.fa-square').removeClass('far fa-square').addClass('fas fa-check-square'); + dropdownItem.find('.fa-square-o').removeClass('fa-square-o').addClass('fa-check-square'); } else { allowed_company_ids.splice(allowed_company_ids.indexOf(companyID), 1); - dropdownItem.find('.fa-check-square').addClass('far fa-square').removeClass('fas fa-check-square'); + dropdownItem.find('.fa-check-square').addClass('fa-square-o').removeClass('fa-check-square'); } session.setCompanies(current_company_id, allowed_company_ids); }, |