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

N°4283 Fix some spacing/sizing issue on specific pages

Browse Source
This commit is contained in:
Stephen Abello
2021-11-25 09:58:24 +01:00
parent cb67dd1f1c
commit a141db4737
7 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pages/notifications.php
View File

@@ -51,9 +51,9 @@ $oP->AddTabContainer('Tabs_0');
$oP->SetCurrentTabContainer('Tabs_0');
$oP->SetCurrentTab('UI:NotificationsMenu:Triggers');
$oP->add('<h2>'.Dict::S('UI:NotificationsMenu:AvailableTriggers').'</h2>');
$oFilter = new DBObjectSearch('Trigger');
$aParams = array();
$aParams = array('panel_title' => Dict::S('UI:NotificationsMenu:AvailableTriggers'));
$oBlock = new DisplayBlock($oFilter, 'list', false, $aParams);
$oBlock->Display($oP, 'block_0', $aParams);
@@ -68,11 +68,11 @@ foreach(MetaModel::EnumChildClasses('Action', ENUM_CHILD_CLASSES_EXCLUDETOP) as
}
$oP->SetCurrentTab('UI:NotificationsMenu:Actions');
$sNbOfActionClassesTitle = '';
if (count($aActionClasses) == 1)
{
// Preserve old style
$oP->add('<h2>'.Dict::S('UI:NotificationsMenu:AvailableActions').'</h2>');
$sNbOfActionClassesTitle = Dict::S('UI:NotificationsMenu:AvailableActions');
}
$iBlock = 0;
@@ -81,11 +81,11 @@ foreach($aActionClasses as $sActionClass)
if (count($aActionClasses) > 1)
{
// New style
$oP->add('<h2>'.MetaModel::GetName($sActionClass).'</h2>');
$sNbOfActionClassesTitle = MetaModel::GetName($sActionClass);
}
$oFilter = new DBObjectSearch($sActionClass);
$oFilter->AddCondition('finalclass', $sActionClass); // derived classes will be further processed
$aParams = array();
$aParams = array('panel_title' => $sNbOfActionClassesTitle);
$oBlock = new DisplayBlock($oFilter, 'list', false, $aParams);
$oBlock->Display($oP, 'block_action_'.$iBlock, $aParams);
$iBlock++;

2
pages/run_query.php
View File

@@ -188,7 +188,7 @@ EOF
if (count($aArgs) > 0) {
//--- Query arguments
$oQueryForm->AddSubBlock(TitleUIBlockFactory::MakeNeutral(Dict::S('UI:RunQuery:QueryArguments'),2)->AddCSSClass("ibo-collapsible-section--title"));
$oQueryForm->AddSubBlock(TitleUIBlockFactory::MakeNeutral(Dict::S('UI:RunQuery:QueryArguments'), 3)->AddCSSClass("ibo-collapsible-section--title"));
$oQueryArgsContainer = UIContentBlockUIBlockFactory::MakeStandard(null,['wizContainer']);
$oQueryForm->AddSubBlock($oQueryArgsContainer);
foreach ($aArgs as $sParam => $sValue) {

6
pages/schema.php
View File

@@ -120,7 +120,7 @@ function DisplayLifecycle($oPage, $sClass)
{
$aStates = MetaModel::EnumStates($sClass);
$aStimuli = MetaModel::EnumStimuli($sClass);
$oPage->add("<img id=\"img-lifecycle\" attr=\"$sClass lifecycle graph\" src=\"".utils::GetAbsoluteUrlAppRoot()."pages/graphviz.php?class=$sClass\">\n");
$oPage->add("<img id=\"img-lifecycle\" class=\"ibo-datamodel-viewer--lifecycle-image\" attr=\"$sClass lifecycle graph\" src=\"".utils::GetAbsoluteUrlAppRoot()."pages/graphviz.php?class=$sClass\">\n");
$oPage->add_ready_script(
<<<EOF
$("#img-lifecycle").attr('href',$("#img-lifecycle").attr('src'));
@@ -146,7 +146,7 @@ JS
);
$oPage->AddUiBlock($oOpenAllButton);
$oPage->AddUiBlock($oCloseAllButton);
$oPage->add("<h3>".Dict::S('UI:Schema:LifeCycleTransitions')."</h3>\n");
$oPage->AddUiBlock(TitleUIBlockFactory::MakeNeutral(Dict::S('UI:Schema:LifeCycleTransitions'), 3));
$oPage->add("<ul id=\"LifeCycleList\" >\n");
foreach ($aStates as $sStateCode => $aStateDef)
{
@@ -193,7 +193,7 @@ JS
$oPage->add("</ul></li>\n");
}
$oPage->add("</ul>\n");
$oPage->add("<h3>".Dict::S('UI:Schema:LifeCyleAttributeOptions')."</h3>\n");
$oPage->AddUiBlock(TitleUIBlockFactory::MakeNeutral(Dict::S('UI:Schema:LifeCyleAttributeOptions'), 3));
$oPage->add("<ul id=\"LifeCycleAttrOptList\">\n");
foreach ($aStates as $sStateCode => $aStateDef)
{