diff --git a/datamodels/2.x/itop-config-mgmt/data.sample.applications.xml b/datamodels/2.x/itop-config-mgmt/data/data.sample.applications.xml old mode 100755 new mode 100644 similarity index 100% rename from datamodels/2.x/itop-config-mgmt/data.sample.applications.xml rename to datamodels/2.x/itop-config-mgmt/data/data.sample.applications.xml diff --git a/datamodels/2.x/itop-config-mgmt/data.sample.applicationsolutionci.xml b/datamodels/2.x/itop-config-mgmt/data/data.sample.applicationsolutionci.xml old mode 100755 new mode 100644 similarity index 100% rename from datamodels/2.x/itop-config-mgmt/data.sample.applicationsolutionci.xml rename to datamodels/2.x/itop-config-mgmt/data/data.sample.applicationsolutionci.xml diff --git a/datamodels/2.x/itop-config-mgmt/data.sample.dbschema.xml b/datamodels/2.x/itop-config-mgmt/data/data.sample.dbschema.xml old mode 100755 new mode 100644 similarity index 100% rename from datamodels/2.x/itop-config-mgmt/data.sample.dbschema.xml rename to datamodels/2.x/itop-config-mgmt/data/data.sample.dbschema.xml diff --git a/datamodels/2.x/itop-config-mgmt/data.sample.dbserver.xml b/datamodels/2.x/itop-config-mgmt/data/data.sample.dbserver.xml old mode 100755 new mode 100644 similarity index 100% rename from datamodels/2.x/itop-config-mgmt/data.sample.dbserver.xml rename to datamodels/2.x/itop-config-mgmt/data/data.sample.dbserver.xml diff --git a/datamodels/2.x/itop-config-mgmt/data.sample.model.xml b/datamodels/2.x/itop-config-mgmt/data/data.sample.model.xml old mode 100755 new mode 100644 similarity index 100% rename from datamodels/2.x/itop-config-mgmt/data.sample.model.xml rename to datamodels/2.x/itop-config-mgmt/data/data.sample.model.xml diff --git a/datamodels/2.x/itop-config-mgmt/data.sample.networkdevicetype.xml b/datamodels/2.x/itop-config-mgmt/data/data.sample.networkdevicetype.xml old mode 100755 new mode 100644 similarity index 100% rename from datamodels/2.x/itop-config-mgmt/data.sample.networkdevicetype.xml rename to datamodels/2.x/itop-config-mgmt/data/data.sample.networkdevicetype.xml diff --git a/datamodels/2.x/itop-config-mgmt/data.sample.nw-devices.xml b/datamodels/2.x/itop-config-mgmt/data/data.sample.nw-devices.xml old mode 100755 new mode 100644 similarity index 100% rename from datamodels/2.x/itop-config-mgmt/data.sample.nw-devices.xml rename to datamodels/2.x/itop-config-mgmt/data/data.sample.nw-devices.xml diff --git a/datamodels/2.x/itop-config-mgmt/data.sample.servers.xml b/datamodels/2.x/itop-config-mgmt/data/data.sample.servers.xml old mode 100755 new mode 100644 similarity index 100% rename from datamodels/2.x/itop-config-mgmt/data.sample.servers.xml rename to datamodels/2.x/itop-config-mgmt/data/data.sample.servers.xml diff --git a/datamodels/2.x/itop-config-mgmt/data.sample.software.xml b/datamodels/2.x/itop-config-mgmt/data/data.sample.software.xml old mode 100755 new mode 100644 similarity index 100% rename from datamodels/2.x/itop-config-mgmt/data.sample.software.xml rename to datamodels/2.x/itop-config-mgmt/data/data.sample.software.xml diff --git a/datamodels/2.x/itop-config-mgmt/data.sample.webapp.xml b/datamodels/2.x/itop-config-mgmt/data/data.sample.webapp.xml old mode 100755 new mode 100644 similarity index 100% rename from datamodels/2.x/itop-config-mgmt/data.sample.webapp.xml rename to datamodels/2.x/itop-config-mgmt/data/data.sample.webapp.xml diff --git a/datamodels/2.x/itop-config-mgmt/data.sample.webserver.xml b/datamodels/2.x/itop-config-mgmt/data/data.sample.webserver.xml old mode 100755 new mode 100644 similarity index 100% rename from datamodels/2.x/itop-config-mgmt/data.sample.webserver.xml rename to datamodels/2.x/itop-config-mgmt/data/data.sample.webserver.xml 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 9821cbedc..b3f381390 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 @@ -1068,7 +1068,7 @@ 10 - + 10 @@ -1131,7 +1131,7 @@ 20 - + 10 @@ -1159,7 +1159,7 @@ - + 30 @@ -1451,7 +1451,7 @@ 120 - + 10 @@ -1520,7 +1520,7 @@ 130 - + 10 @@ -1548,7 +1548,7 @@ - + 30 @@ -1781,20 +1781,25 @@ - + - 50 - - - - 70 + 10 10 + + + + 10 + + + + 20 + 20 @@ -1969,20 +1974,25 @@ - + - 50 - - - - 70 + 10 10 + + + + 10 + + + + 20 + 20 @@ -2362,18 +2372,18 @@ - + - 90 + 10 10 - + - 100 + 10 20 @@ -2546,18 +2556,18 @@ - + - 90 + 10 10 - + - 100 + 10 20 @@ -2730,18 +2740,18 @@ - + - 90 + 10 10 - + - 100 + 10 20 @@ -2906,18 +2916,18 @@ - + - 90 + 10 10 - + - 100 + 10 20 @@ -3069,18 +3079,18 @@ - + - 90 + 10 10 - + - 100 + 10 20 @@ -3230,7 +3240,7 @@ 10 - + 30 @@ -3243,20 +3253,25 @@ - + - 50 - - - - 70 + 10 10 + + + + 10 + + + + 20 + 20 @@ -3395,7 +3410,7 @@ 10 - + 10 @@ -3408,17 +3423,22 @@ - + - 50 - - - 60 + 10 10 + + + + 10 + + + 20 + 20 @@ -3589,20 +3609,25 @@ - + - 50 - - - - 70 + 10 10 + + + + 10 + + + + 20 + 20 @@ -3801,21 +3826,46 @@
- + + + + + + 10 + + + 20 + + + 10 + + + + + 30 + + + 40 + + + 20 + + 10 - + + + + + + + 10 + + 20 - - 30 - - - 40 - - 60 @@ -3935,13 +3985,33 @@
- + + + + + + 10 + + + 10 + + 10 - + + + + + + 10 + + + 10 + + 20 - + 30 @@ -4025,21 +4095,46 @@
- + + + + + + 10 + + + 10 + + + + + 10 + + + 20 + + 10 - + + + + + + 10 + + + 10 + + 20 - + 30 - + 40 - - 50 -
@@ -4127,18 +4222,43 @@
- + + + + + + 10 + + + 10 + + + + + 10 + + + 20 + + 10 - + + + + + + 10 + + + 10 + + 20 - + 30 - - 40 - 50 @@ -4492,20 +4612,25 @@ - + - 70 + 10 - 80 - - - 90 + 20 10 + + + + 10 + + + 20 + 20 @@ -4668,7 +4793,7 @@ - + 70 @@ -4676,12 +4801,17 @@ 80 - - 90 - 10 + + + + 10 + + + 20 + 20 @@ -6169,21 +6299,46 @@
- + + + + + + 10 + + + 30 + + + 10 + + + + + 10 + + + 20 + + + 20 + + 10 - + + + + + + 10 + + + 10 + + 20 - - 25 - - - 30 - - - 40 - 50 @@ -6331,15 +6486,35 @@
- + + + + + + 10 + + + 20 + + + 10 + + 10 - + + + + + + 10 + + + 10 + + 20 - - 30 - 40 @@ -6805,10 +6980,10 @@ - + - 60 + 10 10 @@ -7621,10 +7796,10 @@ - + - 50 + 10 10 diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/cs.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/cs.dict.itop-config-mgmt.php index 77f926113..79f09d68e 100644 --- a/datamodels/2.x/itop-config-mgmt/dictionaries/cs.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/dictionaries/cs.dict.itop-config-mgmt.php @@ -1549,7 +1549,8 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', [ 'ConfigMgmt:baseinfo' => 'General~~', 'ConfigMgmt:moreinfo' => 'CI specifics~~', 'Storage:moreinfo' => 'Storage specifics~~', - 'ConfigMgmt:otherinfo' => 'Dates and description~~', + 'ConfigMgmt:otherinfo' => 'Description~~', + 'ConfigMgmt:dates' => 'Dates~~', 'Software:moreinfo' => 'Software specifics~~', 'Phone:moreinfo' => 'Phone specifics~~', 'Server:baseinfo' => 'Obecné informace', diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/da.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/da.dict.itop-config-mgmt.php index 3ac631fdb..0d689f7c9 100644 --- a/datamodels/2.x/itop-config-mgmt/dictionaries/da.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/dictionaries/da.dict.itop-config-mgmt.php @@ -1548,7 +1548,8 @@ Dict::Add('DA DA', 'Danish', 'Dansk', [ 'ConfigMgmt:baseinfo' => 'General~~', 'ConfigMgmt:moreinfo' => 'CI specifics~~', 'Storage:moreinfo' => 'Storage specifics~~', - 'ConfigMgmt:otherinfo' => 'Dates and description~~', + 'ConfigMgmt:otherinfo' => 'Description~~', + 'ConfigMgmt:dates' => 'Dates~~', 'Software:moreinfo' => 'Software specifics~~', 'Phone:moreinfo' => 'Phone specifics~~', 'Server:baseinfo' => 'Almindelig Informationen', diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/de.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/de.dict.itop-config-mgmt.php index 9d69ab0fa..5111c8add 100644 --- a/datamodels/2.x/itop-config-mgmt/dictionaries/de.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/dictionaries/de.dict.itop-config-mgmt.php @@ -1548,7 +1548,8 @@ Dict::Add('DE DE', 'German', 'Deutsch', [ 'ConfigMgmt:baseinfo' => 'General~~', 'ConfigMgmt:moreinfo' => 'CI specifics~~', 'Storage:moreinfo' => 'Storage specifics~~', - 'ConfigMgmt:otherinfo' => 'Dates and description~~', + 'ConfigMgmt:otherinfo' => 'Description~~', + 'ConfigMgmt:dates' => 'Dates~~', 'Software:moreinfo' => 'Software specifics~~', 'Phone:moreinfo' => 'Phone specifics~~', 'Server:baseinfo' => 'Allgemeine Informationen', 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 c070dfd33..d77c8a9f4 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 @@ -163,7 +163,7 @@ Dict::Add('EN US', 'English', 'English', [ Dict::Add('EN US', 'English', 'English', [ 'Class:Rack' => 'Rack', - 'Class:Rack+' => 'A physical container for Datacenter Devices and Enclosures.', + 'Class:Rack+' => 'A physical cabinet for Datacenter Devices and Chassis.', 'Class:Rack/ComplementaryName' => '%1$s - %2$s', 'Class:Rack/Attribute:nb_u' => 'Rack units', 'Class:Rack/Attribute:nb_u+' => '', @@ -470,7 +470,7 @@ For example: external hard drives, scanners, input devices (trackballs, bar code Dict::Add('EN US', 'English', 'English', [ 'Class:Enclosure' => 'Enclosure', - 'Class:Enclosure+' => 'Cabinet is a physical structure in which to mount IT equipment such as Servers, Network Device... In '.ITOP_APPLICATION_SHORT.' an Enclosure can be mounted inside a Rack or directly fitted on the wall of a datacenter.', + 'Class:Enclosure+' => 'An open-frame chassis mounted inside a Rack, in which to mount IT equipment such as Blade Servers, Network Device...', 'Class:Enclosure/ComplementaryName' => '%1$s - %2$s - %3$s', 'Class:Enclosure/Attribute:rack_id' => 'Rack', 'Class:Enclosure/Attribute:rack_id+' => '', @@ -1580,7 +1580,8 @@ Dict::Add('EN US', 'English', 'English', [ Dict::Add('EN US', 'English', 'English', [ 'ConfigMgmt:baseinfo' => 'General', 'ConfigMgmt:moreinfo' => 'CI specifics', - 'ConfigMgmt:otherinfo' => 'Dates and description', + 'ConfigMgmt:otherinfo' => 'Description', + 'ConfigMgmt:dates' => 'Dates', 'Storage:moreinfo' => 'Storage specifics', 'Software:moreinfo' => 'Software specifics', 'Phone:moreinfo' => 'Phone specifics', diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/en_gb.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/en_gb.dict.itop-config-mgmt.php index c229f2f5d..609e8c3fa 100644 --- a/datamodels/2.x/itop-config-mgmt/dictionaries/en_gb.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/dictionaries/en_gb.dict.itop-config-mgmt.php @@ -1552,7 +1552,8 @@ Dict::Add('EN GB', 'British English', 'British English', [ Dict::Add('EN GB', 'British English', 'British English', [ 'ConfigMgmt:baseinfo' => 'General', 'ConfigMgmt:moreinfo' => 'CI specifics', - 'ConfigMgmt:otherinfo' => 'Dates and description', + 'ConfigMgmt:otherinfo' => 'Description', + 'ConfigMgmt:dates' => 'Dates', 'Storage:moreinfo' => 'Storage specifics', 'Software:moreinfo' => 'Software specifics~~', 'Phone:moreinfo' => 'Phone specifics~~', diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/es_cr.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/es_cr.dict.itop-config-mgmt.php index 7b3282b4e..9023a2a9f 100644 --- a/datamodels/2.x/itop-config-mgmt/dictionaries/es_cr.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/dictionaries/es_cr.dict.itop-config-mgmt.php @@ -1545,7 +1545,8 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [ 'ConfigMgmt:baseinfo' => 'General~~', 'ConfigMgmt:moreinfo' => 'CI specifics~~', 'Storage:moreinfo' => 'Storage specifics~~', - 'ConfigMgmt:otherinfo' => 'Dates and description~~', + 'ConfigMgmt:otherinfo' => 'Description~~', + 'ConfigMgmt:dates' => 'Dates~~', 'Software:moreinfo' => 'Software specifics~~', 'Phone:moreinfo' => 'Phone specifics~~', 'Server:baseinfo' => 'Información General', 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 24a45b728..63ac04e40 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 @@ -170,7 +170,7 @@ Dict::Add('FR FR', 'French', 'Français', [ 'Class:Rack/Attribute:device_list/UI:Links:Remove:Button+' => 'Retirer ce %4$s', 'Class:Rack/Attribute:device_list/UI:Links:Remove:Modal:Title' => 'Retirer ce %4$s de son %1$s', 'Class:Rack/Attribute:enclosure_list' => 'Chassis', - 'Class:Rack/Attribute:enclosure_list+' => 'Tous les chassis dans ce rack', + 'Class:Rack/Attribute:enclosure_list+' => 'Tous les chassis dans cette Baie', 'Class:Rack/Attribute:enclosure_list/UI:Links:Create:Button+' => 'Créer un %4$s', 'Class:Rack/Attribute:enclosure_list/UI:Links:Create:Modal:Title' => 'Ajouter un %4$s à %2$s', 'Class:Rack/Attribute:enclosure_list/UI:Links:Delete:Button+' => 'Supprimer ce %4$s', @@ -258,7 +258,7 @@ Dict::Add('FR FR', 'French', 'Français', [ 'Class:DatacenterDevice' => 'Matériel de datacenter', 'Class:DatacenterDevice+' => 'Un équipement physique, connecté au réseau et installé dans un datacenter, généralement dans une Baie ou un Châssis. Il peut s’agir de Serveurs, d\'Équipement réseau, de Systèmes de Stockage, de Switchs SAN, de Bandothèques, de NAS…', 'Class:DatacenterDevice/ComplementaryName' => '%1$s - %2$s', - 'Class:DatacenterDevice/Attribute:rack_id' => 'Rack', + 'Class:DatacenterDevice/Attribute:rack_id' => 'Baie', 'Class:DatacenterDevice/Attribute:rack_id+' => '', 'Class:DatacenterDevice/Attribute:rack_name' => 'Nom Rack', 'Class:DatacenterDevice/Attribute:rack_name+' => '', @@ -484,7 +484,7 @@ Dict::Add('FR FR', 'French', 'Français', [ 'Class:PDU' => 'PDU', 'Class:PDU+' => 'Connexion électrique. Une PDU (Power Distribution Unit) est un équipement doté de multiples sorties conçu pour distribuer l\'alimentation électrique, notamment vers les racks d\'ordinateurs et équipements réseau d\'un datacenter.', 'Class:PDU/ComplementaryName' => '%1$s - %2$s - %3$s - %4$s', - 'Class:PDU/Attribute:rack_id' => 'Rack', + 'Class:PDU/Attribute:rack_id' => 'Baie', 'Class:PDU/Attribute:rack_id+' => '', 'Class:PDU/Attribute:rack_name' => 'Nom rack', 'Class:PDU/Attribute:rack_name+' => '', @@ -511,9 +511,9 @@ Par exemple : disques durs externes, scanners, dispositifs d\'entrée (trackball Dict::Add('FR FR', 'French', 'Français', [ 'Class:Enclosure' => 'Châssis', - 'Class:Enclosure+' => 'Une armoire permettant d\'installer des équipements informatiques garantissant un flux d\'air optimisé et une alimentaion sécurisée. Dans '.ITOP_APPLICATION_SHORT.', un châssis peut être montée à l\'intérieur d\'une Baie ou fixée directement au mur d\'un centre de données.', + 'Class:Enclosure+' => 'Un châssis montée à l\'intérieur d\'une Baie qui permet d\'installer des équipements informatiques, comme des Serveurs lames ou des équipements réseau.', 'Class:Enclosure/ComplementaryName' => '%1$s - %2$s - %3$s', - 'Class:Enclosure/Attribute:rack_id' => 'Rack', + 'Class:Enclosure/Attribute:rack_id' => 'Baie', 'Class:Enclosure/Attribute:rack_id+' => '', 'Class:Enclosure/Attribute:rack_name' => 'Nom rack', 'Class:Enclosure/Attribute:rack_name+' => '', @@ -1739,7 +1739,8 @@ Dict::Add('FR FR', 'French', 'Français', [ 'Storage:moreinfo' => 'Stockage spécifique', 'Software:moreinfo' => 'Logiciel spécifique', 'Phone:moreinfo' => 'Téléphone spécifique', - 'ConfigMgmt:otherinfo' => 'Dates et description', + 'ConfigMgmt:otherinfo' => 'Description', + 'ConfigMgmt:dates' => 'Dates', 'Server:Date' => 'Dates', 'Server:otherinfo' => 'Description', 'Server:power' => 'Alimentation électrique', diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/hu.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/hu.dict.itop-config-mgmt.php index 82591b749..4671b23f0 100644 --- a/datamodels/2.x/itop-config-mgmt/dictionaries/hu.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/dictionaries/hu.dict.itop-config-mgmt.php @@ -1547,7 +1547,8 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', [ 'ConfigMgmt:baseinfo' => 'General~~', 'ConfigMgmt:moreinfo' => 'CI specifics~~', 'Storage:moreinfo' => 'Storage specifics~~', - 'ConfigMgmt:otherinfo' => 'Dates and description~~', + 'ConfigMgmt:otherinfo' => 'Description~~', + 'ConfigMgmt:dates' => 'Dates~~', 'Software:moreinfo' => 'Software specifics~~', 'Phone:moreinfo' => 'Phone specifics~~', 'Server:baseinfo' => 'Általános információ', diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/it.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/it.dict.itop-config-mgmt.php index 2dbd33676..239057ae7 100644 --- a/datamodels/2.x/itop-config-mgmt/dictionaries/it.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/dictionaries/it.dict.itop-config-mgmt.php @@ -1568,7 +1568,8 @@ Dict::Add('IT IT', 'Italian', 'Italiano', [ 'ConfigMgmt:baseinfo' => 'General~~', 'ConfigMgmt:moreinfo' => 'CI specifics~~', 'Storage:moreinfo' => 'Storage specifics~~', - 'ConfigMgmt:otherinfo' => 'Dates and description~~', + 'ConfigMgmt:otherinfo' => 'Description~~', + 'ConfigMgmt:dates' => 'Dates~~', 'Software:moreinfo' => 'Software specifics~~', 'Phone:moreinfo' => 'Phone specifics~~', 'Server:baseinfo' => 'Informazioni generali', diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/ja.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/ja.dict.itop-config-mgmt.php index 2aec14bb2..4178fec44 100644 --- a/datamodels/2.x/itop-config-mgmt/dictionaries/ja.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/dictionaries/ja.dict.itop-config-mgmt.php @@ -1547,7 +1547,8 @@ Dict::Add('JA JP', 'Japanese', '日本語', [ 'ConfigMgmt:baseinfo' => 'General~~', 'ConfigMgmt:moreinfo' => 'CI specifics~~', 'Storage:moreinfo' => 'Storage specifics~~', - 'ConfigMgmt:otherinfo' => 'Dates and description~~', + 'ConfigMgmt:otherinfo' => 'Description~~', + 'ConfigMgmt:dates' => 'Dates~~', 'Software:moreinfo' => 'Software specifics~~', 'Phone:moreinfo' => 'Phone specifics~~', 'Server:baseinfo' => '基本情報', diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/nl.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/nl.dict.itop-config-mgmt.php index 2f073711e..7cabf9dbb 100644 --- a/datamodels/2.x/itop-config-mgmt/dictionaries/nl.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/dictionaries/nl.dict.itop-config-mgmt.php @@ -1549,7 +1549,8 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', [ 'ConfigMgmt:baseinfo' => 'General~~', 'ConfigMgmt:moreinfo' => 'CI specifics~~', 'Storage:moreinfo' => 'Storage specifics~~', - 'ConfigMgmt:otherinfo' => 'Dates and description~~', + 'ConfigMgmt:otherinfo' => 'Description~~', + 'ConfigMgmt:dates' => 'Dates~~', 'Software:moreinfo' => 'Software specifics~~', 'Phone:moreinfo' => 'Phone specifics~~', 'Server:baseinfo' => 'Globale informatie', diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/pl.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/pl.dict.itop-config-mgmt.php index 88eeb6830..ea484725f 100644 --- a/datamodels/2.x/itop-config-mgmt/dictionaries/pl.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/dictionaries/pl.dict.itop-config-mgmt.php @@ -1547,7 +1547,8 @@ Dict::Add('PL PL', 'Polish', 'Polski', [ 'ConfigMgmt:baseinfo' => 'General~~', 'ConfigMgmt:moreinfo' => 'CI specifics~~', 'Storage:moreinfo' => 'Storage specifics~~', - 'ConfigMgmt:otherinfo' => 'Dates and description~~', + 'ConfigMgmt:otherinfo' => 'Description~~', + 'ConfigMgmt:dates' => 'Dates~~', 'Software:moreinfo' => 'Software specifics~~', 'Phone:moreinfo' => 'Phone specifics~~', 'Server:baseinfo' => 'Informacje ogólne', diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/pt_br.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/pt_br.dict.itop-config-mgmt.php index b3b0248cf..c1c2218a5 100644 --- a/datamodels/2.x/itop-config-mgmt/dictionaries/pt_br.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/dictionaries/pt_br.dict.itop-config-mgmt.php @@ -1547,7 +1547,8 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', [ 'ConfigMgmt:baseinfo' => 'General~~', 'ConfigMgmt:moreinfo' => 'CI specifics~~', 'Storage:moreinfo' => 'Storage specifics~~', - 'ConfigMgmt:otherinfo' => 'Dates and description~~', + 'ConfigMgmt:otherinfo' => 'Description~~', + 'ConfigMgmt:dates' => 'Dates~~', 'Software:moreinfo' => 'Software specifics~~', 'Phone:moreinfo' => 'Phone specifics~~', 'Server:baseinfo' => 'Informações gerais', diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/ru.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/ru.dict.itop-config-mgmt.php index 779bdc055..a4e422cbe 100644 --- a/datamodels/2.x/itop-config-mgmt/dictionaries/ru.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/dictionaries/ru.dict.itop-config-mgmt.php @@ -1548,7 +1548,8 @@ Dict::Add('RU RU', 'Russian', 'Русский', [ 'ConfigMgmt:baseinfo' => 'General~~', 'ConfigMgmt:moreinfo' => 'CI specifics~~', 'Storage:moreinfo' => 'Storage specifics~~', - 'ConfigMgmt:otherinfo' => 'Dates and description~~', + 'ConfigMgmt:otherinfo' => 'Description~~', + 'ConfigMgmt:dates' => 'Dates~~', 'Software:moreinfo' => 'Software specifics~~', 'Phone:moreinfo' => 'Phone specifics~~', 'Server:baseinfo' => 'Основное', diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/sk.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/sk.dict.itop-config-mgmt.php index 71004b1ae..cf5c88377 100644 --- a/datamodels/2.x/itop-config-mgmt/dictionaries/sk.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/dictionaries/sk.dict.itop-config-mgmt.php @@ -1547,7 +1547,8 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', [ 'ConfigMgmt:baseinfo' => 'General~~', 'ConfigMgmt:moreinfo' => 'CI specifics~~', 'Storage:moreinfo' => 'Storage specifics~~', - 'ConfigMgmt:otherinfo' => 'Dates and description~~', + 'ConfigMgmt:otherinfo' => 'Description~~', + 'ConfigMgmt:dates' => 'Dates~~', 'Software:moreinfo' => 'Software specifics~~', 'Phone:moreinfo' => 'Phone specifics~~', 'Server:baseinfo' => 'Všeobecné informácie', diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/tr.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/tr.dict.itop-config-mgmt.php index c53b29d52..0757c47f7 100644 --- a/datamodels/2.x/itop-config-mgmt/dictionaries/tr.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/dictionaries/tr.dict.itop-config-mgmt.php @@ -1548,7 +1548,8 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', [ 'ConfigMgmt:baseinfo' => 'General~~', 'ConfigMgmt:moreinfo' => 'CI specifics~~', 'Storage:moreinfo' => 'Storage specifics~~', - 'ConfigMgmt:otherinfo' => 'Dates and description~~', + 'ConfigMgmt:otherinfo' => 'Description~~', + 'ConfigMgmt:dates' => 'Dates~~', 'Software:moreinfo' => 'Software specifics~~', 'Phone:moreinfo' => 'Phone specifics~~', 'Server:baseinfo' => 'Genel Bilgi', diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/zh_cn.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/zh_cn.dict.itop-config-mgmt.php index a7460334d..48c17bfa0 100644 --- a/datamodels/2.x/itop-config-mgmt/dictionaries/zh_cn.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/dictionaries/zh_cn.dict.itop-config-mgmt.php @@ -1564,7 +1564,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [ 'ConfigMgmt:baseinfo' => 'General~~', 'ConfigMgmt:moreinfo' => 'CI specifics~~', 'Storage:moreinfo' => 'Storage specifics~~', - 'ConfigMgmt:otherinfo' => 'Dates and description~~', + 'ConfigMgmt:otherinfo' => 'Description~~', + 'ConfigMgmt:dates' => 'Dates~~', 'Software:moreinfo' => 'Software specifics~~', 'Phone:moreinfo' => 'Phone specifics~~', 'Server:baseinfo' => '基本信息', diff --git a/datamodels/2.x/itop-config-mgmt/module.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/module.itop-config-mgmt.php index 4239ef8ca..12bea24bd 100755 --- a/datamodels/2.x/itop-config-mgmt/module.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/module.itop-config-mgmt.php @@ -31,17 +31,17 @@ SetupWebPage::AddModule( 'data/en_us.data.itop-osversion.xml', ], 'data.sample' => [ - 'data.sample.model.xml', - 'data.sample.networkdevicetype.xml', - 'data.sample.servers.xml', - 'data.sample.nw-devices.xml', - 'data.sample.software.xml', - 'data.sample.dbserver.xml', - 'data.sample.dbschema.xml', - 'data.sample.webserver.xml', - 'data.sample.webapp.xml', - 'data.sample.applications.xml', - 'data.sample.applicationsolutionci.xml', + 'data/data.sample.model.xml', + 'data/data.sample.networkdevicetype.xml', + 'data/data.sample.servers.xml', + 'data/data.sample.nw-devices.xml', + 'data/data.sample.software.xml', + 'data/data.sample.dbserver.xml', + 'data/data.sample.dbschema.xml', + 'data/data.sample.webserver.xml', + 'data/data.sample.webapp.xml', + 'data/data.sample.applications.xml', + 'data/data.sample.applicationsolutionci.xml', ], // Documentation diff --git a/datamodels/2.x/itop-container-mgmt/datamodel.itop-container-mgmt.xml b/datamodels/2.x/itop-container-mgmt/datamodel.itop-container-mgmt.xml index f5642c048..d654e81ec 100644 --- a/datamodels/2.x/itop-container-mgmt/datamodel.itop-container-mgmt.xml +++ b/datamodels/2.x/itop-container-mgmt/datamodel.itop-container-mgmt.xml @@ -182,7 +182,7 @@ - + 10 @@ -193,7 +193,7 @@ 10 - + 10 @@ -215,10 +215,10 @@ - + - 60 + 10 10 @@ -392,7 +392,7 @@ - + 10 @@ -425,20 +425,25 @@ - + - 50 - - - - 70 + 10 10 + + + + 10 + + + + 20 + 20 @@ -936,7 +941,7 @@ - + 10 @@ -975,17 +980,22 @@ - + - 50 - - - 60 + 10 10 + + + + 10 + + + 20 + 20 @@ -1143,7 +1153,7 @@ - + 10 @@ -1173,17 +1183,22 @@ - + - 50 - - - 60 + 10 10 + + + + 10 + + + 20 + 20 diff --git a/datamodels/2.x/itop-datacenter-mgmt/data.sample.racks.xml b/datamodels/2.x/itop-datacenter-mgmt/data/data.sample.racks.xml old mode 100755 new mode 100644 similarity index 100% rename from datamodels/2.x/itop-datacenter-mgmt/data.sample.racks.xml rename to datamodels/2.x/itop-datacenter-mgmt/data/data.sample.racks.xml diff --git a/datamodels/2.x/itop-datacenter-mgmt/datamodel.itop-datacenter-mgmt.xml b/datamodels/2.x/itop-datacenter-mgmt/datamodel.itop-datacenter-mgmt.xml index e3d2323cf..be9652e86 100755 --- a/datamodels/2.x/itop-datacenter-mgmt/datamodel.itop-datacenter-mgmt.xml +++ b/datamodels/2.x/itop-datacenter-mgmt/datamodel.itop-datacenter-mgmt.xml @@ -20,7 +20,7 @@ @@ -105,7 +105,7 @@ 20 - + 10 @@ -249,7 +249,7 @@ @@ -290,7 +290,7 @@ 10 - + 10 @@ -338,25 +338,25 @@ 20 - + 10 - 120 + 10 - 130 + 20 - 140 + 30 - + 20 - 150 + 10 @@ -503,7 +503,7 @@ 10 - + 10 @@ -545,25 +545,25 @@ 20 - + 10 - 100 + 10 - 110 + 20 - 120 + 30 - + 20 - 130 + 10 @@ -706,7 +706,7 @@ 10 - + 10 @@ -748,25 +748,25 @@ 20 - + 10 - 100 + 10 - 110 + 20 - 120 + 30 - + 20 - 130 + 10 @@ -929,7 +929,7 @@ 10 - + 10 @@ -977,25 +977,25 @@ 20 - + 10 - 120 + 10 - 130 + 20 - 140 + 30 - + 20 - 150 + 10 diff --git a/datamodels/2.x/itop-datacenter-mgmt/module.itop-datacenter-mgmt.php b/datamodels/2.x/itop-datacenter-mgmt/module.itop-datacenter-mgmt.php index 30d29a8c9..7d37bbe2a 100755 --- a/datamodels/2.x/itop-datacenter-mgmt/module.itop-datacenter-mgmt.php +++ b/datamodels/2.x/itop-datacenter-mgmt/module.itop-datacenter-mgmt.php @@ -45,7 +45,7 @@ SetupWebPage::AddModule( ], 'data.sample' => [ // add your sample data XML files here, - 'data.sample.racks.xml', + 'data/data.sample.racks.xml', ], // Documentation diff --git a/datamodels/2.x/itop-endusers-devices/datamodel.itop-endusers-devices.xml b/datamodels/2.x/itop-endusers-devices/datamodel.itop-endusers-devices.xml index 2014ea758..5fa8387ba 100755 --- a/datamodels/2.x/itop-endusers-devices/datamodel.itop-endusers-devices.xml +++ b/datamodels/2.x/itop-endusers-devices/datamodel.itop-endusers-devices.xml @@ -196,7 +196,7 @@ 10 - + 10 @@ -241,25 +241,25 @@ 20 - + 10 - 110 + 10 - 120 + 20 - 130 + 30 - + 20 - 140 + 10 @@ -407,7 +407,7 @@ 10 - + 10 @@ -458,25 +458,25 @@ 20 - + 10 - 130 + 10 - 140 + 20 - 150 + 30 - + 20 - 160 + 10 @@ -616,7 +616,7 @@ 10 - + 10 @@ -661,25 +661,25 @@ 20 - + 10 - 110 + 10 - 120 + 20 - 130 + 30 - + 20 - 140 + 10 @@ -815,7 +815,7 @@ 10 - + 10 @@ -857,25 +857,25 @@ 20 - + 10 - 100 + 10 - 110 + 20 - 120 + 30 - + 20 - 130 + 10 @@ -1061,7 +1061,7 @@ 10 - + 10 @@ -1118,7 +1118,7 @@ 20 - + 10 @@ -1132,7 +1132,7 @@ - + 20 @@ -1282,7 +1282,7 @@ 10 - + 10 @@ -1324,7 +1324,7 @@ 20 - + 10 @@ -1338,7 +1338,7 @@ - + 20 @@ -1482,7 +1482,7 @@ 10 - + 10 @@ -1524,25 +1524,25 @@ 20 - + 10 - 100 + 10 - 110 + 20 - 120 + 30 - + 20 - 130 + 10 diff --git a/datamodels/2.x/itop-faq-light/data.sample.faq-domains.xml b/datamodels/2.x/itop-faq-light/data/data.sample.faq-domains.xml similarity index 100% rename from datamodels/2.x/itop-faq-light/data.sample.faq-domains.xml rename to datamodels/2.x/itop-faq-light/data/data.sample.faq-domains.xml diff --git a/datamodels/2.x/itop-faq-light/module.itop-faq-light.php b/datamodels/2.x/itop-faq-light/module.itop-faq-light.php index 476a797f3..a342b2e4e 100755 --- a/datamodels/2.x/itop-faq-light/module.itop-faq-light.php +++ b/datamodels/2.x/itop-faq-light/module.itop-faq-light.php @@ -26,7 +26,7 @@ SetupWebPage::AddModule( //'data.struct.itop-knownerror-mgmt.xml', ], 'data.sample' => [ - 'data.sample.faq-domains.xml', + 'data/data.sample.faq-domains.xml', ], // Documentation diff --git a/datamodels/2.x/itop-service-mgmt-provider/data.sample.contracts.xml b/datamodels/2.x/itop-service-mgmt-provider/data/data.sample.contracts.xml old mode 100755 new mode 100644 similarity index 100% rename from datamodels/2.x/itop-service-mgmt-provider/data.sample.contracts.xml rename to datamodels/2.x/itop-service-mgmt-provider/data/data.sample.contracts.xml diff --git a/datamodels/2.x/itop-service-mgmt-provider/data.sample.contractservice.xml b/datamodels/2.x/itop-service-mgmt-provider/data/data.sample.contractservice.xml old mode 100755 new mode 100644 similarity index 100% rename from datamodels/2.x/itop-service-mgmt-provider/data.sample.contractservice.xml rename to datamodels/2.x/itop-service-mgmt-provider/data/data.sample.contractservice.xml diff --git a/datamodels/2.x/itop-service-mgmt-provider/data.sample.deliverymodel.xml b/datamodels/2.x/itop-service-mgmt-provider/data/data.sample.deliverymodel.xml old mode 100755 new mode 100644 similarity index 100% rename from datamodels/2.x/itop-service-mgmt-provider/data.sample.deliverymodel.xml rename to datamodels/2.x/itop-service-mgmt-provider/data/data.sample.deliverymodel.xml diff --git a/datamodels/2.x/itop-service-mgmt-provider/data.sample.deliverymodelcontact.xml b/datamodels/2.x/itop-service-mgmt-provider/data/data.sample.deliverymodelcontact.xml old mode 100755 new mode 100644 similarity index 100% rename from datamodels/2.x/itop-service-mgmt-provider/data.sample.deliverymodelcontact.xml rename to datamodels/2.x/itop-service-mgmt-provider/data/data.sample.deliverymodelcontact.xml diff --git a/datamodels/2.x/itop-service-mgmt-provider/data.sample.organizations.xml b/datamodels/2.x/itop-service-mgmt-provider/data/data.sample.organizations.xml old mode 100755 new mode 100644 similarity index 100% rename from datamodels/2.x/itop-service-mgmt-provider/data.sample.organizations.xml rename to datamodels/2.x/itop-service-mgmt-provider/data/data.sample.organizations.xml diff --git a/datamodels/2.x/itop-service-mgmt-provider/data.sample.serviceelements.xml b/datamodels/2.x/itop-service-mgmt-provider/data/data.sample.serviceelements.xml old mode 100755 new mode 100644 similarity index 100% rename from datamodels/2.x/itop-service-mgmt-provider/data.sample.serviceelements.xml rename to datamodels/2.x/itop-service-mgmt-provider/data/data.sample.serviceelements.xml diff --git a/datamodels/2.x/itop-service-mgmt-provider/data.sample.servicefamilies.xml b/datamodels/2.x/itop-service-mgmt-provider/data/data.sample.servicefamilies.xml similarity index 100% rename from datamodels/2.x/itop-service-mgmt-provider/data.sample.servicefamilies.xml rename to datamodels/2.x/itop-service-mgmt-provider/data/data.sample.servicefamilies.xml diff --git a/datamodels/2.x/itop-service-mgmt-provider/data.sample.services.xml b/datamodels/2.x/itop-service-mgmt-provider/data/data.sample.services.xml old mode 100755 new mode 100644 similarity index 100% rename from datamodels/2.x/itop-service-mgmt-provider/data.sample.services.xml rename to datamodels/2.x/itop-service-mgmt-provider/data/data.sample.services.xml diff --git a/datamodels/2.x/itop-service-mgmt-provider/data.sample.sla.xml b/datamodels/2.x/itop-service-mgmt-provider/data/data.sample.sla.xml old mode 100755 new mode 100644 similarity index 100% rename from datamodels/2.x/itop-service-mgmt-provider/data.sample.sla.xml rename to datamodels/2.x/itop-service-mgmt-provider/data/data.sample.sla.xml diff --git a/datamodels/2.x/itop-service-mgmt-provider/data.sample.slt.xml b/datamodels/2.x/itop-service-mgmt-provider/data/data.sample.slt.xml old mode 100755 new mode 100644 similarity index 100% rename from datamodels/2.x/itop-service-mgmt-provider/data.sample.slt.xml rename to datamodels/2.x/itop-service-mgmt-provider/data/data.sample.slt.xml diff --git a/datamodels/2.x/itop-service-mgmt-provider/data.sample.sltsla.xml b/datamodels/2.x/itop-service-mgmt-provider/data/data.sample.sltsla.xml old mode 100755 new mode 100644 similarity index 100% rename from datamodels/2.x/itop-service-mgmt-provider/data.sample.sltsla.xml rename to datamodels/2.x/itop-service-mgmt-provider/data/data.sample.sltsla.xml diff --git a/datamodels/2.x/itop-service-mgmt-provider/module.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/module.itop-service-mgmt-provider.php index 3356b8448..7e92b5da2 100755 --- a/datamodels/2.x/itop-service-mgmt-provider/module.itop-service-mgmt-provider.php +++ b/datamodels/2.x/itop-service-mgmt-provider/module.itop-service-mgmt-provider.php @@ -26,18 +26,18 @@ SetupWebPage::AddModule( //'data.struct.itop-service-mgmt.xml', ], 'data.sample' => [ - 'data.sample.organizations.xml', - 'data.sample.contracts.xml', - 'data.sample.servicefamilies.xml', - 'data.sample.services.xml', - 'data.sample.serviceelements.xml', - 'data.sample.sla.xml', - 'data.sample.slt.xml', - 'data.sample.sltsla.xml', - // 'data.sample.coveragewindows.xml', - 'data.sample.contractservice.xml', - // 'data.sample.deliverymodel.xml', - 'data.sample.deliverymodelcontact.xml', + 'data/data.sample.organizations.xml', + 'data/data.sample.contracts.xml', + 'data/data.sample.servicefamilies.xml', + 'data/data.sample.services.xml', + 'data/data.sample.serviceelements.xml', + 'data/data.sample.sla.xml', + 'data/data.sample.slt.xml', + 'data/data.sample.sltsla.xml', + // 'data/data.sample.coveragewindows.xml', + 'data/data.sample.contractservice.xml', + // 'data/data.sample.deliverymodel.xml', + 'data/data.sample.deliverymodelcontact.xml', ], // Documentation diff --git a/datamodels/2.x/itop-service-mgmt/data.sample.contracts.xml b/datamodels/2.x/itop-service-mgmt/data/data.sample.contracts.xml old mode 100755 new mode 100644 similarity index 100% rename from datamodels/2.x/itop-service-mgmt/data.sample.contracts.xml rename to datamodels/2.x/itop-service-mgmt/data/data.sample.contracts.xml diff --git a/datamodels/2.x/itop-service-mgmt/data.sample.contractservice.xml b/datamodels/2.x/itop-service-mgmt/data/data.sample.contractservice.xml old mode 100755 new mode 100644 similarity index 100% rename from datamodels/2.x/itop-service-mgmt/data.sample.contractservice.xml rename to datamodels/2.x/itop-service-mgmt/data/data.sample.contractservice.xml diff --git a/datamodels/2.x/itop-service-mgmt/data.sample.coveragewindows.xml b/datamodels/2.x/itop-service-mgmt/data/data.sample.coveragewindows.xml old mode 100755 new mode 100644 similarity index 100% rename from datamodels/2.x/itop-service-mgmt/data.sample.coveragewindows.xml rename to datamodels/2.x/itop-service-mgmt/data/data.sample.coveragewindows.xml diff --git a/datamodels/2.x/itop-service-mgmt/data.sample.deliverymodel.xml b/datamodels/2.x/itop-service-mgmt/data/data.sample.deliverymodel.xml old mode 100755 new mode 100644 similarity index 100% rename from datamodels/2.x/itop-service-mgmt/data.sample.deliverymodel.xml rename to datamodels/2.x/itop-service-mgmt/data/data.sample.deliverymodel.xml diff --git a/datamodels/2.x/itop-service-mgmt/data.sample.deliverymodelcontact.xml b/datamodels/2.x/itop-service-mgmt/data/data.sample.deliverymodelcontact.xml old mode 100755 new mode 100644 similarity index 100% rename from datamodels/2.x/itop-service-mgmt/data.sample.deliverymodelcontact.xml rename to datamodels/2.x/itop-service-mgmt/data/data.sample.deliverymodelcontact.xml diff --git a/datamodels/2.x/itop-service-mgmt/data.sample.organizations.xml b/datamodels/2.x/itop-service-mgmt/data/data.sample.organizations.xml old mode 100755 new mode 100644 similarity index 100% rename from datamodels/2.x/itop-service-mgmt/data.sample.organizations.xml rename to datamodels/2.x/itop-service-mgmt/data/data.sample.organizations.xml diff --git a/datamodels/2.x/itop-service-mgmt/data.sample.serviceelements.xml b/datamodels/2.x/itop-service-mgmt/data/data.sample.serviceelements.xml old mode 100755 new mode 100644 similarity index 100% rename from datamodels/2.x/itop-service-mgmt/data.sample.serviceelements.xml rename to datamodels/2.x/itop-service-mgmt/data/data.sample.serviceelements.xml diff --git a/datamodels/2.x/itop-service-mgmt/data.sample.servicefamilies.xml b/datamodels/2.x/itop-service-mgmt/data/data.sample.servicefamilies.xml similarity index 100% rename from datamodels/2.x/itop-service-mgmt/data.sample.servicefamilies.xml rename to datamodels/2.x/itop-service-mgmt/data/data.sample.servicefamilies.xml diff --git a/datamodels/2.x/itop-service-mgmt/data.sample.services.xml b/datamodels/2.x/itop-service-mgmt/data/data.sample.services.xml old mode 100755 new mode 100644 similarity index 100% rename from datamodels/2.x/itop-service-mgmt/data.sample.services.xml rename to datamodels/2.x/itop-service-mgmt/data/data.sample.services.xml diff --git a/datamodels/2.x/itop-service-mgmt/data.sample.sla.xml b/datamodels/2.x/itop-service-mgmt/data/data.sample.sla.xml old mode 100755 new mode 100644 similarity index 100% rename from datamodels/2.x/itop-service-mgmt/data.sample.sla.xml rename to datamodels/2.x/itop-service-mgmt/data/data.sample.sla.xml diff --git a/datamodels/2.x/itop-service-mgmt/data.sample.slt.xml b/datamodels/2.x/itop-service-mgmt/data/data.sample.slt.xml old mode 100755 new mode 100644 similarity index 100% rename from datamodels/2.x/itop-service-mgmt/data.sample.slt.xml rename to datamodels/2.x/itop-service-mgmt/data/data.sample.slt.xml diff --git a/datamodels/2.x/itop-service-mgmt/data.sample.sltsla.xml b/datamodels/2.x/itop-service-mgmt/data/data.sample.sltsla.xml old mode 100755 new mode 100644 similarity index 100% rename from datamodels/2.x/itop-service-mgmt/data.sample.sltsla.xml rename to datamodels/2.x/itop-service-mgmt/data/data.sample.sltsla.xml diff --git a/datamodels/2.x/itop-service-mgmt/module.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/module.itop-service-mgmt.php index c4253b91e..98103251e 100755 --- a/datamodels/2.x/itop-service-mgmt/module.itop-service-mgmt.php +++ b/datamodels/2.x/itop-service-mgmt/module.itop-service-mgmt.php @@ -26,18 +26,18 @@ SetupWebPage::AddModule( //'data.struct.itop-service-mgmt.xml', ], 'data.sample' => [ - 'data.sample.organizations.xml', - 'data.sample.contracts.xml', - 'data.sample.servicefamilies.xml', - 'data.sample.services.xml', - 'data.sample.serviceelements.xml', - 'data.sample.sla.xml', - 'data.sample.slt.xml', - 'data.sample.sltsla.xml', - // 'data.sample.coveragewindows.xml', - 'data.sample.contractservice.xml', - // 'data.sample.deliverymodel.xml', - 'data.sample.deliverymodelcontact.xml', + 'data/data.sample.organizations.xml', + 'data/data.sample.contracts.xml', + 'data/data.sample.servicefamilies.xml', + 'data/data.sample.services.xml', + 'data/data.sample.serviceelements.xml', + 'data/data.sample.sla.xml', + 'data/data.sample.slt.xml', + 'data/data.sample.sltsla.xml', + // 'data/data.sample.coveragewindows.xml', + 'data/data.sample.contractservice.xml', + // 'data/data.sample.deliverymodel.xml', + 'data/data.sample.deliverymodelcontact.xml', ], // Documentation diff --git a/datamodels/2.x/itop-storage-mgmt/datamodel.itop-storage-mgmt.xml b/datamodels/2.x/itop-storage-mgmt/datamodel.itop-storage-mgmt.xml index 6b23b3310..608c80af6 100644 --- a/datamodels/2.x/itop-storage-mgmt/datamodel.itop-storage-mgmt.xml +++ b/datamodels/2.x/itop-storage-mgmt/datamodel.itop-storage-mgmt.xml @@ -70,7 +70,7 @@ 110 - + 10 @@ -124,7 +124,7 @@ 120 - + 10 @@ -152,7 +152,7 @@ - + 30 @@ -329,7 +329,7 @@ 100 - + 10 @@ -383,7 +383,7 @@ 110 - + 10 @@ -411,7 +411,7 @@ - + 30 @@ -642,7 +642,7 @@ 110 - + 10 @@ -847,7 +847,7 @@ 100 - + 10 @@ -901,7 +901,7 @@ 110 - + 10 @@ -929,7 +929,7 @@ - + 30 @@ -1097,18 +1097,43 @@
- + + + + + + 10 + + + 10 + + + + + 30 + + + 40 + + + 20 + + 10 - + + + + + + 10 + + + 10 + + 20 - - 30 - - - 40 -
@@ -1215,7 +1240,7 @@ 10 - + 10 @@ -1248,7 +1273,7 @@ 20 - + 20 @@ -1378,7 +1403,7 @@ 10 - + 10 @@ -1600,7 +1625,7 @@ 20 - + 20 diff --git a/datamodels/2.x/itop-structure/data.sample.contactteam.xml b/datamodels/2.x/itop-structure/data/data.sample.contactteam.xml similarity index 100% rename from datamodels/2.x/itop-structure/data.sample.contactteam.xml rename to datamodels/2.x/itop-structure/data/data.sample.contactteam.xml diff --git a/datamodels/2.x/itop-structure/data.sample.contacttype.xml b/datamodels/2.x/itop-structure/data/data.sample.contacttype.xml similarity index 100% rename from datamodels/2.x/itop-structure/data.sample.contacttype.xml rename to datamodels/2.x/itop-structure/data/data.sample.contacttype.xml diff --git a/datamodels/2.x/itop-structure/data.sample.locations.xml b/datamodels/2.x/itop-structure/data/data.sample.locations.xml similarity index 100% rename from datamodels/2.x/itop-structure/data.sample.locations.xml rename to datamodels/2.x/itop-structure/data/data.sample.locations.xml diff --git a/datamodels/2.x/itop-structure/data.sample.organizations.xml b/datamodels/2.x/itop-structure/data/data.sample.organizations.xml similarity index 100% rename from datamodels/2.x/itop-structure/data.sample.organizations.xml rename to datamodels/2.x/itop-structure/data/data.sample.organizations.xml diff --git a/datamodels/2.x/itop-structure/data.sample.persons.xml b/datamodels/2.x/itop-structure/data/data.sample.persons.xml similarity index 100% rename from datamodels/2.x/itop-structure/data.sample.persons.xml rename to datamodels/2.x/itop-structure/data/data.sample.persons.xml diff --git a/datamodels/2.x/itop-structure/data.sample.teams.xml b/datamodels/2.x/itop-structure/data/data.sample.teams.xml similarity index 100% rename from datamodels/2.x/itop-structure/data.sample.teams.xml rename to datamodels/2.x/itop-structure/data/data.sample.teams.xml diff --git a/datamodels/2.x/itop-structure/module.itop-structure.php b/datamodels/2.x/itop-structure/module.itop-structure.php index 918b6b144..f1da9aeaf 100644 --- a/datamodels/2.x/itop-structure/module.itop-structure.php +++ b/datamodels/2.x/itop-structure/module.itop-structure.php @@ -25,12 +25,12 @@ SetupWebPage::AddModule( 'data.struct' => [ ], 'data.sample' => [ - 'data.sample.organizations.xml', - 'data.sample.locations.xml', - 'data.sample.persons.xml', - 'data.sample.teams.xml', - 'data.sample.contactteam.xml', - 'data.sample.contacttype.xml', + 'data/data.sample.organizations.xml', + 'data/data.sample.locations.xml', + 'data/data.sample.persons.xml', + 'data/data.sample.teams.xml', + 'data/data.sample.contactteam.xml', + 'data/data.sample.contacttype.xml', ], // Documentation diff --git a/datamodels/2.x/itop-virtualization-mgmt/datamodel.itop-virtualization-mgmt.xml b/datamodels/2.x/itop-virtualization-mgmt/datamodel.itop-virtualization-mgmt.xml index bc98453d9..2633bee89 100644 --- a/datamodels/2.x/itop-virtualization-mgmt/datamodel.itop-virtualization-mgmt.xml +++ b/datamodels/2.x/itop-virtualization-mgmt/datamodel.itop-virtualization-mgmt.xml @@ -95,24 +95,49 @@
- + + + + + + 10 + + + 20 + + + 30 + + + 40 + + + 10 + + 10 - + + + + + + 10 + + + 10 + + + + + 10 + + + 20 + + 20 - - 30 - - - 40 - - - 50 - - - 60 - 70 @@ -348,30 +373,60 @@
- + + + + + + 10 + + + 20 + + + 30 + + + 40 + + + 10 + + + + + 10 + + + 20 + + + 20 + + 10 - + + + + + + 10 + + + 10 + + + + + 10 + + + 20 + + 20 - - 25 - - - 30 - - - 40 - - - 50 - - - 60 - - - 70 - 80 @@ -506,24 +561,49 @@
- + + + + + + 10 + + + 20 + + + 30 + + + 40 + + + 10 + + 10 - + + + + + + 10 + + + 10 + + + + + 10 + + + 20 + + 20 - - 25 - - - 30 - - - 40 - - - 50 - 60 @@ -722,7 +802,7 @@ 90 - + 10 @@ -737,14 +817,14 @@ 40 - - 50 - 20 + + 5 + 10 @@ -770,14 +850,19 @@ 100 - + 10 10 + + + + 20 + - 20 + 10 @@ -891,33 +976,58 @@
- + + + + + + 10 + + + 30 + + + 10 + + + + + 20 + + + 40 + + + 50 + + + 80 + + + 90 + + + 100 + + + 10 + + 10 - + + + + + + 20 + + + 20 + + 20 - - 40 - - - 50 - - - 60 - - - 70 - - - 80 - - - 90 - - - 100 -
@@ -1097,7 +1207,7 @@ - + 10 @@ -1130,20 +1240,25 @@ - + - 50 - - - - 70 + 10 10 + + + + 10 + + + + 20 + 20