pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[REF] web, mail: apply odoo icons

Browse Source 
This commit is part of v16 overall restyle (task-2704984).

enterprise: https://github.com/odoo/enterprise/pull/23848
task-2745275

Part-of: odoo/odoo#83501
This commit is contained in:
stefanorigano (SRI)
2022-02-08 12:05:55 +00:00
parent 546477dafa
commit 4e53953756
37 changed files with 94 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mail/static/src/components/messaging_menu/messaging_menu.scss
-4
View File
@@ -74,10 +74,6 @@
margin-right: map-get($spacers, 1);
}
.o_MessagingMenu_icon {
font-size: larger;
}
.o_MessagingMenu_loading {
font-size: small;
position: absolute;
addons/mail/static/src/components/messaging_menu/messaging_menu.xml
+1 -1
View File
@@ -4,7 +4,7 @@
<t t-name="mail.MessagingMenu" owl="1">
<div class="o_MessagingMenu dropdown" t-att-class="{ 'show': messagingMenu ? messagingMenu.isOpen : false, 'o-mobile': messaging ? messaging.device.isMobile : false }" t-attf-class="{{ className }}" t-ref="root">
<a class="o_MessagingMenu_toggler dropdown-toggle o-no-caret o-dropdown--narrow" t-att-class="{ 'o-no-notification': messagingMenu ? !messagingMenu.counter : false }" href="#" title="Conversations" role="button" t-att-aria-expanded="messagingMenu and messagingMenu.isOpen ? 'true' : 'false'" aria-haspopup="true" t-on-click="_onClickToggler">
<i class="o_MessagingMenu_icon fa fa-comments" role="img" aria-label="Messages"/>
<i class="o_MessagingMenu_icon oi oi-large oi-discuss" role="img" aria-label="Messages"/>
<t t-if="!messagingMenu or !messaging.isInitialized">
<i class="o_MessagingMenu_loading fa fa-circle-o-notch fa-spin"/>
</t>
addons/mail/static/src/components/messaging_menu/tests/messaging_menu_tests.js
+1 -1
View File
@@ -153,7 +153,7 @@ QUnit.test('basic rendering', async function (assert) {
"should have icon on clickable element in messaging menu"
);
assert.ok(
document.querySelector(`.o_MessagingMenu_icon`).classList.contains('fa-comments'),
document.querySelector(`.o_MessagingMenu_icon`).classList.contains('oi-discuss'),
"should have 'comments' icon on clickable element in messaging menu"
);
assert.strictEqual(
addons/mail/static/src/js/views/activity/activity_view.js
+1 -1
View File
@@ -14,7 +14,7 @@ const _lt = core._lt;
const ActivityView = BasicView.extend({
accesskey: "a",
display_name: _lt('Activity'),
icon: 'fa-clock-o',
icon: 'oi-event--schedule',
config: _.extend({}, BasicView.prototype.config, {
Controller: ActivityController,
Model: ActivityModel,
addons/mail/static/src/scss/systray.scss
-5
View File
@@ -1,10 +1,5 @@
// Systray icon and dropdown
.o_mail_systray_item {
> a {
> i {
font-size: larger;
}
}
&.o_no_notification > a {
@include o-mail-systray-no-notification-style();
addons/mail/static/src/xml/systray.xml
+1 -1
View File
@@ -51,7 +51,7 @@
<t t-name="mail.systray.ActivityMenu">
<div class="o_mail_systray_item dropdown">
<a class="dropdown-toggle o-no-caret o-dropdown--narrow" data-toggle="dropdown" data-display="static" aria-expanded="false" title="Activities" href="#" role="button">
<i class="fa fa-clock-o" role="img" aria-label="Activities"/> <span class="o_notification_counter badge badge-pill"/>
<i class="oi oi-large oi-calendar" role="img" aria-label="Activities"/> <span class="o_notification_counter badge badge-pill"/>
</a>
<div class="o_mail_systray_dropdown dropdown-menu dropdown-menu-right" role="menu">
<div class="o_mail_systray_dropdown_items"/>
addons/web/static/src/core/debug/debug_menu.xml
+1 -1
View File
@@ -7,7 +7,7 @@
position="'bottom-end'"
togglerClass="`o-dropdown--narrow ${env.inDialog?'btn btn-link':''}`">
<t t-set-slot="toggler">
<i class="fa fa-bug"/>
<i class="oi oi-large oi-debug"/>
</t>
<t t-foreach="elements" t-as="element" t-key="element_index">
<DropdownItem
addons/web/static/src/legacy/js/control_panel/search_utils.js
+4 -4
View File
@@ -179,10 +179,10 @@ odoo.define('web.searchUtils', function (require) {
};
// Search bar
const FACET_ICONS = {
filter: 'fa fa-filter',
groupBy: 'fa fa-bars',
favorite: 'fa fa-star',
comparison: 'fa fa-adjust',
filter: 'oi oi-small oi-filter',
groupBy: 'oi oi-small oi-layers',
favorite: 'oi oi-small oi-star',
comparison: 'oi oi-small oi-contrast',
};
//-------------------------------------------------------------------------
addons/web/static/src/legacy/js/views/calendar/calendar_view.js
+1 -1
View File
@@ -30,7 +30,7 @@ const scalesInfo = {
var CalendarView = AbstractView.extend({
display_name: _lt('Calendar'),
icon: 'fa-calendar',
icon: 'oi-calendar',
jsLibs: [
'/web/static/lib/fullcalendar/core/main.js',
'/web/static/lib/fullcalendar/interaction/main.js',
addons/web/static/src/legacy/js/views/kanban/kanban_view.js
+1 -1
View File
@@ -14,7 +14,7 @@ var _lt = core._lt;
var KanbanView = BasicView.extend({
accesskey: "k",
display_name: _lt("Kanban"),
icon: 'fa-th-large',
icon: 'oi-align--vertical-top',
mobile_friendly: true,
config: _.extend({}, BasicView.prototype.config, {
Model: KanbanModel,
addons/web/static/src/legacy/js/views/list/list_renderer.js
+1 -1
View File
@@ -1129,7 +1129,7 @@ var ListRenderer = BasicRenderer.extend({
if (this._shouldRenderOptionalColumnsDropdown()) {
this.el.classList.add('o_list_optional_columns');
this.$('table').append(
$('<i class="o_optional_columns_dropdown_toggle fa fa-ellipsis-v"/>')
$('<i class="o_optional_columns_dropdown_toggle oi oi-settings--adjust"/>')
);
this.$el.append(this._renderOptionalColumnsDropdown());
}
addons/web/static/src/legacy/js/views/list/list_view.js
+1 -1
View File
@@ -20,7 +20,7 @@ var _lt = core._lt;
var ListView = BasicView.extend({
accesskey: "l",
display_name: _lt('List'),
icon: 'fa-list-ul',
icon: 'oi-table',
config: _.extend({}, BasicView.prototype.config, {
Model: ListModel,
Renderer: ListRenderer,
addons/web/static/src/legacy/xml/base.xml
+10 -10
View File
@@ -32,7 +32,7 @@
t-ref="searchView"
>
<div t-if="props.withSearchBar" class="o_searchview" role="search" aria-autocomplete="list" >
<i class="o_searchview_icon fa fa-search"
<i class="o_searchview_icon oi oi-search"
title="Search..."
role="img"
aria-label="Search..."
@@ -354,7 +354,7 @@
<span class="o_facet_value" t-esc="facetValue"/>
</t>
</div>
<i class="fa fa-sm fa-remove o_facet_remove"
<i class="o_facet_remove oi oi-close ms-1"
role="img"
aria-label="Remove"
title="Remove"
@@ -425,7 +425,7 @@
<t t-set="buttonLabel">View %s</t>
<button type="button"
t-att-accesskey="view.accessKey"
t-attf-class="btn btn-light fa fa-lg o_switch_view o_{{ view.type }} {{ view.icon }}"
t-attf-class="btn btn-light oi o_switch_view o_{{ view.type }} {{ view.icon }}"
t-att-class="{ active: env.view.type === view.type }"
t-att-aria-label="sprintf(buttonLabel.toString(), view.type)"
t-att-data-tooltip="view.name"
@@ -594,7 +594,7 @@
</button>
</t>
<t t-if="widget.is_action_enabled('export_xlsx') and widget.isExportEnable">
<button type="button" class="btn btn-secondary fa fa-download o_list_export_xlsx" title="Export All" aria-label="Export All"/>
<button type="button" class="btn btn-secondary oi oi-document--download o_list_export_xlsx" title="Export All" aria-label="Export All"/>
</t>
</div>
</t>
@@ -747,16 +747,16 @@
<t t-name="GraphView.buttons">
<div class="btn-group mb-2 mb-sm-auto" role="toolbar" aria-label="Main actions"/>
<div class="btn-group o_graph_align mb-2 mb-sm-auto" role="toolbar" aria-label="Change graph">
<button class="btn btn-secondary fa fa-bar-chart-o o_graph_button" title="Bar Chart" aria-label="Bar Chart" data-mode="bar"/>
<button class="btn btn-secondary fa fa-area-chart o_graph_button" title="Line Chart" aria-label="Line Chart" data-mode="line"/>
<button class="btn btn-secondary fa fa-pie-chart o_graph_button" title="Pie Chart" aria-label="Pie Chart" data-mode="pie"/>
<button class="btn btn-secondary o_graph_button oi oi-chart--column" title="Bar Chart" aria-label="Bar Chart" data-mode="bar"/>
<button class="btn btn-secondary o_graph_button oi oi-chart--area--filled" title="Line Chart" aria-label="Line Chart" data-mode="line"/>
<button class="btn btn-secondary o_graph_button oi oi-chart--pie" title="Pie Chart" aria-label="Pie Chart" data-mode="pie"/>
</div>
<div class="btn-group o_stack_align mb-2 mb-sm-auto" role="toolbar" aria-label="Change graph">
<button class="btn btn-secondary fa fa-database o_graph_button" title="Stacked" aria-label="Stacked" data-mode="stack"/>
<button class="btn btn-secondary o_graph_button oi oi-chart--stacked" title="Stacked" aria-label="Stacked" data-mode="stack"/>
</div>
<div class="btn-group o_sort_align mb-2 mb-sm-auto" role="toolbar" aria-label="Sort graph">
<button class="btn btn-secondary fa fa-sort-amount-desc o_graph_button" title="Descending" aria-label="Descending" data-order="desc"/>
<button class="btn btn-secondary fa fa-sort-amount-asc o_graph_button" title="Ascending" aria-label="Ascending" data-order="asc"/>
<button class="btn btn-secondary o_graph_button oi oi-sort--descending" title="Descending" aria-label="Descending" data-order="desc"/>
<button class="btn btn-secondary o_graph_button oi oi-sort--ascending" title="Ascending" aria-label="Ascending" data-order="asc"/>
</div>
</t>
addons/web/static/src/search/comparison_menu/comparison_menu.xml
+1 -1
View File
@@ -4,7 +4,7 @@
<t t-name="web.ComparisonMenu" owl="1">
<Dropdown class="o_comparison_menu btn-group" togglerClass="'btn btn-light'">
<t t-set-slot="toggler">
<i class="small mr-1" t-att-class="icon"/>
<i class="mr-1" t-att-class="icon"/>
<span class="o_dropdown_title">Comparison</span>
</t>
<t t-foreach="items" t-as="item" t-key="item.id">
addons/web/static/src/search/control_panel/control_panel.xml
+1 -1
View File
@@ -38,7 +38,7 @@
<t t-if="env.config.viewSwitcherEntries.length">
<nav class="btn-group o_cp_switch_buttons">
<t t-foreach="env.config.viewSwitcherEntries" t-as="view" t-key="view.type">
<button class="btn btn-light fa fa-lg o_switch_view "
<button class="btn btn-light oi o_switch_view "
t-attf-class="o_{{view.type}} {{view.icon}} {{view.active ? 'active' : ''}}"
t-att-data-tooltip="view.name"
t-on-click="onViewClicked(view.type)"
addons/web/static/src/search/favorite_menu/favorite_menu.xml
+1 -1
View File
@@ -4,7 +4,7 @@
<t t-name="web.FavoriteMenu" owl="1">
<Dropdown class="o_favorite_menu btn-group" togglerClass="'btn btn-light'">
<t t-set-slot="toggler">
<i class="small mr-1" t-att-class="icon"/>
<i class="oi-small mr-1" t-att-class="icon"/>
<span class="o_dropdown_title">Favorites</span>
</t>
<t t-set="currentGroup" t-value="null"/>
addons/web/static/src/search/filter_menu/filter_menu.xml
+1 -1
View File
@@ -4,7 +4,7 @@
<t t-name="web.FilterMenu" owl="1">
<Dropdown class="o_filter_menu btn-group" togglerClass="'btn btn-light'">
<t t-set-slot="toggler">
<i class="small mr-1" t-att-class="icon"/>
<i class="oi-small mr-1" t-att-class="icon"/>
<span class="o_dropdown_title">Filters</span>
</t>
<t t-set="currentGroup" t-value="null"/>
addons/web/static/src/search/group_by_menu/group_by_menu.xml
+1 -1
View File
@@ -7,7 +7,7 @@
t-props="dropdownProps"
>
<t t-set-slot="toggler">
<i class="small mr-1" t-att-class="icon"/>
<i class="oi-small mr-1" t-att-class="icon"/>
<span class="o_dropdown_title">Group By<t t-if="props.showCaretDown"> <i class="fa fa-caret-down ml-1"/></t></span>
</t>
<t t-set="currentGroup" t-value="null"/>
addons/web/static/src/search/search_bar/search_bar.xml
+2 -2
View File
@@ -23,7 +23,7 @@
<span class="o_facet_value" t-esc="facetValue"/>
</t>
</div>
<i class="fa fa-sm fa-remove o_facet_remove"
<i class="o_facet_remove oi oi-close"
role="img"
aria-label="Remove"
title="Remove"
@@ -79,7 +79,7 @@
<t t-name="web.SearchBar" owl="1">
<div class="o_cp_searchview" role="search">
<div class="o_searchview" role="search" aria-autocomplete="list">
<i class="o_searchview_icon fa fa-search"
<i class="o_searchview_icon oi oi-search"
role="img"
aria-label="Search..."
title="Search..."
addons/web/static/src/search/utils/misc.js
+4 -4
View File
@@ -1,10 +1,10 @@
/** @odoo-module **/
export const FACET_ICONS = {
filter: "fa fa-filter",
groupBy: "fa fa-bars",
favorite: "fa fa-star",
comparison: "fa fa-adjust",
filter: "oi oi-filter",
groupBy: "oi oi-layers",
favorite: "oi oi-star",
comparison: "oi oi-contrast",
};
export const GROUPABLE_TYPES = [
addons/web/static/src/views/graph/graph_view.js
+1 -1
View File
@@ -153,7 +153,7 @@ GraphView.props = {
GraphView.type = "graph";
GraphView.display_name = _lt("Graph");
GraphView.icon = "fa-bar-chart";
GraphView.icon = "oi oi-chart--line-smooth";
GraphView.multiRecord = true;
GraphView.Model = GraphModel;
addons/web/static/src/views/graph/graph_view.xml
+6 -6
View File
@@ -14,31 +14,31 @@
</div>
</t>
<div class="btn-group" role="toolbar" aria-label="Change graph">
<button class="btn btn-secondary fa fa-bar-chart-o o_graph_button" data-tooltip="Bar Chart" aria-label="Bar Chart" data-mode="bar"
<button class="btn btn-secondary oi oi-chart--column o_graph_button" data-tooltip="Bar Chart" aria-label="Bar Chart" data-mode="bar"
t-on-click="onModeSelected('bar')"
t-att-class="{ active: model.metaData.mode === 'bar' }"
/>
<button class="btn btn-secondary fa fa-area-chart o_graph_button" data-tooltip="Line Chart" aria-label="Line Chart" data-mode="line"
<button class="btn btn-secondary oi oi-chart--area--filled o_graph_button" data-tooltip="Line Chart" aria-label="Line Chart" data-mode="line"
t-on-click="onModeSelected('line')"
t-att-class="{ active: model.metaData.mode === 'line' }"
/>
<button class="btn btn-secondary fa fa-pie-chart o_graph_button" data-tooltip="Pie Chart" aria-label="Pie Chart" data-mode="pie"
<button class="btn btn-secondary oi oi-chart--pie o_graph_button" data-tooltip="Pie Chart" aria-label="Pie Chart" data-mode="pie"
t-on-click="onModeSelected('pie')"
t-att-class="{ active: model.metaData.mode === 'pie' }"
/>
</div>
<div t-if="model.metaData.mode === 'bar'" class="btn-group" role="toolbar" aria-label="Change graph">
<button class="btn btn-secondary fa fa-database o_graph_button" data-tooltip="Stacked" aria-label="Stacked"
<button class="btn btn-secondary oi oi-chart--stacked o_graph_button" data-tooltip="Stacked" aria-label="Stacked"
t-on-click="toggleStacked"
t-att-class="{ active: model.metaData.stacked }"
/>
</div>
<div t-if="model.metaData.mode !== 'pie' and model.metaData.domains.length === 1" class="btn-group" role="toolbar" aria-label="Sort graph">
<button class="btn btn-secondary fa fa-sort-amount-desc o_graph_button" data-tooltip="Descending" aria-label="Descending"
<button class="btn btn-secondary oi oi-sort--descending o_graph_button" data-tooltip="Descending" aria-label="Descending"
t-on-click="toggleOrder('DESC')"
t-att-class="{ active: model.metaData.order === 'DESC' }"
/>
<button class="btn btn-secondary fa fa-sort-amount-asc o_graph_button" data-tooltip="Ascending" aria-label="Ascending"
<button class="btn btn-secondary oi oi-sort--ascending o_graph_button" data-tooltip="Ascending" aria-label="Ascending"
t-on-click="toggleOrder('ASC')"
t-att-class="{ active: model.metaData.order === 'ASC' }"
/>
addons/web/static/src/views/pivot/pivot_view.js
+1 -1
View File
@@ -173,7 +173,7 @@ PivotView.ArchParser = PivotArchParser;
PivotView.type = "pivot";
PivotView.display_name = _lt("Pivot");
PivotView.icon = "fa-table";
PivotView.icon = "oi-cross-tab";
PivotView.multiRecord = true;
PivotView.searchMenuTypes = ["filter", "groupBy", "comparison", "favorite"];
addons/web/static/src/webclient/navbar/navbar.xml
+2 -2
View File
@@ -44,7 +44,7 @@
<t t-name="web.NavBar.AppsMenu" owl="1">
<Dropdown hotkey="'h'" title="'Home Menu'" class="o_navbar_apps_menu">
<t t-set-slot="toggler">
<i class="fa fa-th-large" />
<i class="oi oi-apps" />
</t>
<DropdownItem
t-foreach="apps"
@@ -143,7 +143,7 @@
<t t-name="web.NavBar.SectionsMenu.MoreDropdown" owl="1">
<Dropdown class="o_menu_sections_more" title="'More Menu'" hotkey="hotkey">
<t t-set-slot="toggler">
<i class="fa fa-plus" />
<i class="oi oi-large oi-add--thick"/>
</t>
<t t-foreach="sections" t-as="section" t-key="section.id">
addons/web/static/tests/core/debug/debug_manager_tests.js
+2 -2
View File
@@ -178,7 +178,7 @@ QUnit.module("DebugMenu", (hooks) => {
actionDialog.destroy();
});
assert.containsOnce(target, ".o_dialog");
assert.containsNone(target, ".o_dialog .o_debug_manager .fa-bug");
assert.containsNone(target, ".o_dialog .o_debug_manager .oi-debug");
});
QUnit.test(
@@ -235,7 +235,7 @@ QUnit.module("DebugMenu", (hooks) => {
actionDialog.destroy();
});
assert.containsOnce(target, ".o_dialog");
assert.containsOnce(target, ".o_dialog .o_debug_manager .fa-bug");
assert.containsOnce(target, ".o_dialog .o_debug_manager .oi-debug");
await click(target, ".o_dialog .o_debug_manager button");
const debugManagerEl = target.querySelector(".o_debug_manager");
assert.containsN(debugManagerEl, ".dropdown-menu .dropdown-item", 2);
addons/web/static/tests/legacy/control_panel/comparison_menu_tests.js
+1 -1
View File
@@ -54,7 +54,7 @@ odoo.define('web.comparison_menu_tests', function (require) {
await cpHelpers.toggleMenuItem(controlPanel, "Birthday");
await cpHelpers.toggleMenuItemOption(controlPanel, "Birthday", "January");
assert.containsOnce(controlPanel, 'div.o_comparison_menu > button i.fa.fa-adjust');
assert.containsOnce(controlPanel, 'div.o_comparison_menu > button i.oi.oi-contrast');
assert.strictEqual(controlPanel.el.querySelector('div.o_comparison_menu > button span').innerText.trim(), "Comparison");
await cpHelpers.toggleComparisonMenu(controlPanel);
addons/web/static/tests/legacy/control_panel/favorite_menu_tests.js
+1 -1
View File
@@ -39,7 +39,7 @@ odoo.define('web.favorite_menu_tests', function (require) {
};
const controlPanel = await createControlPanel(params);
assert.containsOnce(controlPanel, 'div.o_favorite_menu > button i.fa.fa-star');
assert.containsOnce(controlPanel, 'div.o_favorite_menu > button i.oi.oi-star');
assert.strictEqual(controlPanel.el.querySelector('div.o_favorite_menu > button span').innerText.trim(), "Favorites");
await cpHelpers.toggleFavoriteMenu(controlPanel);
addons/web/static/tests/legacy/control_panel/filter_menu_tests.js
+1 -1
View File
@@ -109,7 +109,7 @@ odoo.define('web.filter_menu_tests', function (require) {
assert.deepEqual(cpHelpers.getFacetTexts(controlPanel), ['Foo']);
assert.containsOnce(controlPanel.el.querySelector('.o_searchview .o_searchview_facet'),
'span.fa.fa-filter.o_searchview_facet_label');
'span.oi.oi-filter.o_searchview_facet_label');
assert.ok(cpHelpers.isItemSelected(controlPanel, "Foo"));
addons/web/static/tests/legacy/control_panel/groupby_menu_tests.js
+1 -1
View File
@@ -114,7 +114,7 @@ odoo.define('web.groupby_menu_tests', function (require) {
await cpHelpers.toggleMenuItem(controlPanel, 0);
assert.deepEqual(cpHelpers.getFacetTexts(controlPanel), ['Groupby Foo']);
assert.containsOnce(controlPanel.el.querySelector('.o_searchview .o_searchview_facet'),
'span.fa.fa-bars.o_searchview_facet_label');
'span.oi.oi-layers.o_searchview_facet_label');
assert.ok(cpHelpers.isItemSelected(controlPanel, 0));
await cpHelpers.toggleMenuItem(controlPanel, 0);
addons/web/static/tests/legacy/views/graph_tests.js
+2 -2
View File
@@ -1754,7 +1754,7 @@ QUnit.module('Views', {
this.selectTimeRanges = async (comparisonOptionId, basicDomainId) => {
const facetEls = graph.el.querySelectorAll('.o_searchview_facet');
const facetIndex = [...facetEls].findIndex(el => !!el.querySelector('span.fa-filter'));
const facetIndex = [...facetEls].findIndex(el => !!el.querySelector('span.oi-filter'));
if (facetIndex > -1) {
await cpHelpers.removeFacet(graph.el, facetIndex);
}
@@ -1776,7 +1776,7 @@ QUnit.module('Views', {
const productWasSelected = cpHelpers.isItemSelected(graph.el, 'Product');
const facetEls = graph.el.querySelectorAll('.o_searchview_facet');
const facetIndex = [...facetEls].findIndex(el => !!el.querySelector('span.fa-bars'));
const facetIndex = [...facetEls].findIndex(el => !!el.querySelector('span.oi-layers'));
if (facetIndex > -1) {
await cpHelpers.removeFacet(graph.el, facetIndex);
await cpHelpers.toggleGroupByMenu(graph.el);
addons/web/static/tests/search/comparison_menu_tests.js
+1 -1
View File
@@ -59,7 +59,7 @@ QUnit.module("Search", (hooks) => {
await toggleFilterMenu(controlPanel);
await toggleMenuItem(controlPanel, "Birthday");
await toggleMenuItemOption(controlPanel, "Birthday", "January");
assert.containsOnce(controlPanel, "div.o_comparison_menu > button i.fa.fa-adjust");
assert.containsOnce(controlPanel, "div.o_comparison_menu > button i.oi.oi-contrast");
assert.strictEqual(
controlPanel.el
.querySelector("div.o_comparison_menu > button span")
addons/web/static/tests/search/control_panel.js
+3 -3
View File
@@ -82,8 +82,8 @@ QUnit.module("Search", (hooks) => {
Component: ControlPanel,
config: {
viewSwitcherEntries: [
{ type: "list", active: true, icon: "fa-list-ul", name: "List" },
{ type: "kanban", icon: "fa-th-large", name: "Kanban" },
{ type: "list", active: true, icon: "oi-table", name: "List" },
{ type: "kanban", icon: "oi-align--vertical-top", name: "Kanban" },
],
},
searchMenuTypes: [],
@@ -96,7 +96,7 @@ QUnit.module("Search", (hooks) => {
assert.strictEqual(views[0].getAttribute("data-tooltip"), "List");
assert.hasClass(views[0], "active");
assert.strictEqual(views[1].getAttribute("data-tooltip"), "Kanban");
assert.hasClass(views[1], "fa-th-large");
assert.hasClass(views[1], "oi-align--vertical-top");
controlPanel.env.services.action.switchView = (viewType) => {
assert.step(viewType);
addons/web/static/tests/search/favorite_menu_tests.js
+2 -2
View File
@@ -73,7 +73,7 @@ QUnit.module("Search", (hooks) => {
},
});
assert.containsOnce(controlPanel, "div.o_favorite_menu > button i.fa.fa-star");
assert.containsOnce(controlPanel, "div.o_favorite_menu > button i.oi.oi-star");
assert.strictEqual(
controlPanel.el
.querySelector("div.o_favorite_menu > button span")
@@ -106,7 +106,7 @@ QUnit.module("Search", (hooks) => {
},
});
assert.containsOnce(controlPanel, "div.o_favorite_menu > button i.fa.fa-star");
assert.containsOnce(controlPanel, "div.o_favorite_menu > button i.oi.oi-star");
assert.strictEqual(
controlPanel.el
.querySelector("div.o_favorite_menu > button span")
addons/web/static/tests/search/filter_menu_tests.js
+1 -1
View File
@@ -118,7 +118,7 @@ QUnit.module("Search", (hooks) => {
assert.deepEqual(getFacetTexts(controlPanel), ["Foo"]);
assert.containsOnce(
controlPanel.el.querySelector(".o_searchview .o_searchview_facet"),
"span.fa.fa-filter.o_searchview_facet_label"
"span.oi.oi-filter.o_searchview_facet_label"
);
assert.ok(isItemSelected(controlPanel, "Foo"));
assert.deepEqual(getDomain(controlPanel), [["foo", "=", "qsdf"]]);
addons/web/static/tests/search/group_by_menu_tests.js
+1 -1
View File
@@ -136,7 +136,7 @@ QUnit.module("Search", (hooks) => {
assert.deepEqual(getFacetTexts(controlPanel), ["Foo"]);
assert.containsOnce(
controlPanel.el.querySelector(".o_searchview .o_searchview_facet"),
"span.fa.fa-bars.o_searchview_facet_label"
"span.oi.oi-layers.o_searchview_facet_label"
);
assert.ok(isItemSelected(controlPanel, "Foo"));
addons/web/static/tests/views/graph_view_tests.js
+28 -28
View File
@@ -3011,37 +3011,37 @@ QUnit.module("Views", (hooks) => {
`,
});
assert.containsOnce(graph, "button.fa-sort-amount-asc");
assert.containsOnce(graph, "button.fa-sort-amount-desc");
assert.containsOnce(graph, "button.oi-sort--ascending");
assert.containsOnce(graph, "button.oi-sort--descending");
checkLegend(assert, graph, "Count", "measure should be by count");
assert.hasClass(
graph.el.querySelector("button.fa-sort-amount-desc"),
graph.el.querySelector("button.oi-sort--descending"),
"active",
'sorting should be applie on descending order by default when sorting="desc"'
);
checkDatasets(assert, graph, "data", { data: [4, 3, 1] });
await click(graph.el, "button.fa-sort-amount-asc");
await click(graph.el, "button.oi-sort--ascending");
assert.hasClass(
graph.el.querySelector("button.fa-sort-amount-asc"),
graph.el.querySelector("button.oi-sort--ascending"),
"active",
"ascending order should be applied"
);
checkDatasets(assert, graph, "data", { data: [1, 3, 4] });
await click(graph.el, "button.fa-sort-amount-desc");
await click(graph.el, "button.oi-sort--descending");
assert.hasClass(
graph.el.querySelector("button.fa-sort-amount-desc"),
graph.el.querySelector("button.oi-sort--descending"),
"active",
"descending order button should be active"
);
checkDatasets(assert, graph, "data", { data: [4, 3, 1] });
// again click on descending button to deactivate order button
await click(graph.el, "button.fa-sort-amount-desc");
await click(graph.el, "button.oi-sort--descending");
assert.doesNotHaveClass(
graph.el.querySelector("button.fa-sort-amount-desc"),
graph.el.querySelector("button.oi-sort--descending"),
"active",
"descending order button should not be active"
);
@@ -3049,28 +3049,28 @@ QUnit.module("Views", (hooks) => {
// set line mode
await selectMode(graph, "line");
assert.containsOnce(graph, "button.fa-sort-amount-asc");
assert.containsOnce(graph, "button.fa-sort-amount-desc");
assert.containsOnce(graph, "button.oi-sort--ascending");
assert.containsOnce(graph, "button.oi-sort--descending");
checkLegend(assert, graph, "Count", "measure should be by count");
assert.doesNotHaveClass(
graph.el.querySelector("button.fa-sort-amount-desc"),
graph.el.querySelector("button.oi-sort--descending"),
"active",
"descending order should be applied"
);
checkDatasets(assert, graph, "data", { data: [4, 3, 1] });
await click(graph.el, "button.fa-sort-amount-asc");
await click(graph.el, "button.oi-sort--ascending");
assert.hasClass(
graph.el.querySelector("button.fa-sort-amount-asc"),
graph.el.querySelector("button.oi-sort--ascending"),
"active",
"ascending order button should be active"
);
checkDatasets(assert, graph, "data", { data: [1, 3, 4] });
await click(graph.el, "button.fa-sort-amount-desc");
await click(graph.el, "button.oi-sort--descending");
assert.hasClass(
graph.el.querySelector("button.fa-sort-amount-desc"),
graph.el.querySelector("button.oi-sort--descending"),
"active",
"descending order button should be active"
);
@@ -3099,26 +3099,26 @@ QUnit.module("Views", (hooks) => {
checkLegend(assert, graph, ["true", "false"], "measure should be by count");
checkDatasets(assert, graph, "data", [{ data: [3, 0, 0] }, { data: [1, 3, 1] }]);
await click(graph.el, "button.fa-sort-amount-asc");
await click(graph.el, "button.oi-sort--ascending");
assert.hasClass(
graph.el.querySelector("button.fa-sort-amount-asc"),
graph.el.querySelector("button.oi-sort--ascending"),
"active",
"ascending order should be applied by default"
);
checkDatasets(assert, graph, "data", [{ data: [1, 3, 1] }, { data: [0, 0, 3] }]);
await click(graph.el, "button.fa-sort-amount-desc");
await click(graph.el, "button.oi-sort--descending");
assert.hasClass(
graph.el.querySelector("button.fa-sort-amount-desc"),
graph.el.querySelector("button.oi-sort--descending"),
"active",
"ascending order button should be active"
);
checkDatasets(assert, graph, "data", [{ data: [3, 0, 0] }, { data: [1, 3, 1] }]);
// again click on descending button to deactivate order button
await click(graph.el, "button.fa-sort-amount-desc");
await click(graph.el, "button.oi-sort--descending");
assert.doesNotHaveClass(
graph.el.querySelector("button.fa-sort-amount-desc"),
graph.el.querySelector("button.oi-sort--descending"),
"active",
"descending order button should not be active"
);
@@ -3159,9 +3159,9 @@ QUnit.module("Views", (hooks) => {
{ data: [1, 0, 0, 0] },
]);
await click(graph.el, "button.fa-sort-amount-asc");
await click(graph.el, "button.oi-sort--ascending");
assert.hasClass(
graph.el.querySelector("button.fa-sort-amount-asc"),
graph.el.querySelector("button.oi-sort--ascending"),
"active",
"ascending order should be applied by default"
);
@@ -3171,9 +3171,9 @@ QUnit.module("Views", (hooks) => {
{ data: [0, 0, 0, 1] },
]);
await click(graph.el, "button.fa-sort-amount-desc");
await click(graph.el, "button.oi-sort--descending");
assert.hasClass(
graph.el.querySelector("button.fa-sort-amount-desc"),
graph.el.querySelector("button.oi-sort--descending"),
"active",
"descending order button should be active"
);
@@ -3184,9 +3184,9 @@ QUnit.module("Views", (hooks) => {
]);
// again click on descending button to deactivate order button
await click(graph.el, "button.fa-sort-amount-desc");
await click(graph.el, "button.oi-sort--descending");
assert.doesNotHaveClass(
graph.el.querySelector("button.fa-sort-amount-desc"),
graph.el.querySelector("button.oi-sort--descending"),
"active",
"descending order button should not be active"
);
addons/web/static/tests/webclient/actions/window_action_tests.js
+6 -6
View File
@@ -1061,20 +1061,20 @@ QUnit.module("ActionManager", (hooks) => {
const webClient = await createWebClient({ serverData });
await doAction(webClient, 3);
assert.hasClass(
$(webClient.el).find(".o_control_panel .fa-bar-chart-o")[0],
$(webClient.el).find(".o_control_panel [data-mode='bar']")[0],
"active",
"bar chart button is active"
);
assert.doesNotHaveClass(
$(webClient.el).find(".o_control_panel .fa-area-chart")[0],
$(webClient.el).find(".o_control_panel [data-mode='line']")[0],
"active",
"line chart button is not active"
);
// display line chart
await testUtils.dom.click($(webClient.el).find(".o_control_panel .fa-area-chart"));
await testUtils.dom.click($(webClient.el).find(".o_control_panel [data-mode='line']"));
await legacyExtraNextTick();
assert.hasClass(
$(webClient.el).find(".o_control_panel .fa-area-chart")[0],
$(webClient.el).find(".o_control_panel [data-mode='line']")[0],
"active",
"line chart button is now active"
);
@@ -1083,13 +1083,13 @@ QUnit.module("ActionManager", (hooks) => {
await legacyExtraNextTick();
assert.containsNone(
webClient.el,
".o_control_panel .fa-area-chart",
".o_control_panel [data-mode='line']",
"graph buttons are no longer in control panel"
);
await cpHelpers.switchView(webClient.el, "graph");
await legacyExtraNextTick();
assert.hasClass(
$(webClient.el).find(".o_control_panel .fa-area-chart")[0],
$(webClient.el).find(".o_control_panel [data-mode='line']")[0],
"active",
"line chart button is still active"
);