diff --git a/addons/web_hierarchy/static/src/hierarchy_card.scss b/addons/web_hierarchy/static/src/hierarchy_card.scss index d06aa5ed725..5d196507122 100644 --- a/addons/web_hierarchy/static/src/hierarchy_card.scss +++ b/addons/web_hierarchy/static/src/hierarchy_card.scss @@ -11,10 +11,6 @@ width: 250px; min-height: 130px; - .o_hierarchy_node_button_container { - height: 30px; - } - &.o_hierarchy_dragged { .o_hierarchy_node { background-color: $hierarchy_element_dragged-background; @@ -50,8 +46,6 @@ } .o_hierarchy_node_body { - height: 65px; - .o_employee_availability { position: absolute; top: 4px; @@ -59,24 +53,10 @@ } } - .o_hierarchy_node_footer { - height: 30px; - } - .o_hierarchy_node_color_0 { background-color: $gray-200; } @include o-hierarchy-node-color; } - - .o_hierarchy_node_button { - display: grid; - grid-template-columns: 50px 1fr 50px; - border-radius: 0; - - .o_hierarchy_icon { - vertical-align: text-top; - } - } } diff --git a/addons/web_hierarchy/static/src/hierarchy_card.xml b/addons/web_hierarchy/static/src/hierarchy_card.xml index 12da00fecb2..fd61edb8cc7 100644 --- a/addons/web_hierarchy/static/src/hierarchy_card.xml +++ b/addons/web_hierarchy/static/src/hierarchy_card.xml @@ -2,8 +2,8 @@ -
-
+
+
-
- - Unfold - - - - - - - - - Fold - + + + + people
diff --git a/addons/web_hierarchy/static/src/hierarchy_renderer.scss b/addons/web_hierarchy/static/src/hierarchy_renderer.scss index a5eb58f281f..5ab94b0c69c 100644 --- a/addons/web_hierarchy/static/src/hierarchy_renderer.scss +++ b/addons/web_hierarchy/static/src/hierarchy_renderer.scss @@ -18,8 +18,6 @@ $o-chart-line-color: #ababb1; .o_hierarchy_separator { position: relative; - margin-top: 10px; - margin-bottom: 10px; width: 100%; .o_hierarchy_line_left { diff --git a/addons/web_hierarchy/static/src/hierarchy_renderer.xml b/addons/web_hierarchy/static/src/hierarchy_renderer.xml index 2c22a32d868..0e305fc4d75 100644 --- a/addons/web_hierarchy/static/src/hierarchy_renderer.xml +++ b/addons/web_hierarchy/static/src/hierarchy_renderer.xml @@ -3,7 +3,7 @@
-
+
@@ -12,12 +12,12 @@ >
-
+
-
diff --git a/addons/web_hierarchy/static/tests/hierarchy_view_tests.js b/addons/web_hierarchy/static/tests/hierarchy_view_tests.js index d1eb4beefa6..958534d52d6 100644 --- a/addons/web_hierarchy/static/tests/hierarchy_view_tests.js +++ b/addons/web_hierarchy/static/tests/hierarchy_view_tests.js @@ -91,13 +91,13 @@ QUnit.module("Views", (hooks) => { assert.containsN(target, ".o_hierarchy_node", 3); assert.containsN(target, ".o_hierarchy_node_button", 2); assert.containsOnce(target, ".o_hierarchy_node_button.btn-primary"); - assert.strictEqual(target.querySelector(".o_hierarchy_node_button.btn-primary").textContent.trim(), "Unfold 1"); + assert.strictEqual(target.querySelector(".o_hierarchy_node_button.btn-primary").textContent.trim(), "1 people"); // check nodes in each row const row = target.querySelector(".o_hierarchy_row"); assert.containsOnce(row, ".o_hierarchy_node"); assert.strictEqual(row.querySelector(".o_hierarchy_node_content").textContent, "Albert"); assert.containsOnce(target, ".o_hierarchy_node_button.btn-secondary"); - assert.strictEqual(target.querySelector(".o_hierarchy_node_button.btn-secondary").textContent.trim(), "Fold"); + assert.strictEqual(target.querySelector(".o_hierarchy_node_button.btn-secondary").textContent.trim(), "2 people"); }); QUnit.test("display child nodes", async function (assert) { @@ -129,7 +129,7 @@ QUnit.module("Views", (hooks) => { assert.containsN(target, ".o_hierarchy_node_button", 2); assert.containsNone(target, ".o_hierarchy_node_button.btn-primary"); assert.containsN(target, ".o_hierarchy_node_button.btn-secondary", 2); - assert.strictEqual(target.querySelector(".o_hierarchy_node_button.btn-secondary").textContent.trim(), "Fold"); + assert.strictEqual(target.querySelector(".o_hierarchy_node_button.btn-secondary").textContent.trim(), "2 people"); // check nodes in each row const rows = target.querySelectorAll(".o_hierarchy_row"); let row = rows[0]; @@ -635,10 +635,10 @@ QUnit.module("Views", (hooks) => { }); assert.containsOnce(target, ".o_hierarchy_node button[name=hierarchy_search_subsidiaries].btn-primary"); - assert.strictEqual(target.querySelector(".o_hierarchy_node button[name=hierarchy_search_subsidiaries].btn-primary").textContent.trim(), "Unfold 1"); + assert.strictEqual(target.querySelector(".o_hierarchy_node button[name=hierarchy_search_subsidiaries].btn-primary").textContent.trim(), "1 people"); assert.containsOnce( target, - ".o_hierarchy_node button[name=hierarchy_search_subsidiaries] i.fa-share-alt.o_hierarchy_icon", + ".o_hierarchy_node button[name=hierarchy_search_subsidiaries] i.fa-caret-right", "The default icon of the hierarchy view should be displayed inside the button to unfold the node." ); }); @@ -652,10 +652,10 @@ QUnit.module("Views", (hooks) => { }); assert.containsOnce(target, ".o_hierarchy_node button[name=hierarchy_search_subsidiaries].btn-primary"); - assert.strictEqual(target.querySelector(".o_hierarchy_node button[name=hierarchy_search_subsidiaries].btn-primary").textContent.trim(), "Unfold 1"); + assert.strictEqual(target.querySelector(".o_hierarchy_node button[name=hierarchy_search_subsidiaries].btn-primary").textContent.trim(), "1 people"); assert.containsOnce( target, - ".o_hierarchy_node button[name=hierarchy_search_subsidiaries] i.fa-users", + ".o_hierarchy_node button[name=hierarchy_search_subsidiaries] i.fa-caret-down", "The icon defined in the attribute icon in hierarchy tag should be displayed inside the button to unfold the node instead of the default one." ); });