composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-19 15:22:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'support/3.2' into develop

Browse Source 
# Conflicts:
#	css/setup.css
This commit is contained in:
Stephen Abello
2026-04-15 15:15:03 +02:00
parent 1992c7e7c1 30f720b9ad
commit 265acb4a1e
4 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,14 +51,17 @@ $ibo-title--icon-img--size--must-zoomout: $ibo-title--icon-background--size--mus
width: 100%; width: 100%;
height: 100%; height: 100%;
object-position: center; object-position: center;
object-fit: $ibo-title--icon-img--size--must-contain;
background-size: $ibo-title--icon-img--size--must-contain; background-size: $ibo-title--icon-img--size--must-contain;
} }
.ibo-title--icon-img--must-contain, .ibo-title--icon-background--must-contain { // second class is deprecated, remove it when dealing with N°9317 .ibo-title--icon-img--must-contain, .ibo-title--icon-background--must-contain { // second class is deprecated, remove it when dealing with N°9317
object-fit: $ibo-title--icon-img--size--must-contain;
background-size: $ibo-title--icon-img--size--must-contain; background-size: $ibo-title--icon-img--size--must-contain;
} }
.ibo-title--icon-img--must-cover, .ibo-title--icon-background--must-cover { // second class is deprecated, remove it when dealing with N°9317 .ibo-title--icon-img--must-cover, .ibo-title--icon-background--must-cover { // second class is deprecated, remove it when dealing with N°9317
object-fit: $ibo-title--icon-img--size--must-cover;
background-size: $ibo-title--icon-img--size--must-cover; background-size: $ibo-title--icon-img--size--must-cover;
} }

4
css/setup.css
View File

File diff suppressed because one or more lines are too long

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

@@ -2,7 +2,9 @@
<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() }} ibo-title--icon-level-{{ oUIBlock.GetLevel() }}" style="background-image: url('{{ oUIBlock.GetIconUrl()|raw }}');"></div> <img class="ibo-title--icon-background ibo-title--icon-background--must-{{ oUIBlock.GetIconCoverMethod() }} ibo-title--icon-level-{{ oUIBlock.GetLevel() }}"
{% if oUIBlock.HasLazyLoadIcon %} loading="lazy" {% endif %}
data-role="ibo-title--icon-img" src="{{ oUIBlock.GetIconUrl()|raw }}" alt="" aria-hidden="true"/>
</div> </div>
{% endif %} {% endif %}
<div class="ibo-title--content"> <div class="ibo-title--content">

4
tests/manual-visual-tests/Backoffice/RenderAllUiBlocks.php
View File

@@ -22,6 +22,7 @@
namespace Combodo\iTop\Test\VisualTest\Backoffice; namespace Combodo\iTop\Test\VisualTest\Backoffice;
use Combodo\iTop\Application\Branding;
use Combodo\iTop\Application\UI\Base\Component\Alert\AlertUIBlockFactory; use Combodo\iTop\Application\UI\Base\Component\Alert\AlertUIBlockFactory;
use Combodo\iTop\Application\UI\Base\Component\Button\Button; use Combodo\iTop\Application\UI\Base\Component\Button\Button;
use Combodo\iTop\Application\UI\Base\Component\Button\ButtonUIBlockFactory; use Combodo\iTop\Application\UI\Base\Component\Button\ButtonUIBlockFactory;
@@ -402,7 +403,8 @@ $oPage->AddUiBlock(TitleUIBlockFactory::MakeNeutral('Title example 1', 1));
$oPage->AddUiBlock(TitleUIBlockFactory::MakeNeutral('Title example 2', 2)); $oPage->AddUiBlock(TitleUIBlockFactory::MakeNeutral('Title example 2', 2));
$oPage->AddUiBlock(TitleUIBlockFactory::MakeNeutral('Title example 3', 3)); $oPage->AddUiBlock(TitleUIBlockFactory::MakeNeutral('Title example 3', 3));
$oPage->AddUiBlock(TitleUIBlockFactory::MakeNeutral('Title example 4', 4)); $oPage->AddUiBlock(TitleUIBlockFactory::MakeNeutral('Title example 4', 4));
$oPage->AddUiBlock(TitleUIBlockFactory::MakeNeutral('Title example 5', 5)); $oPage->AddUiBlock(TitleUIBlockFactory::MakeForPageWithIcon('Title example 5', MetaModel::GetClassIcon('Organization', false)));
$oPage->AddUiBlock(TitleUIBlockFactory::MakeForPageWithIcon('Title example 6', Branding::GetFullMainLogoAbsoluteUrl()));
///////// /////////
// DataTable // DataTable