diff --git a/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml b/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml index 7b0c47349..3fcb41507 100755 --- a/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml +++ b/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml @@ -227,10 +227,13 @@ foreach ($aSearches as $sSubClass => $oSearch) { $sBlockId = __class__.'_opened_'.$sSubClass; - - $oPage->AddUiBlock(\Combodo\iTop\Application\UI\Base\Component\Title\TitleUIBlockFactory::MakeNeutral(MetaModel::GetName($sSubClass), 2)); $oBlock = new DisplayBlock($oSearch, 'list', false); - $oBlock->Display($oPage, $sBlockId, array('menu' => false)); + $oBlock->Display($oPage, $sBlockId, array( + 'menu' => false, + 'panel_title' => MetaModel::GetName($sSubClass), + 'panel_icon' => MetaModel::GetClassIcon($sSubClass, false) + ) + ); } } }]]> @@ -5139,7 +5142,12 @@ $oIfFilter = DBObjectSearch::FromOQL("SELECT IPInterface AS if WHERE INET_ATON(if.ipaddress) >= INET_ATON('$sIPMin') AND INET_ATON(if.ipaddress) <= INET_ATON('$sIPMax')"); $oIfSet = new CMDBObjectSet($oIfFilter); $oBlock = new DisplayBlock($oIfFilter, 'list', false); - $oBlock->Display($oPage, 'nwif', array('menu' => false)); + $oBlock->Display($oPage, 'nwif', array( + 'menu' => false, + 'panel_title' => MetaModel::GetName('IPInterface'), + 'panel_icon' => MetaModel::GetClassIcon('IPInterface', false) + ) + ); $iCountUsed = $oIfSet->Count(); $iCountRange = $iIPMax - $iIPMin; // On 32-bit systems the substraction will be computed using floats for values greater than PHP_MAX_INT; diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/en.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/en.dict.itop-config-mgmt.php index 2289bac87..386677210 100644 --- a/datamodels/2.x/itop-config-mgmt/dictionaries/en.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/dictionaries/en.dict.itop-config-mgmt.php @@ -132,6 +132,7 @@ Dict::Add('EN US', 'English', 'English', array( 'Class:FunctionalCI/Attribute:finalclass' => 'CI sub-class', 'Class:FunctionalCI/Attribute:finalclass+' => 'Name of the final class', 'Class:FunctionalCI/Tab:OpenedTickets' => 'Active Tickets', + 'Class:FunctionalCI/Tab:OpenedTickets+' => 'Active Tickets which are impacting this functional CI', )); // @@ -1522,6 +1523,7 @@ Dict::Add('EN US', 'English', 'English', array( 'Server:otherinfo' => 'Other information', 'Server:power' => 'Power supply', 'Class:Subnet/Tab:IPUsage' => 'IP Usage', + 'Class:Subnet/Tab:IPUsage+' => 'Which IP within this Subnet are used or not', 'Class:Subnet/Tab:IPUsage-explain' => 'Interfaces having an IP in the range: %1$s to %2$s', 'Class:Subnet/Tab:FreeIPs' => 'Free IPs', 'Class:Subnet/Tab:FreeIPs-count' => 'Free IPs: %1$s', diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/fr.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/fr.dict.itop-config-mgmt.php index e2f4c4343..4d8db1395 100644 --- a/datamodels/2.x/itop-config-mgmt/dictionaries/fr.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/dictionaries/fr.dict.itop-config-mgmt.php @@ -127,6 +127,7 @@ Dict::Add('FR FR', 'French', 'Français', array( 'Class:FunctionalCI/Attribute:finalclass' => 'Sous-classe de CI', 'Class:FunctionalCI/Attribute:finalclass+' => 'Nom de la classe instanciable', 'Class:FunctionalCI/Tab:OpenedTickets' => 'Tickets en cours', + 'Class:FunctionalCI/Tab:OpenedTickets+' => 'Tickets ouverts impactant cet élément de configuration', )); // @@ -1502,6 +1503,7 @@ Dict::Add('FR FR', 'French', 'Français', array( 'Server:otherinfo' => 'Autres informations', 'Server:power' => 'Alimentation électrique', 'Class:Subnet/Tab:IPUsage' => 'IP utilisées', + 'Class:Subnet/Tab:IPUsage+' => 'Utilisation des IPs de ce subnet', 'Class:Subnet/Tab:IPUsage-explain' => 'Interfaces ayant une IP dans la plage: %1$s à %2$s', 'Class:Subnet/Tab:FreeIPs' => 'IP disponibles', 'Class:Subnet/Tab:FreeIPs-count' => 'IP disponibles: %1$s',