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 9ecb3e49d..12e3821ca 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 @@ -1419,7 +1419,7 @@ 120 - + 10 @@ -1488,7 +1488,7 @@ 130 - + 10 @@ -1516,7 +1516,7 @@ - + 30 @@ -1749,20 +1749,25 @@ - + - 50 - - - - 70 + 10 10 + + + + 10 + + + + 20 + 20 @@ -1937,20 +1942,25 @@ - + - 50 - - - - 70 + 10 10 + + + + 10 + + + + 20 + 20 @@ -2330,18 +2340,18 @@ - + - 90 + 10 10 - + - 100 + 10 20 @@ -2514,18 +2524,18 @@ - + - 90 + 10 10 - + - 100 + 10 20 @@ -2698,18 +2708,18 @@ - + - 90 + 10 10 - + - 100 + 10 20 @@ -2874,18 +2884,18 @@ - + - 90 + 10 10 - + - 100 + 10 20 @@ -3037,18 +3047,18 @@ - + - 90 + 10 10 - + - 100 + 10 20 @@ -3198,7 +3208,7 @@ 10 - + 30 @@ -3211,20 +3221,25 @@ - + - 50 - - - - 70 + 10 10 + + + + 10 + + + + 20 + 20 @@ -3363,7 +3378,7 @@ 10 - + 10 @@ -3376,17 +3391,22 @@ - + - 50 - - - 60 + 10 10 + + + + 10 + + + 20 + 20 @@ -3557,20 +3577,25 @@ - + - 50 - - - - 70 + 10 10 + + + + 10 + + + + 20 + 20 @@ -3769,21 +3794,45 @@
- + + + + + + 10 + + + 20 + + + 10 + + + + + 30 + + + 40 + + + 20 + 10 - + + + + + + + 10 + + 20 - - 30 - - - 40 - - 60 @@ -3903,13 +3952,33 @@
- + + + + + + 10 + + + 10 + + 10 - + + + + + + 10 + + + 10 + + 20 - + 30 @@ -3993,21 +4062,46 @@
- + + + + + + 10 + + + 10 + + + + + 10 + + + 20 + + 10 - + + + + + + 10 + + + 10 + + 20 - + 30 - + 40 - - 50 -
@@ -4095,18 +4189,43 @@
- + + + + + + 10 + + + 10 + + + + + 10 + + + 20 + + 10 - + + + + + + 10 + + + 10 + + 20 - + 30 - - 40 - 50 @@ -4460,20 +4579,25 @@ - + - 70 + 10 - 80 - - - 90 + 20 10 + + + + 10 + + + 20 + 20 @@ -4636,7 +4760,7 @@ - + 70 @@ -4644,12 +4768,17 @@ 80 - - 90 - 10 + + + + 10 + + + 20 + 20 @@ -6127,21 +6256,46 @@
- + + + + + + 10 + + + 30 + + + 10 + + + + + 10 + + + 20 + + + 20 + + 10 - + + + + + + 10 + + + 10 + + 20 - - 25 - - - 30 - - - 40 - 50 @@ -6289,15 +6443,35 @@
- + + + + + + 10 + + + 20 + + + 10 + + 10 - + + + + + + 10 + + + 10 + + 20 - - 30 - 40 @@ -6763,10 +6937,10 @@ - + - 60 + 10 10 @@ -7579,10 +7753,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 71c7cb825..10a0c87a5 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 @@ -1547,7 +1547,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 8ba4efa83..814646c99 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 @@ -1546,7 +1546,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 cfd970b26..5184b6ca8 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 @@ -1546,7 +1546,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 1eded7c0f..e5ae3e221 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 @@ -1578,7 +1578,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 fc9c372a8..cc55a4a40 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 @@ -1550,7 +1550,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 737ca4f18..7788c26d8 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 @@ -1543,7 +1543,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 c988d64f0..3ac44f011 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 @@ -1737,7 +1737,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 b00ccd3bd..187b3fc36 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 @@ -1545,7 +1545,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 b980824f0..a39879f89 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 @@ -1566,7 +1566,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 dc395c7aa..10142b781 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 @@ -1545,7 +1545,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 f4202e9e2..4f8494636 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 @@ -1547,7 +1547,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 8901bce2a..1d45d952e 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 @@ -1545,7 +1545,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 da511e76c..e8bcffff1 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 @@ -1545,7 +1545,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 070b946b6..71089ded6 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 @@ -1546,7 +1546,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 f0815599c..19dd630af 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 @@ -1545,7 +1545,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 4b241d68c..36ba587f0 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 @@ -1546,7 +1546,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 6bd4a203d..1011aeba2 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 @@ -1562,7 +1562,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 9632bafae..abca2e677 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 @@ -30,17 +30,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..805e4fc25 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 @@ -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..4d1a2a35d 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..0ba0cb7f5 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 @@ -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-virtualization-mgmt/datamodel.itop-virtualization-mgmt.xml b/datamodels/2.x/itop-virtualization-mgmt/datamodel.itop-virtualization-mgmt.xml index bc98453d9..3e5d75492 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,59 @@
- + + + + + + 10 + + + 20 + + + 30 + + + 40 + + + 10 + + + + + 10 + + + 20 + + + 20 + 10 - + + + + + + 10 + + + 10 + + + + + 10 + + + 20 + + 20 - - 25 - - - 30 - - - 40 - - - 50 - - - 60 - - - 70 - 80 @@ -506,24 +560,49 @@
- + + + + + + 10 + + + 20 + + + 30 + + + 40 + + + 10 + + 10 - + + + + + + 10 + + + 10 + + + + + 10 + + + 20 + + 20 - - 25 - - - 30 - - - 40 - - - 50 - 60 @@ -722,7 +801,7 @@ 90 - + 10 @@ -737,14 +816,14 @@ 40 - - 50 - 20 + + 5 + 10 @@ -770,17 +849,21 @@ 100 - + 10 10 - - 20 - + + 20 + + + 10 + + @@ -891,33 +974,58 @@
- + + + + + + 10 + + + 30 + + + 10 + + + + + 20 + + + 40 + + + 50 + + + 80 + + + 90 + + + 100 + + + 10 + + 10 - + + + + + + 20 + + + 20 + + 20 - - 40 - - - 50 - - - 60 - - - 70 - - - 80 - - - 90 - - - 100 -
@@ -1097,7 +1205,7 @@ - + 10 @@ -1130,20 +1238,25 @@ - + - 50 - - - - 70 + 10 10 + + + + 10 + + + + 20 + 20