From be075dd6955d3dc4cf4a0f5a3e52446bb38449df Mon Sep 17 00:00:00 2001
From: Molkobain <lajarige.guillaume@free.fr>
Date: Mon, 5 Oct 2020 15:53:45 +0200
Subject: [PATCH] =?UTF-8?q?N=C2=B02847=20-=20Object=20details:=20Fix=20ale?=
 =?UTF-8?q?rt=20messages=20overlapping=20header=20and=20multicolumn=20layo?=
 =?UTF-8?q?ut?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/cmdbabstract.class.inc.php                   | 9 ++-------
 .../application/UI/Layout/MultiColumn/Column/Column.php  | 1 +
 templates/layouts/multicolumn/column/layout.html.twig    | 7 +++++++
 3 files changed, 10 insertions(+), 7 deletions(-)
 create mode 100644 templates/layouts/multicolumn/column/layout.html.twig

diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php
index fa93be13e..eb3482510 100644
--- a/application/cmdbabstract.class.inc.php
+++ b/application/cmdbabstract.class.inc.php
@@ -989,15 +989,11 @@ EOF
 
 		// TODO 2.8.0: Remove this when object details block completed, this is hardcoded for the demo
 		$oPage->add_style(<<<CSS
-.object-details {
-	position: relative;
-}
 .object-details .ibo-title {
 	z-index: 1;
     align-items: start;
-	position: absolute;
-	top: 0;
-	left: 32px;
+	position: relative;
+	padding-left: 32px;
 }
 .object-details .ibo-title .ibo-title--medallion {
 	position: absolute;
@@ -1008,7 +1004,6 @@ EOF
 }
 .object-details .ibo-panel {
 	z-index: 0;
-	margin-top: 48px;
 }
 .object-details .ibo-panel > .ibo-panel--body {
 	padding-top: 8px;
diff --git a/sources/application/UI/Layout/MultiColumn/Column/Column.php b/sources/application/UI/Layout/MultiColumn/Column/Column.php
index 48a0f1306..1fe052d08 100644
--- a/sources/application/UI/Layout/MultiColumn/Column/Column.php
+++ b/sources/application/UI/Layout/MultiColumn/Column/Column.php
@@ -19,4 +19,5 @@ use Combodo\iTop\Application\UI\Layout\UIContentBlock;
 class Column extends UIContentBlock {
 	// Overloaded constants
 	public const BLOCK_CODE = 'ibo-column';
+	public const HTML_TEMPLATE_REL_PATH = 'layouts/multicolumn/column/layout';
 }
\ No newline at end of file
diff --git a/templates/layouts/multicolumn/column/layout.html.twig b/templates/layouts/multicolumn/column/layout.html.twig
new file mode 100644
index 000000000..716e4f3eb
--- /dev/null
+++ b/templates/layouts/multicolumn/column/layout.html.twig
@@ -0,0 +1,7 @@
+{# @copyright   Copyright (C) 2010-2020 Combodo SARL #}
+{# @license     http://opensource.org/licenses/AGPL-3.0 #}
+<div class="ibo-column">
+    {% for oSubBlock in oUIBlock.GetSubBlocks() %}
+        {{ render_block(oSubBlock, {aPage: aPage}) }}
+    {% endfor %}
+</div>
\ No newline at end of file