diff --git a/core/csvbulkexport.class.inc.php b/core/csvbulkexport.class.inc.php index 1b1ff501e..496857d86 100644 --- a/core/csvbulkexport.class.inc.php +++ b/core/csvbulkexport.class.inc.php @@ -10,7 +10,8 @@ use Combodo\iTop\Application\UI\Base\Component\Input\InputUIBlockFactory; 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\Panel\PanelUIBlockFactory; -use Combodo\iTop\Application\UI\Base\Layout\UIContentBlockUIBlockFactory; +use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\Column\ColumnUIBlockFactory; +use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\MultiColumnUIBlockFactory; /** * Bulk export: CSV export @@ -114,14 +115,12 @@ class CSVBulkExport extends TabularBulkExport case 'csv_options': $oPanel = PanelUIBlockFactory::MakeNeutral(Dict::S('Core:BulkExport:CSVOptions')); - $oMulticolumn = UIContentBlockUIBlockFactory::MakeStandard(); - $oMulticolumn->AddCSSClass('ibo-multi-column'); + $oMulticolumn = MultiColumnUIBlockFactory::MakeStandard(); $oPanel->AddSubBlock($oMulticolumn); //SeparatorCharacter $oFieldSetSeparator = FieldSetUIBlockFactory::MakeStandard(Dict::S('UI:CSVImport:SeparatorCharacter')); - $oFieldSetSeparator->AddCSSClass('ibo-column'); - $oMulticolumn->AddSubBlock($oFieldSetSeparator); + $oMulticolumn->AddColumn(ColumnUIBlockFactory::MakeForBlock($oFieldSetSeparator)); $sRawSeparator = utils::ReadParam('separator', ',', true, 'raw_data'); $sCustomDateTimeFormat = utils::ReadParam('', ',', true, 'raw_data'); @@ -149,8 +148,7 @@ class CSVBulkExport extends TabularBulkExport //TextQualifierCharacter $oFieldSetTextQualifier = FieldSetUIBlockFactory::MakeStandard(Dict::S('UI:CSVImport:TextQualifierCharacter')); - $oFieldSetTextQualifier->AddCSSClass('ibo-column'); - $oMulticolumn->AddSubBlock($oFieldSetTextQualifier); + $oMulticolumn->AddColumn(ColumnUIBlockFactory::MakeForBlock($oFieldSetTextQualifier)); $sRawQualifier = utils::ReadParam('text-qualifier', '"', true, 'raw_data'); $aQualifiers = array( @@ -176,8 +174,7 @@ class CSVBulkExport extends TabularBulkExport //Localization $oFieldSetLocalization = FieldSetUIBlockFactory::MakeStandard(Dict::S('Core:BulkExport:CSVLocalization')); - $oFieldSetLocalization->AddCSSClass('ibo-column'); - $oMulticolumn->AddSubBlock($oFieldSetLocalization); + $oMulticolumn->AddColumn(ColumnUIBlockFactory::MakeForBlock($oFieldSetLocalization)); $oCheckBox = InputUIBlockFactory::MakeForInputWithLabel(Dict::S('Core:BulkExport:OptionNoLocalize'), "no_localize", "1", "csv_no_localize", "checkbox"); $oCheckBox->GetInput()->SetIsChecked((utils::ReadParam('no_localize', 0) == 1)); @@ -198,8 +195,7 @@ class CSVBulkExport extends TabularBulkExport } //markup $oFieldSetMarkup = FieldSetUIBlockFactory::MakeStandard(Dict::S('Core:BulkExport:TextFormat')); - $oFieldSetMarkup->AddCSSClass('ibo-column'); - $oMulticolumn->AddSubBlock($oFieldSetMarkup); + $oMulticolumn->AddColumn(ColumnUIBlockFactory::MakeForBlock($oFieldSetMarkup)); $oCheckBoxMarkup = InputUIBlockFactory::MakeForInputWithLabel(Dict::S('Core:BulkExport:OptionFormattedText'), "formatted_text", "1", "csv_formatted_text", "checkbox"); $oCheckBoxMarkup->GetInput()->SetIsChecked((utils::ReadParam('formatted_text', 0) == 1)); @@ -209,8 +205,7 @@ class CSVBulkExport extends TabularBulkExport //date format $oFieldSetDate = FieldSetUIBlockFactory::MakeStandard(Dict::S('Core:BulkExport:DateTimeFormat')); - $oFieldSetDate->AddCSSClass('ibo-column'); - $oMulticolumn->AddSubBlock($oFieldSetDate); + $oMulticolumn->AddColumn(ColumnUIBlockFactory::MakeForBlock($oFieldSetDate)); $sDateTimeFormat = utils::ReadParam('date_format', (string)AttributeDateTime::GetFormat(), true, 'raw_data'); diff --git a/core/excelbulkexport.class.inc.php b/core/excelbulkexport.class.inc.php index b09d627c4..ac7dc5b3f 100644 --- a/core/excelbulkexport.class.inc.php +++ b/core/excelbulkexport.class.inc.php @@ -8,7 +8,8 @@ use Combodo\iTop\Application\UI\Base\Component\FieldSet\FieldSetUIBlockFactory; use Combodo\iTop\Application\UI\Base\Component\Html\Html; use Combodo\iTop\Application\UI\Base\Component\Input\InputUIBlockFactory; use Combodo\iTop\Application\UI\Base\Component\Panel\PanelUIBlockFactory; -use Combodo\iTop\Application\UI\Base\Layout\UIContentBlockUIBlockFactory; +use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\Column\ColumnUIBlockFactory; +use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\MultiColumnUIBlockFactory; require_once(APPROOT.'application/xlsxwriter.class.php'); @@ -82,13 +83,11 @@ class ExcelBulkExport extends TabularBulkExport case 'xlsx_options': $oPanel = PanelUIBlockFactory::MakeNeutral(Dict::S('Core:BulkExport:XLSXOptions')); - $oMulticolumn = UIContentBlockUIBlockFactory::MakeStandard(); - $oMulticolumn->AddCSSClass('ibo-multi-column'); + $oMulticolumn = MultiColumnUIBlockFactory::MakeStandard(); $oPanel->AddSubBlock($oMulticolumn); $oFieldSetFormat = FieldSetUIBlockFactory::MakeStandard(Dict::S('Core:BulkExport:TextFormat')); - $oFieldSetFormat->AddCSSClass('ibo-column'); - $oMulticolumn->AddSubBlock($oFieldSetFormat); + $oMulticolumn->AddColumn(ColumnUIBlockFactory::MakeForBlock($oFieldSetFormat)); $oCheckBox = InputUIBlockFactory::MakeForInputWithLabel(Dict::S('Core:BulkExport:OptionFormattedText'), "formatted_text", "1", "xlsx_formatted_text", "checkbox"); $oCheckBox->GetInput()->SetIsChecked((utils::ReadParam('formatted_text', 0) == 1)); @@ -97,8 +96,7 @@ class ExcelBulkExport extends TabularBulkExport $oFieldSetFormat->AddSubBlock($oCheckBox); $oFieldSetDate = FieldSetUIBlockFactory::MakeStandard(Dict::S('Core:BulkExport:DateTimeFormat')); - $oFieldSetDate->AddCSSClass('ibo-column'); - $oMulticolumn->AddSubBlock($oFieldSetDate); + $oMulticolumn->AddColumn(ColumnUIBlockFactory::MakeForBlock($oFieldSetDate)); $sDateTimeFormat = utils::ReadParam('date_format', (string)AttributeDateTime::GetFormat(), true, 'raw_data'); diff --git a/core/pdfbulkexport.class.inc.php b/core/pdfbulkexport.class.inc.php index 6d2e6193c..2fc40dc7d 100644 --- a/core/pdfbulkexport.class.inc.php +++ b/core/pdfbulkexport.class.inc.php @@ -10,7 +10,8 @@ use Combodo\iTop\Application\UI\Base\Component\Input\InputUIBlockFactory; 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\Panel\PanelUIBlockFactory; -use Combodo\iTop\Application\UI\Base\Layout\UIContentBlockUIBlockFactory; +use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\Column\ColumnUIBlockFactory; +use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\MultiColumnUIBlockFactory; /** * Bulk export: PDF export, based on the HTML export converted to PDF @@ -46,13 +47,11 @@ class PDFBulkExport extends HTMLBulkExport case 'pdf_options': $oPanel = PanelUIBlockFactory::MakeNeutral(Dict::S('Core:BulkExport:PDFOptions')); - $oMulticolumn = UIContentBlockUIBlockFactory::MakeStandard(); - $oMulticolumn->AddCSSClass('ibo-multi-column'); + $oMulticolumn = MultiColumnUIBlockFactory::MakeStandard(); $oPanel->AddSubBlock($oMulticolumn); $oFieldSetFormat = FieldSetUIBlockFactory::MakeStandard(Dict::S('Core:BulkExport:PDFPageFormat')); - $oFieldSetFormat->AddCSSClass('ibo-column'); - $oMulticolumn->AddSubBlock($oFieldSetFormat); + $oMulticolumn->AddColumn(ColumnUIBlockFactory::MakeForBlock($oFieldSetFormat)); //page format $oSelectFormat = SelectUIBlockFactory::MakeForSelectWithLabel("page_size", Dict::S('Core:BulkExport:PDFPageSize')); @@ -81,8 +80,7 @@ class PDFBulkExport extends HTMLBulkExport //date format $oFieldSetDate = FieldSetUIBlockFactory::MakeStandard(Dict::S('Core:BulkExport:DateTimeFormat')); - $oFieldSetDate->AddCSSClass('ibo-column'); - $oMulticolumn->AddSubBlock($oFieldSetDate); + $oMulticolumn->AddColumn(ColumnUIBlockFactory::MakeForBlock($oFieldSetDate)); $sDateTimeFormat = utils::ReadParam('date_format', (string)AttributeDateTime::GetFormat(), true, 'raw_data'); diff --git a/core/spreadsheetbulkexport.class.inc.php b/core/spreadsheetbulkexport.class.inc.php index 393745e4c..169868243 100644 --- a/core/spreadsheetbulkexport.class.inc.php +++ b/core/spreadsheetbulkexport.class.inc.php @@ -8,7 +8,8 @@ use Combodo\iTop\Application\UI\Base\Component\FieldSet\FieldSetUIBlockFactory; use Combodo\iTop\Application\UI\Base\Component\Html\Html; use Combodo\iTop\Application\UI\Base\Component\Input\InputUIBlockFactory; use Combodo\iTop\Application\UI\Base\Component\Panel\PanelUIBlockFactory; -use Combodo\iTop\Application\UI\Base\Layout\UIContentBlockUIBlockFactory; +use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\Column\ColumnUIBlockFactory; +use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\MultiColumnUIBlockFactory; /** * Bulk export: "spreadsheet" export: a simplified HTML export in which the date/time columns are split in two column: date AND time @@ -48,13 +49,11 @@ class SpreadsheetBulkExport extends TabularBulkExport case 'spreadsheet_options': $oPanel = PanelUIBlockFactory::MakeNeutral(Dict::S('Core:BulkExport:SpreadsheetOptions')); - $oMulticolumn = UIContentBlockUIBlockFactory::MakeStandard(); - $oMulticolumn->AddCSSClass('ibo-multi-column'); + $oMulticolumn = MultiColumnUIBlockFactory::MakeStandard(); $oPanel->AddSubBlock($oMulticolumn); $oFieldSetFormat = FieldSetUIBlockFactory::MakeStandard(Dict::S('Core:BulkExport:TextFormat')); - $oFieldSetFormat->AddCSSClass('ibo-column'); - $oMulticolumn->AddSubBlock($oFieldSetFormat); + $oMulticolumn->AddColumn(ColumnUIBlockFactory::MakeForBlock($oFieldSetFormat)); $oCheckBox = InputUIBlockFactory::MakeForInputWithLabel(Dict::S('Core:BulkExport:OptionFormattedText'), "formatted_text", "1", "spreadsheet_formatted_text", "checkbox"); $oCheckBox->GetInput()->SetIsChecked((utils::ReadParam('formatted_text', 0) == 1)); @@ -70,8 +69,7 @@ class SpreadsheetBulkExport extends TabularBulkExport $oFieldSetFormat->AddSubBlock($oCheckBox); $oFieldSetDate = FieldSetUIBlockFactory::MakeStandard(Dict::S('Core:BulkExport:DateTimeFormat')); - $oFieldSetDate->AddCSSClass('ibo-column'); - $oMulticolumn->AddSubBlock($oFieldSetDate); + $oMulticolumn->AddColumn(ColumnUIBlockFactory::MakeForBlock($oFieldSetDate)); $sDateTimeFormat = utils::ReadParam('date_format', (string)AttributeDateTime::GetFormat(), true, 'raw_data'); diff --git a/core/xmlbulkexport.class.inc.php b/core/xmlbulkexport.class.inc.php index 393b720ef..f2fe6bdfb 100644 --- a/core/xmlbulkexport.class.inc.php +++ b/core/xmlbulkexport.class.inc.php @@ -6,7 +6,8 @@ use Combodo\iTop\Application\UI\Base\Component\Input\InputUIBlockFactory; use Combodo\iTop\Application\UI\Base\Component\Panel\PanelUIBlockFactory; -use Combodo\iTop\Application\UI\Base\Layout\UIContentBlockUIBlockFactory; +use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\Column\ColumnUIBlockFactory; +use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\MultiColumnUIBlockFactory; /** * Bulk export: XML export @@ -41,21 +42,20 @@ class XMLBulkExport extends BulkExport $oPanel = PanelUIBlockFactory::MakeNeutral(Dict::S('Core:BulkExport:XMLOptions')); - $oMulticolumn = UIContentBlockUIBlockFactory::MakeStandard(); - $oMulticolumn->AddCSSClass('ibo-multi-column'); + $oMulticolumn = MultiColumnUIBlockFactory::MakeStandard(); $oPanel->AddSubBlock($oMulticolumn); $oCheckBoxLocalize = InputUIBlockFactory::MakeForInputWithLabel(Dict::S('Core:BulkExport:OptionNoLocalize'), "no_localize", "1", "xml_no_localize", "checkbox"); $oCheckBoxLocalize->GetInput()->SetIsChecked((utils::ReadParam('no_localize', 0) == 1)); $oCheckBoxLocalize->SetBeforeInput(false); $oCheckBoxLocalize->GetInput()->AddCSSClass('ibo-input-checkbox'); - $oPanel->AddSubBlock($oCheckBoxLocalize); + $oMulticolumn->AddColumn(ColumnUIBlockFactory::MakeForBlock($oCheckBoxLocalize)); $oCheckBoxLink = InputUIBlockFactory::MakeForInputWithLabel(Dict::S('Core:BulkExport:OptionLinkSets'), "linksets", "1", "xml_linksets", "checkbox"); $oCheckBoxLink->GetInput()->SetIsChecked((utils::ReadParam('linksets', 0) == 1)); $oCheckBoxLink->SetBeforeInput(false); $oCheckBoxLink->GetInput()->AddCSSClass('ibo-input-checkbox'); - $oPanel->AddSubBlock($oCheckBoxLink); + $oMulticolumn->AddColumn(ColumnUIBlockFactory::MakeForBlock($oCheckBoxLink)); return $oPanel; break; diff --git a/lib/composer/autoload_classmap.php b/lib/composer/autoload_classmap.php index 050070898..3f3ac88cd 100644 --- a/lib/composer/autoload_classmap.php +++ b/lib/composer/autoload_classmap.php @@ -254,7 +254,9 @@ return array( 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\Dashboard\\DashboardRow' => $baseDir . '/sources/application/UI/Base/Layout/Dashboard/DashboardRow.php', 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\Dashboard\\UIDashboardLayoutBlock' => $baseDir . '/sources/application/UI/Base/Layout/Dashboard/UIDashboardLayoutBlock.php', 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\MultiColumn\\Column\\Column' => $baseDir . '/sources/application/UI/Base/Layout/MultiColumn/Column/Column.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\MultiColumn\\Column\\ColumnUIBlockFactory' => $baseDir . '/sources/application/UI/Base/Layout/MultiColumn/Column/ColumnUIBlockFactory.php', 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\MultiColumn\\MultiColumn' => $baseDir . '/sources/application/UI/Base/Layout/MultiColumn/MultiColumn.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\MultiColumn\\MultiColumnUIBlockFactory' => $baseDir . '/sources/application/UI/Base/Layout/MultiColumn/MultiColumnUIBlockFactory.php', 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\NavigationMenu\\NavigationMenu' => $baseDir . '/sources/application/UI/Base/Layout/NavigationMenu/NavigationMenu.php', 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\NavigationMenu\\NavigationMenuFactory' => $baseDir . '/sources/application/UI/Base/Layout/NavigationMenu/NavigationMenuFactory.php', 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\Object\\ObjectDetails' => $baseDir . '/sources/application/UI/Base/Layout/Object/ObjectDetails.php', diff --git a/lib/composer/autoload_static.php b/lib/composer/autoload_static.php index 478aafabc..0965b707c 100644 --- a/lib/composer/autoload_static.php +++ b/lib/composer/autoload_static.php @@ -484,7 +484,9 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\Dashboard\\DashboardRow' => __DIR__ . '/../..' . '/sources/application/UI/Base/Layout/Dashboard/DashboardRow.php', 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\Dashboard\\UIDashboardLayoutBlock' => __DIR__ . '/../..' . '/sources/application/UI/Base/Layout/Dashboard/UIDashboardLayoutBlock.php', 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\MultiColumn\\Column\\Column' => __DIR__ . '/../..' . '/sources/application/UI/Base/Layout/MultiColumn/Column/Column.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\MultiColumn\\Column\\ColumnUIBlockFactory' => __DIR__ . '/../..' . '/sources/application/UI/Base/Layout/MultiColumn/Column/ColumnUIBlockFactory.php', 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\MultiColumn\\MultiColumn' => __DIR__ . '/../..' . '/sources/application/UI/Base/Layout/MultiColumn/MultiColumn.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\MultiColumn\\MultiColumnUIBlockFactory' => __DIR__ . '/../..' . '/sources/application/UI/Base/Layout/MultiColumn/MultiColumnUIBlockFactory.php', 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\NavigationMenu\\NavigationMenu' => __DIR__ . '/../..' . '/sources/application/UI/Base/Layout/NavigationMenu/NavigationMenu.php', 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\NavigationMenu\\NavigationMenuFactory' => __DIR__ . '/../..' . '/sources/application/UI/Base/Layout/NavigationMenu/NavigationMenuFactory.php', 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\Object\\ObjectDetails' => __DIR__ . '/../..' . '/sources/application/UI/Base/Layout/Object/ObjectDetails.php', diff --git a/pages/ajax.render.php b/pages/ajax.render.php index b58abea7a..b3b348428 100644 --- a/pages/ajax.render.php +++ b/pages/ajax.render.php @@ -1163,6 +1163,8 @@ EOF if ($oDashlet->IsRedrawNeeded()) { $oBlock = $oDashlet->DoRender($oPage, true, false, $aExtraParams); $sHtml = ConsoleBlockRenderer::RenderBlockTemplateInPage($oPage, $oBlock); + $sHtml = str_replace("\n", '', $sHtml); + $sHtml = str_replace("\r", '', $sHtml); $oPage->add_script("$('#dashlet_$sDashletId').html('$sHtml');"); } if ($oDashlet->IsFormRedrawNeeded()) { diff --git a/pages/csvimport.php b/pages/csvimport.php index 387014c36..0e9098ba2 100644 --- a/pages/csvimport.php +++ b/pages/csvimport.php @@ -21,6 +21,8 @@ use Combodo\iTop\Application\UI\Base\Component\Input\TextArea; use Combodo\iTop\Application\UI\Base\Component\Panel\PanelUIBlockFactory; use Combodo\iTop\Application\UI\Base\Component\Title\TitleUIBlockFactory; use Combodo\iTop\Application\UI\Base\Component\Toolbar\ToolbarUIBlockFactory; +use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\Column\ColumnUIBlockFactory; +use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\MultiColumnUIBlockFactory; use Combodo\iTop\Application\UI\Base\Layout\TabContainer\Tab\AjaxTab; use Combodo\iTop\Application\UI\Base\Layout\TabContainer\TabContainer; use Combodo\iTop\Application\UI\Base\Layout\UIContentBlockUIBlockFactory; @@ -544,49 +546,36 @@ try { $aDisplayFilters['added'] = Dict::S('UI:CSVImport:ObjectsWereAdded'); $aDisplayFilters['errors'] = Dict::S('UI:CSVImport:ObjectsHadErrors'); } - $oMulticolumn = UIContentBlockUIBlockFactory::MakeStandard(); - $oMulticolumn->AddCSSClasses(['ibo-multi-column', 'ml-1']); + $oMulticolumn = MultiColumnUIBlockFactory::MakeStandard(); + $oMulticolumn->AddCSSClass('ml-1'); $oForm->AddSubBlock($oMulticolumn); - $oColumn = UIContentBlockUIBlockFactory::MakeStandard(); - $oColumn->AddCSSClass('ibo - column'); - $oMulticolumn->AddSubBlock($oColumn); - $oCheckBoxUnchanged = InputUIBlockFactory::MakeForInputWithLabel(' '.sprintf($aDisplayFilters['unchanged'], $iUnchanged), '', "1", "show_unchanged", "checkbox"); $oCheckBoxUnchanged->GetInput()->SetIsChecked(true); $oCheckBoxUnchanged->SetBeforeInput(false); $oCheckBoxUnchanged->GetInput()->AddCSSClass('ibo-input-checkbox'); - $oColumn->AddSubBlock($oCheckBoxUnchanged); + $oMulticolumn->AddColumn(ColumnUIBlockFactory::MakeForBlock($oCheckBoxUnchanged)); $oPage->add_ready_script("$('#show_unchanged').on('click', function(){ToggleRows('row_unchanged')})"); - $oColumn = UIContentBlockUIBlockFactory::MakeStandard(); - $oColumn->AddCSSClass('ibo - column'); - $oMulticolumn->AddSubBlock($oColumn); $oCheckBoxUnchanged = InputUIBlockFactory::MakeForInputWithLabel(' '.sprintf($aDisplayFilters['modified'], $iModified), '', "1", "show_modified", "checkbox"); $oCheckBoxUnchanged->GetInput()->SetIsChecked(true); $oCheckBoxUnchanged->SetBeforeInput(false); $oCheckBoxUnchanged->GetInput()->AddCSSClass('ibo-input-checkbox'); - $oColumn->AddSubBlock($oCheckBoxUnchanged); + $oMulticolumn->AddColumn(ColumnUIBlockFactory::MakeForBlock($oCheckBoxUnchanged)); $oPage->add_ready_script("$('#show_modified').on('click', function(){ToggleRows('row_modified')})"); - $oColumn = UIContentBlockUIBlockFactory::MakeStandard(); - $oColumn->AddCSSClass('ibo - column'); - $oMulticolumn->AddSubBlock($oColumn); $oCheckBoxUnchanged = InputUIBlockFactory::MakeForInputWithLabel(' '.sprintf($aDisplayFilters['added'], $iCreated), '', "1", "show_created", "checkbox"); $oCheckBoxUnchanged->GetInput()->SetIsChecked(true); $oCheckBoxUnchanged->SetBeforeInput(false); $oCheckBoxUnchanged->GetInput()->AddCSSClass('ibo-input-checkbox'); - $oColumn->AddSubBlock($oCheckBoxUnchanged); + $oMulticolumn->AddColumn(ColumnUIBlockFactory::MakeForBlock($oCheckBoxUnchanged)); $oPage->add_ready_script("$('#show_created').on('click', function(){ToggleRows('row_added')})"); - $oColumn = UIContentBlockUIBlockFactory::MakeStandard(); - $oColumn->AddCSSClass('ibo - column'); - $oMulticolumn->AddSubBlock($oColumn); $oCheckBoxUnchanged = InputUIBlockFactory::MakeForInputWithLabel(' '.sprintf($aDisplayFilters['errors'], $iErrors), '', "1", "show_errors", "checkbox"); $oCheckBoxUnchanged->GetInput()->SetIsChecked(true); $oCheckBoxUnchanged->SetBeforeInput(false); $oCheckBoxUnchanged->GetInput()->AddCSSClass('ibo-input-checkbox'); - $oColumn->AddSubBlock($oCheckBoxUnchanged); + $oMulticolumn->AddColumn(ColumnUIBlockFactory::MakeForBlock($oCheckBoxUnchanged)); $oPage->add_ready_script("$('#show_errors').on('click', function(){ToggleRows('row_error')})"); $oPanel = PanelUIBlockFactory::MakeNeutral(''); @@ -838,27 +827,18 @@ EOF $oForm->SetOnSubmitJsCode("return CheckValues()"); $oContainer->AddSubBlock($oForm); - $oMulticolumn = UIContentBlockUIBlockFactory::MakeStandard(); - $oMulticolumn->AddCSSClass('ibo-multi-column'); + $oMulticolumn = MultiColumnUIBlockFactory::MakeStandard(); $oForm->AddSubBlock($oMulticolumn); - $oColumn1 = UIContentBlockUIBlockFactory::MakeStandard(); - $oColumn1->AddCSSClass('ibo - column'); - $oMulticolumn->AddSubBlock($oColumn1); - $oFieldSelectClass = FieldUIBlockFactory::MakeFromObject(Dict::S('UI:CSVImport:SelectClass'), $oClassesSelect); $oFieldSelectClass->AddCSSClass('ibo-field-large'); - $oColumn1->AddSubBlock($oFieldSelectClass); - - $oColumn2 = UIContentBlockUIBlockFactory::MakeStandard(); - $oColumn2->AddCSSClass('ibo - column'); - $oMulticolumn->AddSubBlock($oColumn2); + $oMulticolumn->AddColumn(ColumnUIBlockFactory::MakeForBlock($oFieldSelectClass)); $oAdvancedMode = InputUIBlockFactory::MakeForInputWithLabel(Dict::S('UI:CSVImport:AdvancedMode'), "advanced", 1, '', 'checkbox'); $oAdvancedMode->GetInput()->SetIsChecked(($bAdvanced == 1)); $oAdvancedMode->SetBeforeInput(false); $oAdvancedMode->GetInput()->AddCSSClass('ibo-input-checkbox'); - $oColumn2->AddSubBlock($oAdvancedMode); + $oMulticolumn->AddColumn(ColumnUIBlockFactory::MakeForBlock($oAdvancedMode)); $oDivAdvancedHelp = UIContentBlockUIBlockFactory::MakeStandard("advanced_help")->AddCSSClass('ibo-is-hidden'); $oForm->AddSubBlock($oDivAdvancedHelp); @@ -1222,14 +1202,13 @@ EOF $oContainer = PanelUIBlockFactory::MakeNeutral(''); $oForm->AddSubBlock($oContainer); - $oMulticolumn = UIContentBlockUIBlockFactory::MakeStandard(); - $oMulticolumn->AddCSSClasses(['ibo-multi-column', 'wizContainer']); + $oMulticolumn = MultiColumnUIBlockFactory::MakeStandard(); + $oMulticolumn->AddCSSClass('wizContainer'); $oContainer->AddSubBlock($oMulticolumn); //SeparatorCharacter $oFieldSetSeparator = FieldSetUIBlockFactory::MakeStandard(Dict::S('UI:CSVImport:SeparatorCharacter')); - $oFieldSetSeparator->AddCSSClass('ibo - column'); - $oMulticolumn->AddSubBlock($oFieldSetSeparator); + $oMulticolumn->AddColumn(ColumnUIBlockFactory::MakeForBlock($oFieldSetSeparator)); $aSep = array( ';' => Dict::S('UI:CSVImport:SeparatorSemicolon+'), @@ -1260,8 +1239,7 @@ EOF //TextQualifierCharacter $oFieldSetTextQualifier = FieldSetUIBlockFactory::MakeStandard(Dict::S('UI:CSVImport:TextQualifierCharacter')); - $oFieldSetTextQualifier->AddCSSClass('ibo-column'); - $oMulticolumn->AddSubBlock($oFieldSetTextQualifier); + $oMulticolumn->AddColumn(ColumnUIBlockFactory::MakeForBlock($oFieldSetTextQualifier)); $aQualifiers = array( '"' => Dict::S('UI:CSVImport:QualifierDoubleQuote+'), @@ -1281,8 +1259,7 @@ EOF //CommentsAndHeader $oFieldSetCommentsAndHeader = FieldSetUIBlockFactory::MakeStandard(Dict::S('UI:CSVImport:CommentsAndHeader')); - $oFieldSetCommentsAndHeader->AddCSSClass('ibo-column'); - $oMulticolumn->AddSubBlock($oFieldSetCommentsAndHeader); + $oMulticolumn->AddColumn(ColumnUIBlockFactory::MakeForBlock($oFieldSetCommentsAndHeader)); $oCheckBoxHeader = InputUIBlockFactory::MakeForInputWithLabel(Dict::S('UI:CSVImport:TreatFirstLineAsHeader'), "header_line", "1", "box_header", "checkbox"); $oCheckBoxHeader->GetInput()->SetIsChecked(($bHeaderLine == 1)); @@ -1303,8 +1280,7 @@ EOF //date format $oFieldSetDate = FieldSetUIBlockFactory::MakeStandard(Dict::S('UI:CSVImport:DateAndTimeFormats')); - $oFieldSetDate->AddCSSClass('ibo-column'); - $oMulticolumn->AddSubBlock($oFieldSetDate); + $oMulticolumn->AddColumn(ColumnUIBlockFactory::MakeForBlock($oFieldSetDate)); $sDateTimeFormat = utils::ReadParam('date_time_format', 'default'); $sCustomDateTimeFormat = utils::ReadParam('custom_date_time_format', (string)AttributeDateTime::GetFormat(), false, 'raw_data'); diff --git a/sources/application/UI/Base/Layout/MultiColumn/Column/ColumnUIBlockFactory.php b/sources/application/UI/Base/Layout/MultiColumn/Column/ColumnUIBlockFactory.php new file mode 100644 index 000000000..2bc525e05 --- /dev/null +++ b/sources/application/UI/Base/Layout/MultiColumn/Column/ColumnUIBlockFactory.php @@ -0,0 +1,33 @@ +AddSubBlock($oBlock); + + return $oInput; + } +} \ No newline at end of file diff --git a/sources/application/UI/Base/Layout/MultiColumn/MultiColumnUIBlockFactory.php b/sources/application/UI/Base/Layout/MultiColumn/MultiColumnUIBlockFactory.php new file mode 100644 index 000000000..7cd958a17 --- /dev/null +++ b/sources/application/UI/Base/Layout/MultiColumn/MultiColumnUIBlockFactory.php @@ -0,0 +1,23 @@ +