From 2f2b5ead7c4eff8fef6eaf1f62662f73d45eda89 Mon Sep 17 00:00:00 2001 From: svs-odoo Date: Tue, 11 Sep 2018 14:19:26 +0200 Subject: [PATCH] [IMP] web: update design and icons for dashboard subviews buttons - Change icon and design for dashboard subviews buttons, according to the new mockup. - Primary buttons are put into the same 'btn-group' to have better border jointure. ! The new icon for the 'fullscreen button' requires to update Font Awesome (currently in 4.7 and need at least the 5.0). Task #1882571 --- addons/web/static/src/xml/base.xml | 6 +++--- addons/web/static/tests/chrome/action_manager_tests.js | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 3e8a8c10e71..a37645ba85e 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -512,7 +512,7 @@ @@ -540,8 +540,8 @@ diff --git a/addons/web/static/tests/chrome/action_manager_tests.js b/addons/web/static/tests/chrome/action_manager_tests.js index 5cd9a216abf..3b7477f4857 100644 --- a/addons/web/static/tests/chrome/action_manager_tests.js +++ b/addons/web/static/tests/chrome/action_manager_tests.js @@ -2598,21 +2598,21 @@ QUnit.module('ActionManager', { assert.ok($('.o_control_panel .fa-bar-chart-o').hasClass('active'), "bar chart button is active"); - assert.ok(!$('.o_control_panel .fa-line-chart').hasClass('active'), + assert.ok(!$('.o_control_panel .fa-area-chart').hasClass('active'), "line chart button is not active"); // display line chart - $('.o_control_panel .fa-line-chart').click(); - assert.ok($('.o_control_panel .fa-line-chart').hasClass('active'), + $('.o_control_panel .fa-area-chart').click(); + assert.ok($('.o_control_panel .fa-area-chart').hasClass('active'), "line chart button is now active"); // switch to kanban and back to graph view $('.o_control_panel .o_cp_switch_kanban').click(); - assert.strictEqual($('.o_control_panel .fa-line-chart').length, 0, + assert.strictEqual($('.o_control_panel .fa-area-chart').length, 0, "graph buttons are no longer in control panel"); $('.o_control_panel .o_cp_switch_graph').click(); - assert.ok($('.o_control_panel .fa-line-chart').hasClass('active'), + assert.ok($('.o_control_panel .fa-area-chart').hasClass('active'), "line chart button is still active"); actionManager.destroy(); });