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°3836 - Dashlet: Refactor part of the code to match conventions

Browse Source
This commit is contained in:
Molkobain
2021-07-12 10:49:49 +02:00
parent 7b6ac202c6
commit 5174250ff1
8 changed files with 56 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
application/cmdbabstract.class.inc.php
View File

@@ -662,7 +662,7 @@ HTML
}
$oClassIcon = new MedallionIcon(MetaModel::GetClassIcon($sTargetClass, false));
$oClassIcon->SetDescription($oAttDef->GetDescription())->AddCSSClass('ibo-blocklist--medallion');
$oClassIcon->SetDescription($oAttDef->GetDescription())->AddCSSClass('ibo-block-list--medallion');
$oPage->AddUiBlock($oClassIcon);
$sDisplayValue = ''; // not used
@@ -740,7 +740,7 @@ HTML
);
}
$oClassIcon = new MedallionIcon(MetaModel::GetClassIcon($sTargetClass, false));
$oClassIcon->SetDescription($oAttDef->GetDescription())->AddCSSClass('ibo-blocklist--medallion');
$oClassIcon->SetDescription($oAttDef->GetDescription())->AddCSSClass('ibo-block-list--medallion');
$oPage->AddUiBlock($oClassIcon);
$oBlock = new DisplayBlock($oLinkSet->GetFilter(), 'list', false);
$oBlock->Display($oPage, 'rel_'.$sAttCode, $aParams);
@@ -797,7 +797,7 @@ HTML
foreach($aNotificationClasses as $sNotifClass) {
$oClassIcon = new MedallionIcon(MetaModel::GetClassIcon($sNotifClass, false));
$oClassIcon->SetDescription(MetaModel::GetName($sNotifClass))->AddCSSClass('ibo-blocklist--medallion');
$oClassIcon->SetDescription(MetaModel::GetName($sNotifClass))->AddCSSClass('ibo-block-list--medallion');
$oPage->AddUiBlock($oClassIcon);
$oBlock = new DisplayBlock($aNotifSearches[$sNotifClass], 'list', false);

1
css/backoffice/application/display-block/_all.scss
View File

@@ -4,3 +4,4 @@
*/
@import "block-csv";
@import "block-list";

14
css/backoffice/application/display-block/_block-list.scss Normal file
View File

@@ -0,0 +1,14 @@
/*!
* @copyright Copyright (C) 2010-2021 Combodo SARL
* @license http://opensource.org/licenses/AGPL-3.0
*/
$ibo-block-list--create-icon--margin-right: 0.5rem !default;
.ibo-block-list--empty-text, .ibo-block-list--create-action{
text-align: center;
}
.ibo-block-list--create-icon {
margin-right: $ibo-block-list--create-icon--margin-right;
}

5
css/backoffice/blocks-integrations/_medallion-with-blocklist.scss
View File

@@ -1,7 +1,4 @@
.ibo-blocklist--empty-text, .ibo-blocklist--create-new{
text-align: center;
}
.ibo-blocklist--medallion{
.ibo-block-list--medallion{
flex-direction: column;
align-items: center;
> .ibo-medallion-icon--image{

23
datamodels/2.x/itop-structure/precompiled-themes/fullmoon/main.css
View File

File diff suppressed because one or more lines are too long

23
datamodels/2.x/itop-structure/precompiled-themes/test-red/main.css
View File

File diff suppressed because one or more lines are too long

2
sources/application/UI/DisplayBlock/BlockList/BlockList.php
View File

@@ -20,7 +20,7 @@ class BlockList extends UIContentBlock
use tJSRefreshCallback;
// Overloaded constants
public const BLOCK_CODE = 'ibo-blocklist';
public const BLOCK_CODE = 'ibo-block-list';
public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'application/display-block/block-list/layout';
public const DEFAULT_JS_TEMPLATE_REL_PATH = 'application/display-block/block-list/layout';

9
templates/application/display-block/block-list/layout.html.twig
View File

@@ -3,13 +3,16 @@
{% apply spaceless %}
{% if oUIBlock.bEmptySet or oUIBlock.bNotAuthorized %}
<div class="ibo-blocklist--empty-text">{{ 'UI:NoObjectToDisplay'|dict_s }}</div>
<div class="ibo-block-list--empty-text">{{ 'UI:NoObjectToDisplay'|dict_s }}</div>
{% endif %}
{% if oUIBlock.bCreateNew %}
<div class="ibo-blocklist--create-new">
<div class="ibo-block-list--create-action">
<a{{ oUIBlock.sLinkTarget }} href="{{ oUIBlock.sAbsoluteUrlAppRoot }}pages/UI.php?operation=new&class={{ oUIBlock.sClass }}&{{ oUIBlock.sParams }}{{ oUIBlock.sDefault }}">
<span class="fas fa-plus"></span> {{ 'UI:ClickToCreateNew'|dict_format(oUIBlock.sClassLabel) }}
<span class="ibo-block-list--create-icon">
<span class="fas fa-plus"></span>
</span>
<span class="ibo-block-list--create-label">{{ 'UI:ClickToCreateNew'|dict_format(oUIBlock.sClassLabel) }}</span>
</a>
</div>
{% endif %}