composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

N°4634 - Missing class icone in predefined search

Browse Source
This commit is contained in:
acognet
2022-01-26 12:51:09 +01:00
parent 70f67068f4
commit 3b4ba2aafd
4 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
application/menunode.class.inc.php
View File

@@ -5,6 +5,7 @@
*/ */
use Combodo\iTop\Application\Helper\WebResourcesHelper; use Combodo\iTop\Application\Helper\WebResourcesHelper;
use Combodo\iTop\Application\UI\Base\Component\Title\Title;
use Combodo\iTop\Application\UI\Base\Component\Title\TitleUIBlockFactory; use Combodo\iTop\Application\UI\Base\Component\Title\TitleUIBlockFactory;
require_once(APPROOT.'/application/utils.inc.php'); require_once(APPROOT.'/application/utils.inc.php');
@@ -1126,16 +1127,22 @@ class OQLMenuNode extends MenuNode
{ {
$sUsageId = utils::GetSafeId($sUsageId); $sUsageId = utils::GetSafeId($sUsageId);
$oSearch = DBObjectSearch::FromOQL($sOql); $oSearch = DBObjectSearch::FromOQL($sOql);
$sClass= $oSearch->GetClass();
$sIcon = MetaModel::GetClassIcon($sClass, false,);
if ($bSearchPane) { if ($bSearchPane) {
$aParams = array_merge(['open' => $bSearchOpen, 'table_id' => $sUsageId, 'submit_on_load' => false], $aExtraParams); $aParams = array_merge(['open' => $bSearchOpen, 'table_id' => $sUsageId, 'submit_on_load' => false], $aExtraParams);
$oBlock = new DisplayBlock($oSearch, 'search', false /* Asynchronous */, $aParams); $oBlock = new DisplayBlock($oSearch, 'search', false /* Asynchronous */, $aParams);
$oBlock->Display($oPage, 0); $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); $aParams = array_merge(array('table_id' => $sUsageId), $aExtraParams);
$oBlock = new DisplayBlock($oSearch, 'list', false /* Asynchronous */, $aParams); $oBlock = new DisplayBlock($oSearch, 'list', false /* Asynchronous */, $aParams);

14
css/backoffice/components/_title.scss
View File

@@ -8,6 +8,8 @@ $ibo-title--padding-y: $ibo-spacing-400 !default;
$ibo-title--padding-x: $ibo-spacing-0 !default; $ibo-title--padding-x: $ibo-spacing-0 !default;
$ibo-title--icon--size: 90px !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-contain: contain !default;
$ibo-title--icon-background--size--must-cover: cover !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; min-height: $ibo-title--icon--size;
overflow: hidden; 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 { .ibo-title--icon-background {
width: 100%; width: 100%;

3
css/backoffice/utils/helpers/_misc.scss
View File

@@ -134,6 +134,9 @@ body.ibo-has-fullscreen-descendant {
@extend %ibo-font-code-150; @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 * A single class to handle WYSIWYG generated content, where only HTML tags are available
* See https://bulma.io/documentation/elements/content/ * See https://bulma.io/documentation/elements/content/

2
templates/base/components/title/layout.html.twig
View File

@@ -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"> <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() %} {% if oUIBlock.HasIcon() %}
<div class="ibo-title--icon"> <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> </div>
{% endif %} {% endif %}
<div class="ibo-title--content"> <div class="ibo-title--content">