From 3b4ba2aafd574f2a78a594e710b9bdee8eb328b6 Mon Sep 17 00:00:00 2001
From: acognet <anne-catherine.cognet@combodo.com>
Date: Wed, 26 Jan 2022 12:51:09 +0100
Subject: [PATCH] =?UTF-8?q?N=C2=B04634=20-=20Missing=20class=20icone=20in?=
 =?UTF-8?q?=20predefined=20search?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/menunode.class.inc.php              | 17 ++++++++++++-----
 css/backoffice/components/_title.scss           | 14 ++++++++++++++
 css/backoffice/utils/helpers/_misc.scss         |  3 +++
 .../base/components/title/layout.html.twig      |  2 +-
 4 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/application/menunode.class.inc.php b/application/menunode.class.inc.php
index b38e44c3f..b3a0a5227 100644
--- a/application/menunode.class.inc.php
+++ b/application/menunode.class.inc.php
@@ -5,6 +5,7 @@
  */
 
 use Combodo\iTop\Application\Helper\WebResourcesHelper;
+use Combodo\iTop\Application\UI\Base\Component\Title\Title;
 use Combodo\iTop\Application\UI\Base\Component\Title\TitleUIBlockFactory;
 
 require_once(APPROOT.'/application/utils.inc.php');
@@ -1126,16 +1127,22 @@ class OQLMenuNode extends MenuNode
 	{
 		$sUsageId = utils::GetSafeId($sUsageId);
 		$oSearch = DBObjectSearch::FromOQL($sOql);
-
+		$sClass= 	$oSearch->GetClass();
+		$sIcon = MetaModel::GetClassIcon($sClass, false,);
 		if ($bSearchPane) {
 			$aParams = array_merge(['open' => $bSearchOpen, 'table_id' => $sUsageId, 'submit_on_load' => false], $aExtraParams);
 			$oBlock = new DisplayBlock($oSearch, 'search', false /* Asynchronous */, $aParams);
 			$oBlock->Display($oPage, 0);
+			$aExtraParams['panel_class'] =$sClass;
+			$aExtraParams['panel_title'] = $sTitle;
+			$aExtraParams['panel_icon'] = $sIcon;
+			$oPage->add("<div class='sf_results_area ibo-add-margin-top-250' data-target='search_results'>");
+		}
+		else {
+			$oTitle = TitleUIBlockFactory::MakeForPageWithIcon($sTitle, $sIcon);
+			$oPage->AddUiBlock($oTitle);
+			$oPage->add("<div class='sf_results_area' data-target='search_results'>");
 		}
-
-		$oPage->add("<div class='sf_results_area' data-target='search_results'>");
-		$oTitle = TitleUIBlockFactory::MakeForPage($sTitle);
-		$oPage->AddUiBlock($oTitle);
 
 		$aParams = array_merge(array('table_id' => $sUsageId), $aExtraParams);
 		$oBlock = new DisplayBlock($oSearch, 'list', false /* Asynchronous */, $aParams);
diff --git a/css/backoffice/components/_title.scss b/css/backoffice/components/_title.scss
index 0abc7dcee..dea02aa4f 100644
--- a/css/backoffice/components/_title.scss
+++ b/css/backoffice/components/_title.scss
@@ -8,6 +8,8 @@ $ibo-title--padding-y: $ibo-spacing-400 !default;
 $ibo-title--padding-x: $ibo-spacing-0 !default;
 
 $ibo-title--icon--size: 90px !default;
+$ibo-title--icon--size-2: 80px !default;
+$ibo-title--icon--size-3: 70px !default;
 
 $ibo-title--icon-background--size--must-contain: contain !default;
 $ibo-title--icon-background--size--must-cover: cover !default;
@@ -29,6 +31,18 @@ $ibo-title--icon-background--size--must-zoomout: 66.67% !default;
   min-height: $ibo-title--icon--size;
   overflow: hidden;
 }
+.ibo-title--icon > .ibo-title--icon-level-2{
+  width: $ibo-title--icon--size-2;
+  height: $ibo-title--icon--size-2;
+  min-width: $ibo-title--icon--size-2;
+  min-height: $ibo-title--icon--size-2;
+}
+.ibo-title--icon > .ibo-title--icon-level-3{
+  width: $ibo-title--icon--size-3;
+  height: $ibo-title--icon--size-3;
+  min-width: $ibo-title--icon--size-3;
+  min-height: $ibo-title--icon--size-3;
+}
 
 .ibo-title--icon-background {
   width: 100%;
diff --git a/css/backoffice/utils/helpers/_misc.scss b/css/backoffice/utils/helpers/_misc.scss
index cc0620979..6c206f609 100644
--- a/css/backoffice/utils/helpers/_misc.scss
+++ b/css/backoffice/utils/helpers/_misc.scss
@@ -134,6 +134,9 @@ body.ibo-has-fullscreen-descendant {
   @extend %ibo-font-code-150;
 }
 
+.ibo-add-margin-top-250{
+  margin-top:  $ibo-spacing-400;
+}
 /*
  * A single class to handle WYSIWYG generated content, where only HTML tags are available
  * See https://bulma.io/documentation/elements/content/
diff --git a/templates/base/components/title/layout.html.twig b/templates/base/components/title/layout.html.twig
index 892d22867..288662831 100644
--- a/templates/base/components/title/layout.html.twig
+++ b/templates/base/components/title/layout.html.twig
@@ -2,7 +2,7 @@
     <div id="{{ oUIBlock.GetId() }}" class="{{ oUIBlock.GetBlocksInheritanceCSSClassesAsString() }} {{ oUIBlock.GetAdditionalCSSClassesAsString() }} {% if oUIBlock.HasIcon() %}ibo-has-icon{% endif %}{% if oUIBlock.IsHidden() %} ibo-is-hidden{% endif %}" data-role="ibo-title">
         {% if oUIBlock.HasIcon() %}
             <div class="ibo-title--icon">
-                <div class="ibo-title--icon-background ibo-title--icon-background--must-{{ oUIBlock.GetIconCoverMethod() }}" style="background-image: url('{{ oUIBlock.GetIconUrl()|raw }}');"></div>
+                <div class="ibo-title--icon-background ibo-title--icon-background--must-{{ oUIBlock.GetIconCoverMethod() }} ibo-title--icon-level-{{ oUIBlock.GetLevel() }}" style="background-image: url('{{ oUIBlock.GetIconUrl()|raw }}');"></div>
             </div>
         {% endif %}
         <div class="ibo-title--content">