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

N°3582 - Migrate backoffice pages to new UIBlock system : Improved display

Browse Source
This commit is contained in:
acognet
2021-03-24 07:57:04 +01:00
parent fdf01b770a
commit 094a86cbbf
2 changed files with 71 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
pages/ajax.csvimport.php
View File

@@ -9,8 +9,7 @@ use Combodo\iTop\Application\UI\Base\Component\DataTable\DataTableUIBlockFactory
use Combodo\iTop\Application\UI\Base\Component\Input\Select\SelectOptionUIBlockFactory;
use Combodo\iTop\Application\UI\Base\Component\Input\SelectUIBlockFactory;
use Combodo\iTop\Application\UI\Base\Component\Input\TextArea;
use Combodo\iTop\Application\UI\Base\Component\Title\TitleUIBlockFactory;
use Combodo\iTop\Application\UI\Base\Layout\UIContentBlockUIBlockFactory;
use Combodo\iTop\Application\UI\Base\Component\Panel\PanelUIBlockFactory;
use Combodo\iTop\Renderer\BlockRenderer;
require_once('../approot.inc.php');
@@ -229,12 +228,12 @@ try
$sMaxLen = (strlen(''.$iTarget) < 3) ? 3 : strlen(''.$iTarget); // Pad line numbers to the appropriate number of chars, but at least 3
$sFormat = '%0'.$sMaxLen.'d';
$oTitle = TitleUIBlockFactory::MakeForPage(Dict::S('UI:Title:DataPreview'));
$oPage->AddSubBlock($oTitle);
//$oTitle = TitleUIBlockFactory::MakeForPage(Dict::S('UI:Title:DataPreview'));
//$oPage->AddSubBlock($oTitle);
$oContainer = UIContentBlockUIBlockFactory::MakeStandard();
$oContainer->AddCSSClass("ibo-is-visible");
$oPage->AddSubBlock($oContainer);
//$oContainer = UIContentBlockUIBlockFactory::MakeStandard();
//$oContainer->AddCSSClass("ibo-is-visible");
//$oPage->AddSubBlock($oContainer);
$index = 1;
$aColumns = [];
@@ -264,7 +263,7 @@ try
}
}
$oTable = DataTableUIBlockFactory::MakeForForm("parser_preview", $aColumns, $aTableData);
$oContainer->AddSubBlock($oTable);
$oPage->AddSubBlock($oTable);
if ($iNbCols == 1) {
$oAlertMessage = \Combodo\iTop\Application\UI\Base\Component\Panel\PanelUIBlockFactory::MakeForFailure(Dict::S('UI:CSVImport:ErrorOnlyOneColumn'));
$oPage->AddSubBlock($oAlertMessage);
@@ -334,7 +333,13 @@ try
$index++;
}
$oTable = DataTableUIBlockFactory::MakeForForm("mapping", $aColumns, $aTableData);
$oPage->AddSubBlock($oTable);
$oPanel = PanelUIBlockFactory::MakeNeutral('');
$oPanel->AddCSSClass('ibo-datatable-panel');
$oPanel->AddCSSClass('mt-5');
$oPanel->AddSubBlock($oTable);
$oPage->AddSubBlock($oPanel);
if (empty($sInitSearchField)) {
// Propose a reconciliation scheme
//