N°9347 - Enable icon of some CIs by instance

datamodels/2.x/itop-config-mgmt/dictionaries/cs.dict.itop-config-mgmt.php

@@ -1528,6 +1528,12 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', [
 // Add translation for Fieldsets
 
 Dict::Add('CS CZ', 'Czech', 'Čeština', [
+	'ConfigMgnt:baseinfo' => 'General~~',
+	'ConfigMgnt:moreinfo' => 'CI specifics~~',
+	'Storage:moreinfo' => 'Storage specifics~~',
+	'ConfigMgnt:otherinfo' => 'Dates and description~~',
+	'Software:moreinfo' => 'Software specifics~~',
+	'Phone:moreinfo' => 'Phone specifics~~',
 	'Server:baseinfo' => 'Obecné informace',
 	'Server:Date' => 'Data',
 	'Server:moreinfo' => 'Více informací',

datamodels/2.x/itop-config-mgmt/dictionaries/da.dict.itop-config-mgmt.php

@@ -1527,6 +1527,12 @@ Dict::Add('DA DA', 'Danish', 'Dansk', [
 // Add translation for Fieldsets
 
 Dict::Add('DA DA', 'Danish', 'Dansk', [
+	'ConfigMgnt:baseinfo' => 'General~~',
+	'ConfigMgnt:moreinfo' => 'CI specifics~~',
+	'Storage:moreinfo' => 'Storage specifics~~',
+	'ConfigMgnt:otherinfo' => 'Dates and description~~',
+	'Software:moreinfo' => 'Software specifics~~',
+	'Phone:moreinfo' => 'Phone specifics~~',
 	'Server:baseinfo' => 'Almindelig Informationen',
 	'Server:Date' => 'Dato',
 	'Server:moreinfo' => 'Yderligere Information',

datamodels/2.x/itop-config-mgmt/dictionaries/de.dict.itop-config-mgmt.php

@@ -1527,6 +1527,12 @@ Dict::Add('DE DE', 'German', 'Deutsch', [
 // Add translation for Fieldsets
 
 Dict::Add('DE DE', 'German', 'Deutsch', [
+	'ConfigMgnt:baseinfo' => 'General~~',
+	'ConfigMgnt:moreinfo' => 'CI specifics~~',
+	'Storage:moreinfo' => 'Storage specifics~~',
+	'ConfigMgnt:otherinfo' => 'Dates and description~~',
+	'Software:moreinfo' => 'Software specifics~~',
+	'Phone:moreinfo' => 'Phone specifics~~',
 	'Server:baseinfo' => 'Allgemeine Informationen',
 	'Server:Date' => 'Datum',
 	'Server:moreinfo' => 'Weitere Informationen',

datamodels/2.x/itop-config-mgmt/dictionaries/en.dict.itop-config-mgmt.php

@@ -57,26 +57,7 @@ Dict::Add('EN US', 'English', 'English', [
 //////////////////////////////////////////////////////////////////////
 // Classes in 'bizmodel'
 //////////////////////////////////////////////////////////////////////
-//
 
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-// Class:<class_name>/UniquenessRule:<rule_code>
-// Class:<class_name>/UniquenessRule:<rule_code>+
-
-//////////////////////////////////////////////////////////////////////
-// Note: The classes have been grouped by categories: bizmodel
-//////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////
-// Classes in 'bizmodel'
-//////////////////////////////////////////////////////////////////////
 //
 
 //
@@ -1535,6 +1516,17 @@ Dict::Add('EN US', 'English', 'English', [
 	'Class:Group/Attribute:parent_id_friendlyname+' => '',
 ]);
 
+//
+// Class: PhysicalInterface
+//
+
+Dict::Add('EN US', 'English', 'English', [
+	'Class:PhysicalInterface/Attribute:org_id' => 'Org id',
+	'Class:PhysicalInterface/Attribute:org_id+' => '',
+	'Class:PhysicalInterface/Attribute:location_id' => 'Location id',
+	'Class:PhysicalInterface/Attribute:location_id+' => '',
+]);
+
 //
 // Class: lnkGroupToCI
 //
@@ -1555,23 +1547,6 @@ Dict::Add('EN US', 'English', 'English', [
 	'Class:lnkGroupToCI/Attribute:reason+' => '',
 ]);
 
-// Add translation for Fieldsets
-
-Dict::Add('EN US', 'English', 'English', [
-	'Server:baseinfo' => 'General information',
-	'Server:Date' => 'Dates',
-	'Server:moreinfo' => 'More information',
-	'Server:otherinfo' => 'Other information',
-	'Server:power' => 'Power supply',
-	'Class:Subnet/Tab:IPUsage' => 'IP Usage',
-	'Class:Subnet/Tab:IPUsage+' => 'Which IP within this Subnet is used or not',
-	'Class:Subnet/Tab:IPUsage-explain' => 'Interfaces having an IP in the range: <em>%1$s</em> to <em>%2$s</em>',
-	'Class:Subnet/Tab:FreeIPs' => 'Free IPs',
-	'Class:Subnet/Tab:FreeIPs-count' => 'Free IPs: %1$s',
-	'Class:Subnet/Tab:FreeIPs-explain' => 'Here is an extract of 10 free IP addresses',
-	'Class:Document:PreviewTab' => 'Preview',
-]);
-
 //
 // Class: lnkDocumentToFunctionalCI
 //
@@ -1590,6 +1565,29 @@ Dict::Add('EN US', 'English', 'English', [
 	'Class:lnkDocumentToFunctionalCI/Attribute:document_name+' => '',
 ]);
 
+// Add translation for Fieldsets
+
+Dict::Add('EN US', 'English', 'English', [
+	'ConfigMgnt:baseinfo' => 'General',
+	'ConfigMgnt:moreinfo' => 'CI specifics',
+	'ConfigMgnt:otherinfo' => 'Dates and description',
+	'Storage:moreinfo' => 'Storage specifics',
+	'Software:moreinfo' => 'Software specifics',
+	'Phone:moreinfo' => 'Phone specifics',
+	'Server:baseinfo' => 'General',
+	'Server:moreinfo' => 'Device specifics',
+	'Server:Date' => 'Dates',
+	'Server:otherinfo' => 'Description',
+	'Server:power' => 'Power supply',
+	'Class:Subnet/Tab:IPUsage' => 'IP Usage',
+	'Class:Subnet/Tab:IPUsage+' => 'Which IP within this Subnet is used or not',
+	'Class:Subnet/Tab:IPUsage-explain' => 'Interfaces having an IP in the range: <em>%1$s</em> to <em>%2$s</em>',
+	'Class:Subnet/Tab:FreeIPs' => 'Free IPs',
+	'Class:Subnet/Tab:FreeIPs-count' => 'Free IPs: %1$s',
+	'Class:Subnet/Tab:FreeIPs-explain' => 'Here is an extract of 10 free IP addresses',
+	'Class:Document:PreviewTab' => 'Preview',
+]);
+
 //
 // Application Menu
 //
@@ -1640,14 +1638,3 @@ Dict::Add('EN US', 'English', 'English', [
 	'Menu:Software' => 'Software catalog',
 	'Menu:Software+' => 'Software catalog',
 ]);
-
-//
-// Class: PhysicalInterface
-//
-
-Dict::Add('EN US', 'English', 'English', [
-	'Class:PhysicalInterface/Attribute:org_id' => 'Org id',
-	'Class:PhysicalInterface/Attribute:org_id+' => '',
-	'Class:PhysicalInterface/Attribute:location_id' => 'Location id',
-	'Class:PhysicalInterface/Attribute:location_id+' => '',
-]);

datamodels/2.x/itop-config-mgmt/dictionaries/en_gb.dict.itop-config-mgmt.php

@@ -59,26 +59,6 @@ Dict::Add('EN GB', 'British English', 'British English', [
 //////////////////////////////////////////////////////////////////////
 //
 
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-// Class:<class_name>/UniquenessRule:<rule_code>
-// Class:<class_name>/UniquenessRule:<rule_code>+
-
-//////////////////////////////////////////////////////////////////////
-// Note: The classes have been grouped by categories: bizmodel
-//////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////
-// Classes in 'bizmodel'
-//////////////////////////////////////////////////////////////////////
-//
-
 //
 // Class: lnkContactToFunctionalCI
 //
@@ -1548,10 +1528,16 @@ Dict::Add('EN GB', 'British English', 'British English', [
 // Add translation for Fieldsets
 
 Dict::Add('EN GB', 'British English', 'British English', [
-	'Server:baseinfo' => 'General information',
+	'ConfigMgnt:baseinfo' => 'General',
+	'ConfigMgnt:moreinfo' => 'CI specifics',
+	'ConfigMgnt:otherinfo' => 'Dates and description',
+	'Storage:moreinfo' => 'Storage specifics',
+	'Software:moreinfo' => 'Software specifics~~',
+	'Phone:moreinfo' => 'Phone specifics~~',
+	'Server:baseinfo' => 'General',
+	'Server:moreinfo' => 'Device specifics',
 	'Server:Date' => 'Dates',
-	'Server:moreinfo' => 'More information',
-	'Server:otherinfo' => 'Other information',
+	'Server:otherinfo' => 'Description',
 	'Server:power' => 'Power supply',
 	'Class:Subnet/Tab:IPUsage' => 'IP Usage',
 	'Class:Subnet/Tab:IPUsage+' => 'Which IP within this Subnet is used or not',

datamodels/2.x/itop-config-mgmt/dictionaries/es_cr.dict.itop-config-mgmt.php

@@ -1524,6 +1524,12 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 // Add translation for Fieldsets
 
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
+	'ConfigMgnt:baseinfo' => 'General~~',
+	'ConfigMgnt:moreinfo' => 'CI specifics~~',
+	'Storage:moreinfo' => 'Storage specifics~~',
+	'ConfigMgnt:otherinfo' => 'Dates and description~~',
+	'Software:moreinfo' => 'Software specifics~~',
+	'Phone:moreinfo' => 'Phone specifics~~',
 	'Server:baseinfo' => 'Información General',
 	'Server:Date' => 'Fecha',
 	'Server:moreinfo' => 'Más Información',

datamodels/2.x/itop-config-mgmt/dictionaries/fr.dict.itop-config-mgmt.php

@@ -36,23 +36,6 @@ Dict::Add('FR FR', 'French', 'Français', [
 // Class:<class_name>/UniquenessRule:<rule_code>
 // Class:<class_name>/UniquenessRule:<rule_code>+
 
-//////////////////////////////////////////////////////////////////////
-// Classes in 'bizmodel'
-//////////////////////////////////////////////////////////////////////
-//
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-// Class:<class_name>/UniquenessRule:<rule_code>
-// Class:<class_name>/UniquenessRule:<rule_code>+
-
 //////////////////////////////////////////////////////////////////////
 // Note: The classes have been grouped by categories: bizmodel
 //////////////////////////////////////////////////////////////////////
@@ -1685,6 +1668,17 @@ Dict::Add('FR FR', 'French', 'Français', [
 	'Class:Group/Attribute:parent_id_friendlyname+' => '',
 ]);
 
+//
+// Class: PhysicalInterface
+//
+
+Dict::Add('FR FR', 'French', 'Français', [
+	'Class:PhysicalInterface/Attribute:org_id' => 'Organisation',
+	'Class:PhysicalInterface/Attribute:org_id+' => '',
+	'Class:PhysicalInterface/Attribute:location_id' => 'Site',
+	'Class:PhysicalInterface/Attribute:location_id+' => '',
+]);
+
 //
 // Class: lnkGroupToCI
 //
@@ -1705,23 +1699,6 @@ Dict::Add('FR FR', 'French', 'Français', [
 	'Class:lnkGroupToCI/Attribute:reason+' => '',
 ]);
 
-// Add translation for Fieldsets
-
-Dict::Add('FR FR', 'French', 'Français', [
-	'Server:baseinfo' => 'Informations générales',
-	'Server:Date' => 'Dates',
-	'Server:moreinfo' => 'Informations complémentaires',
-	'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: <em>%1$s</em> à <em>%2$s</em>',
-	'Class:Subnet/Tab:FreeIPs' => 'IP disponibles',
-	'Class:Subnet/Tab:FreeIPs-count' => 'IP disponibles: %1$s',
-	'Class:Subnet/Tab:FreeIPs-explain' => 'Voici un échantillon de dix addresses IP disponibles',
-	'Class:Document:PreviewTab' => 'Aperçu',
-]);
-
 //
 // Class: lnkDocumentToFunctionalCI
 //
@@ -1740,6 +1717,29 @@ Dict::Add('FR FR', 'French', 'Français', [
 	'Class:lnkDocumentToFunctionalCI/Attribute:document_name+' => '',
 ]);
 
+// Add translation for Fieldsets
+
+Dict::Add('FR FR', 'French', 'Français', [
+	'ConfigMgnt:baseinfo' => 'Informations générales',
+	'Server:baseinfo' => 'Informations générales',
+	'ConfigMgnt:moreinfo' => 'Item spécifique',
+	'Server:moreinfo' => 'Matériel spécifique',
+	'Storage:moreinfo' => 'Stockage spécifique',
+	'Software:moreinfo' => 'Logiciel spécifique',
+	'Phone:moreinfo' => 'Téléphone spécifique',
+	'ConfigMgnt:otherinfo' => 'Dates et description',
+	'Server:Date' => 'Dates',
+	'Server:otherinfo' => 'Description',
+	'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: <em>%1$s</em> à <em>%2$s</em>',
+	'Class:Subnet/Tab:FreeIPs' => 'IP disponibles',
+	'Class:Subnet/Tab:FreeIPs-count' => 'IP disponibles: %1$s',
+	'Class:Subnet/Tab:FreeIPs-explain' => 'Voici un échantillon de dix addresses IP disponibles',
+	'Class:Document:PreviewTab' => 'Aperçu',
+]);
+
 //
 // Application Menu
 //
@@ -1790,14 +1790,3 @@ Dict::Add('FR FR', 'French', 'Français', [
 	'Menu:Software' => 'Catalogue des logiciels de références',
 	'Menu:Software+' => 'Catalogue des logiciels de références',
 ]);
-
-//
-// Class: PhysicalInterface
-//
-
-Dict::Add('FR FR', 'French', 'Français', [
-	'Class:PhysicalInterface/Attribute:org_id' => 'Organisation',
-	'Class:PhysicalInterface/Attribute:org_id+' => '',
-	'Class:PhysicalInterface/Attribute:location_id' => 'Site',
-	'Class:PhysicalInterface/Attribute:location_id+' => '',
-]);

datamodels/2.x/itop-config-mgmt/dictionaries/hu.dict.itop-config-mgmt.php

@@ -1526,10 +1526,16 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', [
 // Add translation for Fieldsets
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', [
+	'ConfigMgnt:baseinfo' => 'General~~',
+	'ConfigMgnt:moreinfo' => 'CI specifics~~',
+	'Storage:moreinfo' => 'Storage specifics~~',
+	'ConfigMgnt:otherinfo' => 'Dates and description~~',
+	'Software:moreinfo' => 'Software specifics~~',
+	'Phone:moreinfo' => 'Phone specifics~~',
 	'Server:baseinfo' => 'Általános információ',
 	'Server:Date' => 'Dátumok',
 	'Server:moreinfo' => 'További információ',
-	'Server:otherinfo' => 'Other information~~',
+	'Server:otherinfo' => 'Description~~',
 	'Server:power' => 'Áramforrás',
 	'Class:Subnet/Tab:IPUsage' => 'IP felhasználás',
 	'Class:Subnet/Tab:IPUsage+' => 'Which IP within this Subnet is used or not~~',

datamodels/2.x/itop-config-mgmt/dictionaries/it.dict.itop-config-mgmt.php

@@ -1547,6 +1547,12 @@ Dict::Add('IT IT', 'Italian', 'Italiano', [
 // Add translation for Fieldsets
 
 Dict::Add('IT IT', 'Italian', 'Italiano', [
+	'ConfigMgnt:baseinfo' => 'General~~',
+	'ConfigMgnt:moreinfo' => 'CI specifics~~',
+	'Storage:moreinfo' => 'Storage specifics~~',
+	'ConfigMgnt:otherinfo' => 'Dates and description~~',
+	'Software:moreinfo' => 'Software specifics~~',
+	'Phone:moreinfo' => 'Phone specifics~~',
 	'Server:baseinfo' => 'Informazioni generali',
 	'Server:Date' => 'Date',
 	'Server:moreinfo' => 'Ulteriori informazioni',

datamodels/2.x/itop-config-mgmt/dictionaries/ja.dict.itop-config-mgmt.php

@@ -1526,6 +1526,12 @@ Dict::Add('JA JP', 'Japanese', '日本語', [
 // Add translation for Fieldsets
 
 Dict::Add('JA JP', 'Japanese', '日本語', [
+	'ConfigMgnt:baseinfo' => 'General~~',
+	'ConfigMgnt:moreinfo' => 'CI specifics~~',
+	'Storage:moreinfo' => 'Storage specifics~~',
+	'ConfigMgnt:otherinfo' => 'Dates and description~~',
+	'Software:moreinfo' => 'Software specifics~~',
+	'Phone:moreinfo' => 'Phone specifics~~',
 	'Server:baseinfo' => '基本情報',
 	'Server:Date' => '日付',
 	'Server:moreinfo' => '追加情報',

datamodels/2.x/itop-config-mgmt/dictionaries/nl.dict.itop-config-mgmt.php

@@ -1528,6 +1528,12 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 // Add translation for Fieldsets
 
 Dict::Add('NL NL', 'Dutch', 'Nederlands', [
+	'ConfigMgnt:baseinfo' => 'General~~',
+	'ConfigMgnt:moreinfo' => 'CI specifics~~',
+	'Storage:moreinfo' => 'Storage specifics~~',
+	'ConfigMgnt:otherinfo' => 'Dates and description~~',
+	'Software:moreinfo' => 'Software specifics~~',
+	'Phone:moreinfo' => 'Phone specifics~~',
 	'Server:baseinfo' => 'Globale informatie',
 	'Server:Date' => 'Datum',
 	'Server:moreinfo' => 'Meer informatie',

datamodels/2.x/itop-config-mgmt/dictionaries/pl.dict.itop-config-mgmt.php

@@ -1526,6 +1526,12 @@ Dict::Add('PL PL', 'Polish', 'Polski', [
 // Add translation for Fieldsets
 
 Dict::Add('PL PL', 'Polish', 'Polski', [
+	'ConfigMgnt:baseinfo' => 'General~~',
+	'ConfigMgnt:moreinfo' => 'CI specifics~~',
+	'Storage:moreinfo' => 'Storage specifics~~',
+	'ConfigMgnt:otherinfo' => 'Dates and description~~',
+	'Software:moreinfo' => 'Software specifics~~',
+	'Phone:moreinfo' => 'Phone specifics~~',
 	'Server:baseinfo' => 'Informacje ogólne',
 	'Server:Date' => 'Daty',
 	'Server:moreinfo' => 'Więcej informacji',

datamodels/2.x/itop-config-mgmt/dictionaries/pt_br.dict.itop-config-mgmt.php

@@ -1526,6 +1526,12 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', [
 // Add translation for Fieldsets
 
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', [
+	'ConfigMgnt:baseinfo' => 'General~~',
+	'ConfigMgnt:moreinfo' => 'CI specifics~~',
+	'Storage:moreinfo' => 'Storage specifics~~',
+	'ConfigMgnt:otherinfo' => 'Dates and description~~',
+	'Software:moreinfo' => 'Software specifics~~',
+	'Phone:moreinfo' => 'Phone specifics~~',
 	'Server:baseinfo' => 'Informações gerais',
 	'Server:Date' => 'Data',
 	'Server:moreinfo' => 'Mais informações',

datamodels/2.x/itop-config-mgmt/dictionaries/ru.dict.itop-config-mgmt.php

@@ -1527,6 +1527,12 @@ Dict::Add('RU RU', 'Russian', 'Русский', [
 // Add translation for Fieldsets
 
 Dict::Add('RU RU', 'Russian', 'Русский', [
+	'ConfigMgnt:baseinfo' => 'General~~',
+	'ConfigMgnt:moreinfo' => 'CI specifics~~',
+	'Storage:moreinfo' => 'Storage specifics~~',
+	'ConfigMgnt:otherinfo' => 'Dates and description~~',
+	'Software:moreinfo' => 'Software specifics~~',
+	'Phone:moreinfo' => 'Phone specifics~~',
 	'Server:baseinfo' => 'Основное',
 	'Server:Date' => 'Даты',
 	'Server:moreinfo' => 'Спецификация',

datamodels/2.x/itop-config-mgmt/dictionaries/sk.dict.itop-config-mgmt.php

@@ -1526,6 +1526,12 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', [
 // Add translation for Fieldsets
 
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', [
+	'ConfigMgnt:baseinfo' => 'General~~',
+	'ConfigMgnt:moreinfo' => 'CI specifics~~',
+	'Storage:moreinfo' => 'Storage specifics~~',
+	'ConfigMgnt:otherinfo' => 'Dates and description~~',
+	'Software:moreinfo' => 'Software specifics~~',
+	'Phone:moreinfo' => 'Phone specifics~~',
 	'Server:baseinfo' => 'Všeobecné informácie',
 	'Server:Date' => 'Dátum',
 	'Server:moreinfo' => 'Viac informácií',

datamodels/2.x/itop-config-mgmt/dictionaries/tr.dict.itop-config-mgmt.php

@@ -1527,6 +1527,12 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', [
 // Add translation for Fieldsets
 
 Dict::Add('TR TR', 'Turkish', 'Türkçe', [
+	'ConfigMgnt:baseinfo' => 'General~~',
+	'ConfigMgnt:moreinfo' => 'CI specifics~~',
+	'Storage:moreinfo' => 'Storage specifics~~',
+	'ConfigMgnt:otherinfo' => 'Dates and description~~',
+	'Software:moreinfo' => 'Software specifics~~',
+	'Phone:moreinfo' => 'Phone specifics~~',
 	'Server:baseinfo' => 'Genel Bilgi',
 	'Server:Date' => 'Tarihler',
 	'Server:moreinfo' => 'Daha fazla bilgi',

datamodels/2.x/itop-config-mgmt/dictionaries/zh_cn.dict.itop-config-mgmt.php

@@ -1543,6 +1543,12 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 // Add translation for Fieldsets
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
+	'ConfigMgnt:baseinfo' => 'General~~',
+	'ConfigMgnt:moreinfo' => 'CI specifics~~',
+	'Storage:moreinfo' => 'Storage specifics~~',
+	'ConfigMgnt:otherinfo' => 'Dates and description~~',
+	'Software:moreinfo' => 'Software specifics~~',
+	'Phone:moreinfo' => 'Phone specifics~~',
 	'Server:baseinfo' => '基本信息',
 	'Server:Date' => '日期',
 	'Server:moreinfo' => '更多信息',

datamodels/2.x/itop-container-mgmt/datamodel.itop-container-mgmt.xml

@@ -228,6 +228,10 @@
             <attribute id="containervirtualhost_id_friendlyname"/>
           </complementary_attributes>
         </naming>
+        <fields_semantic>
+          <state_attribute>status</state_attribute>
+          <image_attribute>logo</image_attribute>
+        </fields_semantic>
         <reconciliation>
           <attributes>
             <attribute id="name"/>
@@ -235,9 +239,6 @@
              <attribute id="finalclass"/>
           </attributes>
         </reconciliation>
-        <fields_semantic>
-          <state_attribute>status</state_attribute>
-        </fields_semantic>
         <style>
           <icon>images/icons8-application-container.svg</icon>
         </style>
@@ -255,6 +256,13 @@
           <on_target_delete>DEL_AUTO</on_target_delete>
           <tracking_level>all</tracking_level>
         </field>
+        <field id="logo" xsi:type="AttributeImage">
+          <display_max_width>96</display_max_width>
+          <display_max_height>96</display_max_height>
+          <storage_max_width>128</storage_max_width>
+          <storage_max_height>128</storage_max_height>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
         <field id="containerimages_list" xsi:type="AttributeLinkedSetIndirect">
           <linked_class>lnkContainerApplicationToImage</linked_class>
           <ext_key_to_me>containerapplication_id</ext_key_to_me>
@@ -357,9 +365,12 @@
                     <item id="move2production">
                       <rank>50</rank>
                     </item>
-                    <item id="description">
+                    <item id="logo">
                       <rank>60</rank>
                     </item>
+                    <item id="description">
+                      <rank>70</rank>
+                    </item>
                   </items>
                   <rank>10</rank>
                 </item>

datamodels/2.x/itop-datacenter-mgmt/datamodel.itop-datacenter-mgmt.xml

@@ -57,47 +57,77 @@
       <presentation>
         <details>
           <items>
-            <item id="name">
+            <item id="col:col1">
               <rank>10</rank>
+              <items>
+                <item id="fieldset:Server:baseinfo">
+                  <rank>10</rank>
+                  <items>
+                    <item id="name">
+                      <rank>10</rank>
+                    </item>
+                    <item id="org_id">
+                      <rank>20</rank>
+                    </item>
+                    <item id="status">
+                      <rank>30</rank>
+                    </item>
+                    <item id="business_criticity">
+                      <rank>40</rank>
+                    </item>
+                    <item id="location_id">
+                      <rank>50</rank>
+                    </item>
+                  </items>
+                </item>
+                <item id="fieldset:Server:moreinfo">
+                  <rank>20</rank>
+                  <items>
+                    <item id="brand_id">
+                      <rank>60</rank>
+                    </item>
+                    <item id="model_id">
+                      <rank>70</rank>
+                    </item>
+                    <item id="nb_u">
+                      <rank>80</rank>
+                    </item>
+                    <item id="serialnumber">
+                      <rank>90</rank>
+                    </item>
+                    <item id="asset_number">
+                      <rank>100</rank>
+                    </item>
+                  </items>
+                </item>
+              </items>
             </item>
-            <item id="org_id">
+            <item id="col:col2">
               <rank>20</rank>
-            </item>
-            <item id="status">
-              <rank>30</rank>
-            </item>
-            <item id="business_criticity">
-              <rank>40</rank>
-            </item>
-            <item id="location_id">
-              <rank>50</rank>
-            </item>
-            <item id="brand_id">
-              <rank>60</rank>
-            </item>
-            <item id="model_id">
-              <rank>70</rank>
-            </item>
-            <item id="nb_u">
-              <rank>80</rank>
-            </item>
-            <item id="serialnumber">
-              <rank>90</rank>
-            </item>
-            <item id="asset_number">
-              <rank>100</rank>
-            </item>
-            <item id="move2production">
-              <rank>110</rank>
-            </item>
-            <item id="purchase_date">
-              <rank>120</rank>
-            </item>
-            <item id="end_of_warranty">
-              <rank>130</rank>
-            </item>
-            <item id="description">
-              <rank>140</rank>
+              <items>
+                <item id="fieldset:Server:Date">
+                  <rank>10</rank>
+                  <items>
+                    <item id="move2production">
+                      <rank>110</rank>
+                    </item>
+                    <item id="purchase_date">
+                      <rank>120</rank>
+                    </item>
+                    <item id="end_of_warranty">
+                      <rank>130</rank>
+                    </item>
+                  </items>
+                </item>
+                <item id="fieldset:Server:otherinfo">
+                  <rank>20</rank>
+                  <items>
+                    <item id="description">
+                      <rank>140</rank>
+                    </item>
+                  </items>
+                </item>
+              </items>
             </item>
             <item id="contacts_list">
               <rank>150</rank>
@@ -257,50 +287,80 @@
       <presentation>
         <details>
           <items>
-            <item id="name">
+            <item id="col:col1">
               <rank>10</rank>
+              <items>
+                <item id="fieldset:Server:baseinfo">
+                  <rank>10</rank>
+                  <items>
+                    <item id="name">
+                      <rank>10</rank>
+                    </item>
+                    <item id="org_id">
+                      <rank>20</rank>
+                    </item>
+                    <item id="status">
+                      <rank>30</rank>
+                    </item>
+                    <item id="business_criticity">
+                      <rank>40</rank>
+                    </item>
+                    <item id="location_id">
+                      <rank>50</rank>
+                    </item>
+                    <item id="rack_id">
+                      <rank>60</rank>
+                    </item>
+                  </items>
+                </item>
+                <item id="fieldset:Server:moreinfo">
+                  <rank>20</rank>
+                  <items>
+                    <item id="brand_id">
+                      <rank>70</rank>
+                    </item>
+                    <item id="model_id">
+                      <rank>80</rank>
+                    </item>
+                    <item id="nb_u">
+                      <rank>90</rank>
+                    </item>
+                    <item id="serialnumber">
+                      <rank>100</rank>
+                    </item>
+                    <item id="asset_number">
+                      <rank>110</rank>
+                    </item>
+                  </items>
+                </item>
+              </items>
             </item>
-            <item id="org_id">
+            <item id="col:col2">
               <rank>20</rank>
-            </item>
-            <item id="status">
-              <rank>30</rank>
-            </item>
-            <item id="business_criticity">
-              <rank>40</rank>
-            </item>
-            <item id="location_id">
-              <rank>50</rank>
-            </item>
-            <item id="rack_id">
-              <rank>60</rank>
-            </item>
-            <item id="brand_id">
-              <rank>70</rank>
-            </item>
-            <item id="model_id">
-              <rank>80</rank>
-            </item>
-            <item id="nb_u">
-              <rank>90</rank>
-            </item>
-            <item id="serialnumber">
-              <rank>100</rank>
-            </item>
-            <item id="asset_number">
-              <rank>110</rank>
-            </item>
-            <item id="move2production">
-              <rank>120</rank>
-            </item>
-            <item id="purchase_date">
-              <rank>130</rank>
-            </item>
-            <item id="end_of_warranty">
-              <rank>140</rank>
-            </item>
-            <item id="description">
-              <rank>150</rank>
+              <items>
+                <item id="fieldset:Server:Date">
+                  <rank>10</rank>
+                  <items>
+                    <item id="move2production">
+                      <rank>120</rank>
+                    </item>
+                    <item id="purchase_date">
+                      <rank>130</rank>
+                    </item>
+                    <item id="end_of_warranty">
+                      <rank>140</rank>
+                    </item>
+                  </items>
+                </item>
+                <item id="fieldset:Server:otherinfo">
+                  <rank>20</rank>
+                  <items>
+                    <item id="description">
+                      <rank>150</rank>
+                    </item>
+                  </items>
+                </item>
+              </items>
             </item>
             <item id="contacts_list">
               <rank>160</rank>
@@ -440,44 +500,74 @@
       <presentation>
         <details>
           <items>
-            <item id="name">
+            <item id="col:col1">
               <rank>10</rank>
+              <items>
+                <item id="fieldset:Server:baseinfo">
+                  <rank>10</rank>
+                  <items>
+                    <item id="name">
+                      <rank>10</rank>
+                    </item>
+                    <item id="org_id">
+                      <rank>20</rank>
+                    </item>
+                    <item id="status">
+                      <rank>30</rank>
+                    </item>
+                    <item id="business_criticity">
+                      <rank>40</rank>
+                    </item>
+                    <item id="location_id">
+                      <rank>50</rank>
+                    </item>
+                  </items>
+                </item>
+                <item id="fieldset:Server:moreinfo">
+                  <rank>20</rank>
+                  <items>
+                    <item id="brand_id">
+                      <rank>60</rank>
+                    </item>
+                    <item id="model_id">
+                      <rank>70</rank>
+                    </item>
+                    <item id="serialnumber">
+                      <rank>80</rank>
+                    </item>
+                    <item id="asset_number">
+                      <rank>90</rank>
+                    </item>
+                  </items>
+                </item>
+              </items>
             </item>
-            <item id="org_id">
+            <item id="col:col2">
               <rank>20</rank>
-            </item>
-            <item id="status">
-              <rank>30</rank>
-            </item>
-            <item id="business_criticity">
-              <rank>40</rank>
-            </item>
-            <item id="location_id">
-              <rank>50</rank>
-            </item>
-            <item id="brand_id">
-              <rank>60</rank>
-            </item>
-            <item id="model_id">
-              <rank>70</rank>
-            </item>
-            <item id="serialnumber">
-              <rank>80</rank>
-            </item>
-            <item id="asset_number">
-              <rank>90</rank>
-            </item>
-            <item id="move2production">
-              <rank>100</rank>
-            </item>
-            <item id="purchase_date">
-              <rank>110</rank>
-            </item>
-            <item id="end_of_warranty">
-              <rank>120</rank>
-            </item>
-            <item id="description">
-              <rank>130</rank>
+              <items>
+                <item id="fieldset:Server:Date">
+                  <rank>10</rank>
+                  <items>
+                    <item id="move2production">
+                      <rank>100</rank>
+                    </item>
+                    <item id="purchase_date">
+                      <rank>110</rank>
+                    </item>
+                    <item id="end_of_warranty">
+                      <rank>120</rank>
+                    </item>
+                  </items>
+                </item>
+                <item id="fieldset:Server:otherinfo">
+                  <rank>20</rank>
+                  <items>
+                    <item id="description">
+                      <rank>130</rank>
+                    </item>
+                  </items>
+                </item>
+              </items>
             </item>
             <item id="contacts_list">
               <rank>140</rank>
@@ -613,44 +703,74 @@
       <presentation>
         <details>
           <items>
-            <item id="name">
+            <item id="col:col1">
               <rank>10</rank>
+              <items>
+                <item id="fieldset:Server:baseinfo">
+                  <rank>10</rank>
+                  <items>
+                    <item id="name">
+                      <rank>10</rank>
+                    </item>
+                    <item id="org_id">
+                      <rank>20</rank>
+                    </item>
+                    <item id="status">
+                      <rank>30</rank>
+                    </item>
+                    <item id="business_criticity">
+                      <rank>40</rank>
+                    </item>
+                    <item id="location_id">
+                      <rank>50</rank>
+                    </item>
+                  </items>
+                </item>
+                <item id="fieldset:Server:moreinfo">
+                  <rank>20</rank>
+                  <items>
+                    <item id="brand_id">
+                      <rank>60</rank>
+                    </item>
+                    <item id="model_id">
+                      <rank>70</rank>
+                    </item>
+                    <item id="serialnumber">
+                      <rank>80</rank>
+                    </item>
+                    <item id="asset_number">
+                      <rank>90</rank>
+                    </item>
+                  </items>
+                </item>
+              </items>
             </item>
-            <item id="org_id">
+            <item id="col:col2">
               <rank>20</rank>
-            </item>
-            <item id="status">
-              <rank>30</rank>
-            </item>
-            <item id="business_criticity">
-              <rank>40</rank>
-            </item>
-            <item id="location_id">
-              <rank>50</rank>
-            </item>
-            <item id="brand_id">
-              <rank>60</rank>
-            </item>
-            <item id="model_id">
-              <rank>70</rank>
-            </item>
-            <item id="serialnumber">
-              <rank>80</rank>
-            </item>
-            <item id="asset_number">
-              <rank>90</rank>
-            </item>
-            <item id="move2production">
-              <rank>100</rank>
-            </item>
-            <item id="purchase_date">
-              <rank>110</rank>
-            </item>
-            <item id="end_of_warranty">
-              <rank>120</rank>
-            </item>
-            <item id="description">
-              <rank>130</rank>
+              <items>
+                <item id="fieldset:Server:Date">
+                  <rank>10</rank>
+                  <items>
+                    <item id="move2production">
+                      <rank>100</rank>
+                    </item>
+                    <item id="purchase_date">
+                        <rank>110</rank>
+                    </item>
+                    <item id="end_of_warranty">
+                        <rank>120</rank>
+                    </item>
+                  </items>
+                </item>
+                <item id="fieldset:Server:otherinfo">
+                  <rank>20</rank>
+                  <items>
+                    <item id="description">
+                      <rank>130</rank>
+                    </item>
+                  </items>
+                </item>
+              </items>
             </item>
             <item id="pdus_list">
               <rank>140</rank>
@@ -806,50 +926,80 @@
       <presentation>
         <details>
           <items>
-            <item id="name">
+            <item id="col:col1">
               <rank>10</rank>
+              <items>
+                <item id="fieldset:Server:baseinfo">
+                  <rank>10</rank>
+                  <items>
+                    <item id="name">
+                      <rank>10</rank>
+                    </item>
+                    <item id="org_id">
+                      <rank>20</rank>
+                    </item>
+                    <item id="status">
+                      <rank>30</rank>
+                    </item>
+                    <item id="business_criticity">
+                      <rank>40</rank>
+                    </item>
+                    <item id="location_id">
+                      <rank>50</rank>
+                    </item>
+                    <item id="rack_id">
+                      <rank>60</rank>
+                    </item>
+                  </items>
+                </item>
+                <item id="fieldset:Server:moreinfo">
+                  <rank>20</rank>
+                  <items>
+                    <item id="powerstart_id">
+                      <rank>70</rank>
+                    </item>
+                    <item id="brand_id">
+                      <rank>80</rank>
+                    </item>
+                    <item id="model_id">
+                      <rank>90</rank>
+                    </item>
+                    <item id="serialnumber">
+                      <rank>100</rank>
+                    </item>
+                    <item id="asset_number">
+                      <rank>110</rank>
+                    </item>
+                  </items>
+                </item>
+              </items>
             </item>
-            <item id="org_id">
+            <item id="col:col2">
               <rank>20</rank>
-            </item>
-            <item id="status">
-              <rank>30</rank>
-            </item>
-            <item id="business_criticity">
-              <rank>40</rank>
-            </item>
-            <item id="location_id">
-              <rank>50</rank>
-            </item>
-            <item id="rack_id">
-              <rank>60</rank>
-            </item>
-            <item id="powerstart_id">
-              <rank>70</rank>
-            </item>
-            <item id="brand_id">
-              <rank>80</rank>
-            </item>
-            <item id="model_id">
-              <rank>90</rank>
-            </item>
-            <item id="serialnumber">
-              <rank>100</rank>
-            </item>
-            <item id="asset_number">
-              <rank>110</rank>
-            </item>
-            <item id="move2production">
-              <rank>120</rank>
-            </item>
-            <item id="purchase_date">
-              <rank>130</rank>
-            </item>
-            <item id="end_of_warranty">
-              <rank>140</rank>
-            </item>
-            <item id="description">
-              <rank>150</rank>
+              <items>
+                <item id="fieldset:Server:Date">
+                  <rank>10</rank>
+                  <items>
+                    <item id="move2production">
+                        <rank>120</rank>
+                    </item>
+                    <item id="purchase_date">
+                      <rank>130</rank>
+                    </item>
+                    <item id="end_of_warranty">
+                        <rank>140</rank>
+                    </item>
+                  </items>
+                </item>
+                <item id="fieldset:Server:otherinfo">
+                  <rank>20</rank>
+                  <items>
+                    <item id="description">
+                      <rank>150</rank>
+                    </item>
+                  </items>
+                </item>
+              </items>
             </item>
             <item id="contacts_list">
               <rank>160</rank>

datamodels/2.x/itop-endusers-devices/datamodel.itop-endusers-devices.xml

@@ -193,47 +193,77 @@
       <presentation>
         <details>
           <items>
-            <item id="name">
+            <item id="col:col1">
               <rank>10</rank>
+              <items>
+                <item id="fieldset:Server:baseinfo">
+                  <rank>10</rank>
+                  <items>
+                    <item id="name">
+                      <rank>10</rank>
+                    </item>
+                    <item id="org_id">
+                      <rank>20</rank>
+                    </item>
+                    <item id="status">
+                      <rank>30</rank>
+                    </item>
+                    <item id="business_criticity">
+                      <rank>40</rank>
+                    </item>
+                    <item id="location_id">
+                      <rank>50</rank>
+                    </item>
+                  </items>
+                </item>
+                <item id="fieldset:Phone:moreinfo">
+                  <rank>20</rank>
+                  <items>
+                    <item id="brand_id">
+                      <rank>60</rank>
+                    </item>
+                    <item id="model_id">
+                      <rank>70</rank>
+                    </item>
+                    <item id="phonenumber">
+                      <rank>80</rank>
+                    </item>
+                    <item id="serialnumber">
+                      <rank>90</rank>
+                    </item>
+                    <item id="asset_number">
+                      <rank>100</rank>
+                    </item>
+                  </items>
+                </item>
+              </items>
             </item>
-            <item id="org_id">
+            <item id="col:col2">
               <rank>20</rank>
-            </item>
-            <item id="status">
-              <rank>30</rank>
-            </item>
-            <item id="business_criticity">
-              <rank>40</rank>
-            </item>
-            <item id="location_id">
-              <rank>50</rank>
-            </item>
-            <item id="brand_id">
-              <rank>60</rank>
-            </item>
-            <item id="model_id">
-              <rank>70</rank>
-            </item>
-            <item id="phonenumber">
-              <rank>80</rank>
-            </item>
-            <item id="serialnumber">
-              <rank>90</rank>
-            </item>
-            <item id="asset_number">
-              <rank>100</rank>
-            </item>
-            <item id="move2production">
-              <rank>110</rank>
-            </item>
-            <item id="purchase_date">
-              <rank>120</rank>
-            </item>
-            <item id="end_of_warranty">
-              <rank>130</rank>
-            </item>
-            <item id="description">
-              <rank>140</rank>
+              <items>
+                <item id="fieldset:Server:Date">
+                  <rank>10</rank>
+                  <items>
+                    <item id="move2production">
+                      <rank>110</rank>
+                    </item>
+                    <item id="purchase_date">
+                      <rank>120</rank>
+                    </item>
+                    <item id="end_of_warranty">
+                      <rank>130</rank>
+                    </item>
+                  </items>
+                </item>
+                <item id="fieldset:Server:otherinfo">
+                  <rank>20</rank>
+                  <items>
+                    <item id="description">
+                      <rank>140</rank>
+                    </item>
+                  </items>
+                </item>
+              </items>
             </item>
             <item id="contacts_list">
               <rank>150</rank>
@@ -374,53 +404,83 @@
       <presentation>
         <details>
           <items>
-            <item id="name">
+            <item id="col:col1">
               <rank>10</rank>
+              <items>
+                <item id="fieldset:Server:baseinfo">
+                  <rank>10</rank>
+                  <items>
+                    <item id="name">
+                      <rank>10</rank>
+                    </item>
+                    <item id="org_id">
+                      <rank>20</rank>
+                    </item>
+                    <item id="status">
+                      <rank>30</rank>
+                    </item>
+                    <item id="business_criticity">
+                      <rank>40</rank>
+                    </item>
+                    <item id="location_id">
+                      <rank>50</rank>
+                    </item>
+                  </items>
+                </item>
+                <item id="fieldset:Phone:moreinfo">
+                  <rank>20</rank>
+                  <items>
+                    <item id="brand_id">
+                      <rank>60</rank>
+                    </item>
+                    <item id="model_id">
+                      <rank>70</rank>
+                    </item>
+                    <item id="phonenumber">
+                      <rank>80</rank>
+                    </item>
+                    <item id="imei">
+                      <rank>90</rank>
+                    </item>
+                    <item id="hw_pin">
+                      <rank>100</rank>
+                    </item>
+                    <item id="serialnumber">
+                      <rank>110</rank>
+                    </item>
+                    <item id="asset_number">
+                      <rank>120</rank>
+                    </item>
+                  </items>
+                </item>
+              </items>
             </item>
-            <item id="org_id">
+            <item id="col:col2">
               <rank>20</rank>
-            </item>
-            <item id="status">
-              <rank>30</rank>
-            </item>
-            <item id="business_criticity">
-              <rank>40</rank>
-            </item>
-            <item id="location_id">
-              <rank>50</rank>
-            </item>
-            <item id="brand_id">
-              <rank>60</rank>
-            </item>
-            <item id="model_id">
-              <rank>70</rank>
-            </item>
-            <item id="phonenumber">
-              <rank>80</rank>
-            </item>
-            <item id="imei">
-              <rank>90</rank>
-            </item>
-            <item id="hw_pin">
-              <rank>100</rank>
-            </item>
-            <item id="serialnumber">
-              <rank>110</rank>
-            </item>
-            <item id="asset_number">
-              <rank>120</rank>
-            </item>
-            <item id="move2production">
+              <items>
+                <item id="fieldset:Server:Date">
+                  <rank>10</rank>
+                  <items>
+                    <item id="move2production">
               <rank>130</rank>
-            </item>
-            <item id="purchase_date">
+                    </item>
+                    <item id="purchase_date">
               <rank>140</rank>
-            </item>
-            <item id="end_of_warranty">
-              <rank>150</rank>
-            </item>
-            <item id="description">
-              <rank>160</rank>
+                    </item>
+                    <item id="end_of_warranty">
+                      <rank>150</rank>
+                    </item>
+                  </items>
+                </item>
+                <item id="fieldset:Server:otherinfo">
+                  <rank>20</rank>
+                  <items>
+                    <item id="description">
+                      <rank>160</rank>
+                    </item>
+                  </items>
+                </item>
+              </items>
             </item>
             <item id="contacts_list">
               <rank>170</rank>
@@ -553,47 +613,77 @@
       <presentation>
         <details>
           <items>
-            <item id="name">
+            <item id="col:col1">
               <rank>10</rank>
+              <items>
+                <item id="fieldset:Server:baseinfo">
+                  <rank>10</rank>
+                  <items>
+                    <item id="name">
+                      <rank>10</rank>
+                    </item>
+                    <item id="org_id">
+                      <rank>20</rank>
+                    </item>
+                    <item id="status">
+                      <rank>30</rank>
+                    </item>
+                    <item id="business_criticity">
+                      <rank>40</rank>
+                    </item>
+                    <item id="location_id">
+                      <rank>50</rank>
+                    </item>
+                  </items>
+                </item>
+                <item id="fieldset:Phone:moreinfo">
+                  <rank>20</rank>
+                  <items>
+                    <item id="brand_id">
+                      <rank>60</rank>
+                    </item>
+                    <item id="model_id">
+                      <rank>70</rank>
+                    </item>
+                    <item id="phonenumber">
+                      <rank>80</rank>
+                    </item>
+                    <item id="serialnumber">
+                      <rank>90</rank>
+                    </item>
+                    <item id="asset_number">
+                      <rank>100</rank>
+                    </item>
+                  </items>
+                </item>
+              </items>
             </item>
-            <item id="org_id">
+            <item id="col:col2">
               <rank>20</rank>
-            </item>
-            <item id="status">
-              <rank>30</rank>
-            </item>
-            <item id="business_criticity">
-              <rank>40</rank>
-            </item>
-            <item id="location_id">
-              <rank>50</rank>
-            </item>
-            <item id="brand_id">
-              <rank>60</rank>
-            </item>
-            <item id="model_id">
-              <rank>70</rank>
-            </item>
-            <item id="phonenumber">
-              <rank>80</rank>
-            </item>
-            <item id="serialnumber">
-              <rank>90</rank>
-            </item>
-            <item id="asset_number">
-              <rank>100</rank>
-            </item>
-            <item id="move2production">
+              <items>
+                <item id="fieldset:Server:Date">
+                  <rank>10</rank>
+                  <items>
+                    <item id="move2production">
               <rank>110</rank>
-            </item>
-            <item id="purchase_date">
+                    </item>
+                    <item id="purchase_date">
               <rank>120</rank>
-            </item>
-            <item id="end_of_warranty">
-              <rank>130</rank>
-            </item>
-            <item id="description">
-              <rank>140</rank>
+                    </item>
+                    <item id="end_of_warranty">
+                      <rank>130</rank>
+                    </item>
+                  </items>
+                </item>
+                <item id="fieldset:Server:otherinfo">
+                  <rank>20</rank>
+                  <items>
+                    <item id="description">
+                      <rank>140</rank>
+                    </item>
+                  </items>
+                </item>
+              </items>
             </item>
             <item id="contacts_list">
               <rank>150</rank>
@@ -722,44 +812,74 @@
       <presentation>
         <details>
           <items>
-            <item id="name">
+            <item id="col:col1">
               <rank>10</rank>
+              <items>
+                <item id="fieldset:Server:baseinfo">
+                  <rank>10</rank>
+                  <items>
+                    <item id="name">
+                      <rank>10</rank>
+                    </item>
+                    <item id="org_id">
+                      <rank>20</rank>
+                    </item>
+                    <item id="status">
+                      <rank>30</rank>
+                    </item>
+                    <item id="business_criticity">
+                      <rank>40</rank>
+                    </item>
+                    <item id="location_id">
+                      <rank>50</rank>
+                    </item>
+                  </items>
+                </item>
+                <item id="fieldset:Server:moreinfo">
+                  <rank>20</rank>
+                  <items>
+                    <item id="brand_id">
+                      <rank>60</rank>
+                    </item>
+                    <item id="model_id">
+                      <rank>70</rank>
+                    </item>
+                    <item id="serialnumber">
+                      <rank>80</rank>
+                    </item>
+                    <item id="asset_number">
+                      <rank>90</rank>
+                    </item>
+                  </items>
+                </item>
+              </items>
             </item>
-            <item id="org_id">
+            <item id="col:col2">
               <rank>20</rank>
-            </item>
-            <item id="status">
-              <rank>30</rank>
-            </item>
-            <item id="business_criticity">
-              <rank>40</rank>
-            </item>
-            <item id="location_id">
-              <rank>50</rank>
-            </item>
-            <item id="brand_id">
-              <rank>60</rank>
-            </item>
-            <item id="model_id">
-              <rank>70</rank>
-            </item>
-            <item id="serialnumber">
-              <rank>80</rank>
-            </item>
-            <item id="asset_number">
-              <rank>90</rank>
-            </item>
-            <item id="move2production">
+              <items>
+                <item id="fieldset:Server:Date">
+                  <rank>10</rank>
+                  <items>
+                    <item id="move2production">
               <rank>100</rank>
-            </item>
-            <item id="purchase_date">
+                    </item>
+                    <item id="purchase_date">
               <rank>110</rank>
-            </item>
-            <item id="end_of_warranty">
-              <rank>120</rank>
-            </item>
-            <item id="description">
-              <rank>130</rank>
+                    </item>
+                    <item id="end_of_warranty">
+                      <rank>120</rank>
+                    </item>
+                  </items>
+                </item>
+                <item id="fieldset:Server:otherinfo">
+                  <rank>20</rank>
+                  <items>
+                    <item id="description">
+                      <rank>130</rank>
+                    </item>
+                  </items>
+                </item>
+              </items>
             </item>
             <item id="contacts_list">
               <rank>140</rank>
@@ -938,23 +1058,8 @@
       <presentation>
         <details>
           <items>
-            <item id="softwares_list">
-              <rank>5</rank>
-            </item>
-            <item id="contacts_list">
-              <rank>10</rank>
-            </item>
-            <item id="documents_list">
-              <rank>20</rank>
-            </item>
-            <item id="physicalinterface_list">
-              <rank>40</rank>
-            </item>
-            <item id="networkdevice_list">
-              <rank>50</rank>
-            </item>
             <item id="col:col1">
-              <rank>80</rank>
+              <rank>10</rank>
               <items>
                 <item id="fieldset:Server:baseinfo">
                   <rank>10</rank>
@@ -1011,7 +1116,7 @@
               </items>
             </item>
             <item id="col:col2">
-              <rank>90</rank>
+              <rank>20</rank>
               <items>
                 <item id="fieldset:Server:Date">
                   <rank>10</rank>
@@ -1037,6 +1142,21 @@
                 </item>
               </items>
             </item>
+            <item id="softwares_list">
+              <rank>50</rank>
+            </item>
+            <item id="contacts_list">
+              <rank>80</rank>
+            </item>
+            <item id="documents_list">
+              <rank>90</rank>
+            </item>
+            <item id="physicalinterface_list">
+              <rank>100</rank>
+            </item>
+            <item id="networkdevice_list">
+              <rank>110</rank>
+            </item>
           </items>
         </details>
         <search>
@@ -1159,20 +1279,8 @@
       <presentation>
         <details>
           <items>
-            <item id="contacts_list">
-              <rank>10</rank>
-            </item>
-            <item id="documents_list">
-              <rank>20</rank>
-            </item>
-            <item id="physicalinterface_list">
-              <rank>40</rank>
-            </item>
-            <item id="networkdevice_list">
-              <rank>50</rank>
-            </item>
             <item id="col:col1">
-              <rank>80</rank>
+              <rank>10</rank>
               <items>
                 <item id="fieldset:Server:baseinfo">
                   <rank>10</rank>
@@ -1214,7 +1322,7 @@
               </items>
             </item>
             <item id="col:col2">
-              <rank>90</rank>
+              <rank>20</rank>
               <items>
                 <item id="fieldset:Server:Date">
                   <rank>10</rank>
@@ -1240,6 +1348,18 @@
                 </item>
               </items>
             </item>
+            <item id="contacts_list">
+              <rank>80</rank>
+            </item>
+            <item id="documents_list">
+              <rank>90</rank>
+            </item>
+            <item id="physicalinterface_list">
+              <rank>100</rank>
+            </item>
+            <item id="networkdevice_list">
+              <rank>110</rank>
+            </item>
           </items>
         </details>
         <search>
@@ -1359,44 +1479,74 @@
       <presentation>
         <details>
           <items>
-            <item id="name">
+            <item id="col:col1">
               <rank>10</rank>
+              <items>
+                <item id="fieldset:Server:baseinfo">
+                  <rank>10</rank>
+                  <items>
+                    <item id="name">
+                      <rank>10</rank>
+                    </item>
+                    <item id="org_id">
+                      <rank>20</rank>
+                    </item>
+                    <item id="status">
+                      <rank>30</rank>
+                    </item>
+                    <item id="business_criticity">
+                      <rank>40</rank>
+                    </item>
+                    <item id="location_id">
+                      <rank>50</rank>
+                    </item>
+                  </items>
+                </item>
+                <item id="fieldset:Server:moreinfo">
+                  <rank>20</rank>
+                  <items>
+                    <item id="brand_id">
+                      <rank>60</rank>
+                    </item>
+                    <item id="model_id">
+                      <rank>70</rank>
+                    </item>
+                    <item id="serialnumber">
+                      <rank>80</rank>
+                    </item>
+                    <item id="asset_number">
+                      <rank>90</rank>
+                    </item>
+                  </items>
+                </item>
+              </items>
             </item>
-            <item id="org_id">
+            <item id="col:col2">
               <rank>20</rank>
-            </item>
-            <item id="status">
-              <rank>30</rank>
-            </item>
-            <item id="business_criticity">
-              <rank>40</rank>
-            </item>
-            <item id="location_id">
-              <rank>50</rank>
-            </item>
-            <item id="brand_id">
-              <rank>60</rank>
-            </item>
-            <item id="model_id">
-              <rank>70</rank>
-            </item>
-            <item id="serialnumber">
-              <rank>80</rank>
-            </item>
-            <item id="asset_number">
-              <rank>90</rank>
-            </item>
-            <item id="move2production">
+              <items>
+                <item id="fieldset:Server:Date">
+                  <rank>10</rank>
+                  <items>
+                    <item id="move2production">
               <rank>100</rank>
-            </item>
-            <item id="purchase_date">
+                    </item>
+                    <item id="purchase_date">
               <rank>110</rank>
-            </item>
-            <item id="end_of_warranty">
-              <rank>120</rank>
-            </item>
-            <item id="description">
-              <rank>130</rank>
+                    </item>
+                    <item id="end_of_warranty">
+                      <rank>120</rank>
+                    </item>
+                  </items>
+                </item>
+                <item id="fieldset:Server:otherinfo">
+                  <rank>20</rank>
+                  <items>
+                    <item id="description">
+                      <rank>130</rank>
+                    </item>
+                  </items>
+                </item>
+              </items>
             </item>
             <item id="contacts_list">
               <rank>140</rank>

datamodels/2.x/itop-storage-mgmt/datamodel.itop-storage-mgmt.xml

@@ -873,7 +873,7 @@
                     </item>
                   </items>
                 </item>
-                <item id="fieldset:Server:moreinfo">
+                <item id="fieldset:Storage:moreinfo">
                   <rank>20</rank>
                   <items>
                     <item id="brand_id">
@@ -1212,26 +1212,51 @@
       <presentation>
         <details>
           <items>
-            <item id="name">
+            <item id="col:col1">
               <rank>10</rank>
+              <items>
+                <item id="fieldset:Server:baseinfo">
+                  <rank>10</rank>
+                  <items>
+                    <item id="name">
+                      <rank>10</rank>
+                    </item>
+                    <item id="org_id">
+                      <rank>20</rank>
+                    </item>
+                    <item id="location_id">
+                      <rank>50</rank>
+                    </item>
+                  </items>
+                </item>
+                <item id="fieldset:Storage:moreinfo">
+                  <rank>20</rank>
+                  <items>
+                    <item id="nas_id">
+                      <rank>20</rank>
+                    </item>
+                    <item id="raid_level">
+                      <rank>60</rank>
+                    </item>
+                    <item id="size">
+                      <rank>70</rank>
+                    </item>
+                  </items>
+                </item>
+              </items>
             </item>
-            <item id="nas_id">
+            <item id="col:col2">
               <rank>20</rank>
-            </item>
-            <item id="location_id">
-              <rank>30</rank>
-            </item>
-            <item id="org_id">
-              <rank>40</rank>
-            </item>
-            <item id="description">
-              <rank>50</rank>
-            </item>
-            <item id="raid_level">
-              <rank>60</rank>
-            </item>
-            <item id="size">
-              <rank>70</rank>
+              <items>
+                <item id="fieldset:Server:otherinfo">
+                  <rank>20</rank>
+                  <items>
+                    <item id="description">
+                      <rank>10</rank>
+                    </item>
+                  </items>
+                </item>
+              </items>
             </item>
           </items>
         </details>
@@ -1350,26 +1375,41 @@
       <presentation>
         <details>
           <items>
-            <item id="name">
+            <item id="col:col1">
               <rank>10</rank>
-            </item>
-            <item id="datacenterdevice_id">
-              <rank>20</rank>
-            </item>
-            <item id="location_id">
-              <rank>30</rank>
-            </item>
-            <item id="org_id">
-              <rank>40</rank>
-            </item>
-            <item id="speed">
-              <rank>50</rank>
-            </item>
-            <item id="topology">
-              <rank>60</rank>
-            </item>
-            <item id="wwn">
-              <rank>70</rank>
+              <items>
+                <item id="fieldset:Server:baseinfo">
+                  <rank>10</rank>
+                  <items>
+                    <item id="name">
+                      <rank>10</rank>
+                    </item>
+                    <item id="org_id">
+                      <rank>20</rank>
+                    </item>
+                    <item id="location_id">
+                      <rank>50</rank>
+                    </item>
+                  </items>
+                </item>
+                <item id="fieldset:Storage:moreinfo">
+                  <rank>20</rank>
+                  <items>
+                    <item id="datacenterdevice_id">
+                      <rank>20</rank>
+                    </item>
+                    <item id="speed">
+                      <rank>50</rank>
+                    </item>
+                    <item id="topology">
+                      <rank>60</rank>
+                    </item>
+                    <item id="wwn">
+                      <rank>70</rank>
+                    </item>
+                  </items>
+                </item>
+              </items>
             </item>
           </items>
         </details>
@@ -1521,29 +1561,54 @@
       <presentation>
         <details>
           <items>
-            <item id="name">
+            <item id="col:col1">
               <rank>10</rank>
+              <items>
+                <item id="fieldset:ConfigMgnt:baseinfo">
+                  <rank>10</rank>
+                  <items>
+                    <item id="name">
+                      <rank>10</rank>
+                    </item>
+                    <item id="org_id">
+                      <rank>20</rank>
+                    </item>
+                    <item id="location_id">
+                      <rank>50</rank>
+                    </item>
+                  </items>
+                </item>
+                <item id="fieldset:Storage:moreinfo">
+                  <rank>20</rank>
+                  <items>
+                    <item id="lun_id">
+                      <rank>20</rank>
+                    </item>
+                    <item id="storagesystem_id">
+                      <rank>30</rank>
+                    </item>
+                    <item id="raid_level">
+                      <rank>70</rank>
+                    </item>
+                    <item id="size">
+                      <rank>80</rank>
+                    </item>
+                  </items>
+                </item>
+              </items>
             </item>
-            <item id="lun_id">
+            <item id="col:col2">
               <rank>20</rank>
-            </item>
-            <item id="storagesystem_id">
-              <rank>30</rank>
-            </item>
-            <item id="location_id">
-              <rank>40</rank>
-            </item>
-            <item id="org_id">
-              <rank>50</rank>
-            </item>
-            <item id="description">
-              <rank>60</rank>
-            </item>
-            <item id="raid_level">
-              <rank>70</rank>
-            </item>
-            <item id="size">
-              <rank>80</rank>
+              <items>
+                <item id="fieldset:Server:otherinfo">
+                  <rank>20</rank>
+                  <items>
+                    <item id="description">
+                      <rank>10</rank>
+                    </item>
+                  </items>
+                </item>
+              </items>
             </item>
             <item id="servers_list">
               <rank>90</rank>

datamodels/2.x/itop-storage-mgmt/dictionaries/en.dict.itop-storage-mgmt.php

@@ -44,7 +44,6 @@ Dict::Add('EN US', 'English', 'English', [
 //
 
 Dict::Add('EN US', 'English', 'English', [
-	'Class:FiberChannelInterface/Name' => '%2$s %1$s',
 	'Class:FiberChannelInterface/Attribute:org_id' => 'Org id',
 	'Class:FiberChannelInterface/Attribute:org_id+' => '',
 	'Class:FiberChannelInterface/Attribute:location_id' => 'Location id',

datamodels/2.x/itop-storage-mgmt/dictionaries/fr.dict.itop-storage-mgmt.php

@@ -43,7 +43,6 @@ Dict::Add('FR FR', 'French', 'Français', [
 //
 
 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:FiberChannelInterface/Name' => '%2$s %1$s',
 	'Class:FiberChannelInterface/Attribute:org_id' => 'Organisation',
 	'Class:FiberChannelInterface/Attribute:org_id+' => '',
 	'Class:FiberChannelInterface/Attribute:location_id' => 'Site',

datamodels/2.x/itop-virtualization-mgmt/datamodel.itop-virtualization-mgmt.xml

@@ -994,6 +994,9 @@
             <attribute id="location_id_friendlyname"/>
           </complementary_attributes>
         </naming>
+        <fields_semantic>
+          <image_attribute>logo</image_attribute>
+        </fields_semantic>
         <reconciliation>
           <attributes>
             <attribute id="name"/>
@@ -1026,6 +1029,13 @@
           <on_target_delete>DEL_MANUAL</on_target_delete>
           <tracking_level>all</tracking_level>
         </field>
+        <field id="logo" xsi:type="AttributeImage">
+          <display_max_width>96</display_max_width>
+          <display_max_height>96</display_max_height>
+          <storage_max_width>128</storage_max_width>
+          <storage_max_height>128</storage_max_height>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
       </fields>
       <methods/>
       <presentation>
@@ -1106,9 +1116,12 @@
                     <item id="move2production">
                       <rank>50</rank>
                     </item>
-                    <item id="description">
+                    <item id="logo">
                       <rank>60</rank>
                     </item>
+                    <item id="description">
+                      <rank>70</rank>
+                    </item>
                   </items>
                   <rank>10</rank>
                 </item>

datamodels/2.x/itop-virtualization-mgmt/dictionaries/en.dict.itop-virtualization-mgmt.php

@@ -54,7 +54,6 @@ Dict::Add('EN US', 'English', 'English', [
 //
 
 Dict::Add('EN US', 'English', 'English', [
-	'Class:LogicalInterface/Name' => '%2$s %1$s',
 	'Class:LogicalInterface/Attribute:org_id' => 'Organization',
 	'Class:LogicalInterface/Attribute:org_id+' => '',
 ]);

datamodels/2.x/itop-virtualization-mgmt/dictionaries/fr.dict.itop-virtualization-mgmt.php

@@ -54,7 +54,6 @@ Dict::Add('FR FR', 'French', 'Français', [
 //
 
 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:LogicalInterface/Name' => '%2$s %1$s',
 	'Class:LogicalInterface/Attribute:org_id' => 'Organisation',
 	'Class:LogicalInterface/Attribute:org_id+' => '',
 ]);