From 8c2c4e5ff072ea10bb21e20f91a852747a5bdbb9 Mon Sep 17 00:00:00 2001 From: Vincent Dumas <42336698+v-dumas@users.noreply.github.com> Date: Wed, 22 Apr 2026 09:56:12 +0200 Subject: [PATCH] =?UTF-8?q?N=C2=B09491=20-=20Add=20OS=20Family=20on=20OS?= =?UTF-8?q?=20Patch=20and=20OS=20Licence=20(#886)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * N°9492 - Add icon on OS Family, OS Version and IOS Version classes * Change enclosure icon * Update NL dictionnaries * Update datamodels/2.x/itop-config-mgmt/dictionaries/nl.dict.itop-config-mgmt.php * Update datamodels/2.x/itop-config-mgmt/dictionaries/nl.dict.itop-config-mgmt.php * Update datamodels/2.x/itop-config-mgmt/dictionaries/de.dict.itop-config-mgmt.php * Update datamodels/2.x/itop-config-mgmt/dictionaries/cs.dict.itop-config-mgmt.php * Update datamodels/2.x/itop-config-mgmt/dictionaries/da.dict.itop-config-mgmt.php Co-authored-by: Thomas Casteleyn --- .../datamodel.itop-config-mgmt.xml | 38 +- .../dictionaries/cs.dict.itop-config-mgmt.php | 4 + .../dictionaries/da.dict.itop-config-mgmt.php | 4 + .../dictionaries/de.dict.itop-config-mgmt.php | 4 + .../dictionaries/en.dict.itop-config-mgmt.php | 4 + .../en_gb.dict.itop-config-mgmt.php | 4 + .../es_cr.dict.itop-config-mgmt.php | 6 +- .../dictionaries/fr.dict.itop-config-mgmt.php | 4 + .../dictionaries/hu.dict.itop-config-mgmt.php | 21 +- .../dictionaries/it.dict.itop-config-mgmt.php | 4 + .../dictionaries/ja.dict.itop-config-mgmt.php | 4 + .../dictionaries/nl.dict.itop-config-mgmt.php | 4 + .../dictionaries/pl.dict.itop-config-mgmt.php | 4 + .../pt_br.dict.itop-config-mgmt.php | 4 + .../dictionaries/ru.dict.itop-config-mgmt.php | 4 + .../dictionaries/sk.dict.itop-config-mgmt.php | 4 + .../dictionaries/tr.dict.itop-config-mgmt.php | 4 + .../zh_cn.dict.itop-config-mgmt.php | 4 + .../images/icons8-ios-version-software.svg | 207 +++++++++ .../images/icons8-os-family-software.svg | 158 +++++++ .../images/icons8-os-version-software.svg | 180 ++++++++ .../datamodel.itop-datacenter-mgmt.xml | 2 +- images/icons/icons8-enclosure-new.svg | 402 ++++++++++++++++++ 23 files changed, 1051 insertions(+), 23 deletions(-) create mode 100644 datamodels/2.x/itop-config-mgmt/images/icons8-ios-version-software.svg create mode 100644 datamodels/2.x/itop-config-mgmt/images/icons8-os-family-software.svg create mode 100644 datamodels/2.x/itop-config-mgmt/images/icons8-os-version-software.svg create mode 100644 images/icons/icons8-enclosure-new.svg 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 55268e0864..7540ffb64f 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 @@ -4197,6 +4197,10 @@ false DEL_MANUAL + + osversion_id + osfamily_id + osversion_id name @@ -4218,9 +4222,12 @@ - + 10 + + 20 + 20 @@ -4665,6 +4672,10 @@ false DEL_MANUAL + + osversion_id + osfamily_id + osversion_id name @@ -4704,6 +4715,9 @@ 20 + + 10 + 30 @@ -5107,7 +5121,7 @@ @@ -5218,7 +5232,7 @@ logo @@ -5694,7 +5708,7 @@ @@ -8338,6 +8352,22 @@ Menu:ConfigManagement:SWAndApps ../images/icons/icons8-software.svg + + 0.1 + Software + + + 0.2 + OSFamily + + + 0.3 + OSVersion + + + 0.4 + IOSVersion + 1 Middleware 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 79f09d68e2..ed99de5b56 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 @@ -948,6 +948,8 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', [ 'Class:OSPatch/Attribute:functionalcis_list+' => 'Všechna zařízení, kde je tato záplata (patch) instalována', 'Class:OSPatch/Attribute:osversion_id' => 'Verze OS', 'Class:OSPatch/Attribute:osversion_id+' => '', + 'Class:OSPatch/Attribute:osfamily_id' => 'OS Family~~', + 'Class:OSPatch/Attribute:osfamily_id+' => '', 'Class:OSPatch/Attribute:osversion_name' => 'Název verze OS', 'Class:OSPatch/Attribute:osversion_name+' => '', ]); @@ -1012,6 +1014,8 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', [ 'Class:OSLicence/ComplementaryName' => '%1$s - %2$s~~', 'Class:OSLicence/Attribute:osversion_id' => 'Verze OS', 'Class:OSLicence/Attribute:osversion_id+' => '', + 'Class:OSLicence/Attribute:osfamily_id' => 'OS Family~~', + 'Class:OSLicence/Attribute:osfamily_id+' => '', 'Class:OSLicence/Attribute:osversion_name' => 'Název verze OS', 'Class:OSLicence/Attribute:osversion_name+' => '', 'Class:OSLicence/Attribute:virtualmachines_list' => 'Virtuální stroje (VM)', 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 0d689f7c9c..fab0d29418 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 @@ -947,6 +947,8 @@ Dict::Add('DA DA', 'Danish', 'Dansk', [ 'Class:OSPatch/Attribute:functionalcis_list+' => 'All the systems where this patch is installed~~', 'Class:OSPatch/Attribute:osversion_id' => 'OS Version', 'Class:OSPatch/Attribute:osversion_id+' => '', + 'Class:OSPatch/Attribute:osfamily_id' => 'OS Family~~', + 'Class:OSPatch/Attribute:osfamily_id+' => '', 'Class:OSPatch/Attribute:osversion_name' => 'OS versionsnavn', 'Class:OSPatch/Attribute:osversion_name+' => '', ]); @@ -1011,6 +1013,8 @@ Dict::Add('DA DA', 'Danish', 'Dansk', [ 'Class:OSLicence/ComplementaryName' => '%1$s - %2$s~~', 'Class:OSLicence/Attribute:osversion_id' => 'OS-Version', 'Class:OSLicence/Attribute:osversion_id+' => '', + 'Class:OSLicence/Attribute:osfamily_id' => 'OS Family~~', + 'Class:OSLicence/Attribute:osfamily_id+' => '', 'Class:OSLicence/Attribute:osversion_name' => 'OS versionsnavn', 'Class:OSLicence/Attribute:osversion_name+' => '', 'Class:OSLicence/Attribute:virtualmachines_list' => 'Virtuelle Maskiner', 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 5111c8adda..278a1aa7a1 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 @@ -947,6 +947,8 @@ Dict::Add('DE DE', 'German', 'Deutsch', [ 'Class:OSPatch/Attribute:functionalcis_list+' => 'Alle Systeme, auf denen dieser Patch installiert ist', 'Class:OSPatch/Attribute:osversion_id' => 'OS Version', 'Class:OSPatch/Attribute:osversion_id+' => '', + 'Class:OSPatch/Attribute:osfamily_id' => 'OS Family~~', + 'Class:OSPatch/Attribute:osfamily_id+' => '', 'Class:OSPatch/Attribute:osversion_name' => 'OS-Versionsname', 'Class:OSPatch/Attribute:osversion_name+' => '', ]); @@ -1011,6 +1013,8 @@ Dict::Add('DE DE', 'German', 'Deutsch', [ 'Class:OSLicence/ComplementaryName' => '%1$s - %2$s', 'Class:OSLicence/Attribute:osversion_id' => 'OS-Version', 'Class:OSLicence/Attribute:osversion_id+' => '', + 'Class:OSLicence/Attribute:osfamily_id' => 'OS Family~~', + 'Class:OSLicence/Attribute:osfamily_id+' => '', 'Class:OSLicence/Attribute:osversion_name' => 'OS-Versionsname', 'Class:OSLicence/Attribute:osversion_name+' => '', 'Class:OSLicence/Attribute:virtualmachines_list' => 'Virtuelle Maschinen', 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 1d27ac577e..5691ff0956 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 @@ -963,6 +963,8 @@ Dict::Add('EN US', 'English', 'English', [ 'Class:OSPatch/Attribute:functionalcis_list+' => 'All the systems where this patch is installed', 'Class:OSPatch/Attribute:osversion_id' => 'OS version', 'Class:OSPatch/Attribute:osversion_id+' => '', + 'Class:OSPatch/Attribute:osfamily_id' => 'OS Family', + 'Class:OSPatch/Attribute:osfamily_id+' => '', 'Class:OSPatch/Attribute:osversion_name' => 'OS version name', 'Class:OSPatch/Attribute:osversion_name+' => '', ]); @@ -1027,6 +1029,8 @@ Dict::Add('EN US', 'English', 'English', [ 'Class:OSLicence/ComplementaryName' => '%1$s - %2$s', 'Class:OSLicence/Attribute:osversion_id' => 'OS version', 'Class:OSLicence/Attribute:osversion_id+' => '', + 'Class:OSLicence/Attribute:osfamily_id' => 'OS Family', + 'Class:OSLicence/Attribute:osfamily_id+' => '', 'Class:OSLicence/Attribute:osversion_name' => 'OS version name', 'Class:OSLicence/Attribute:osversion_name+' => '', 'Class:OSLicence/Attribute:virtualmachines_list' => 'Virtual machines', 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 609e8c3fa4..4ca5718617 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 @@ -945,6 +945,8 @@ Dict::Add('EN GB', 'British English', 'British English', [ 'Class:OSPatch/Attribute:functionalcis_list+' => 'All the systems where this patch is installed', 'Class:OSPatch/Attribute:osversion_id' => 'OS version', 'Class:OSPatch/Attribute:osversion_id+' => '', + 'Class:OSPatch/Attribute:osfamily_id' => 'OS Family~~', + 'Class:OSPatch/Attribute:osfamily_id+' => '', 'Class:OSPatch/Attribute:osversion_name' => 'OS version name', 'Class:OSPatch/Attribute:osversion_name+' => '', ]); @@ -1010,6 +1012,8 @@ Dict::Add('EN GB', 'British English', 'British English', [ 'Class:OSLicence/ComplementaryName' => '%1$s - %2$s', 'Class:OSLicence/Attribute:osversion_id' => 'OS version', 'Class:OSLicence/Attribute:osversion_id+' => '', + 'Class:OSLicence/Attribute:osfamily_id' => 'OS Family~~', + 'Class:OSLicence/Attribute:osfamily_id+' => '~~', 'Class:OSLicence/Attribute:osversion_name' => 'OS version name', 'Class:OSLicence/Attribute:osversion_name+' => '', 'Class:OSLicence/Attribute:virtualmachines_list' => 'Virtual machines', 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 9023a2a9fb..51a6e31304 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 @@ -943,7 +943,9 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [ 'Class:OSPatch/Attribute:functionalcis_list' => 'Dispositivos', 'Class:OSPatch/Attribute:functionalcis_list+' => 'Dispositivos', 'Class:OSPatch/Attribute:osversion_id' => 'Versión de SO', - 'Class:OSPatch/Attribute:osversion_id+' => 'Versión de SO', + 'Class:OSPatch/Attribute:osversion_id+' => '', + 'Class:OSPatch/Attribute:osfamily_id' => 'OS Family~~', + 'Class:OSPatch/Attribute:osfamily_id+' => '', 'Class:OSPatch/Attribute:osversion_name' => 'Versión de SO', 'Class:OSPatch/Attribute:osversion_name+' => 'Versión de SO', ]); @@ -1008,6 +1010,8 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [ 'Class:OSLicence/ComplementaryName' => '%1$s - %2$s', 'Class:OSLicence/Attribute:osversion_id' => 'Versión de SO', 'Class:OSLicence/Attribute:osversion_id+' => 'Versión de SO', + 'Class:OSLicence/Attribute:osfamily_id' => 'OS Family~~', + 'Class:OSLicence/Attribute:osfamily_id+' => '', 'Class:OSLicence/Attribute:osversion_name' => 'Versión de SO', 'Class:OSLicence/Attribute:osversion_name+' => 'Versión de SO', 'Class:OSLicence/Attribute:virtualmachines_list' => 'Máquinas Virtuales', 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 91b0e184ae..f6179617cb 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 @@ -1068,6 +1068,8 @@ Dict::Add('FR FR', 'French', 'Français', [ 'Class:OSPatch/Attribute:functionalcis_list+' => 'Tous les systèmes où ce patch est installé', 'Class:OSPatch/Attribute:osversion_id' => 'Version OS', 'Class:OSPatch/Attribute:osversion_id+' => '', + 'Class:OSPatch/Attribute:osfamily_id' => 'Famille d\'OS', + 'Class:OSPatch/Attribute:osfamily_id+' => 'Déduite de la version d\'OS sélectionnée', 'Class:OSPatch/Attribute:osversion_name' => 'Nom Version OS', 'Class:OSPatch/Attribute:osversion_name+' => '', ]); @@ -1143,6 +1145,8 @@ Dict::Add('FR FR', 'French', 'Français', [ 'Class:OSLicence/ComplementaryName' => '%1$s - %2$s', 'Class:OSLicence/Attribute:osversion_id' => 'Version OS', 'Class:OSLicence/Attribute:osversion_id+' => '', + 'Class:OSLicence/Attribute:osfamily_id' => 'Famille d\'OS', + 'Class:OSLicence/Attribute:osfamily_id+' => 'Déduite de la version d\'OS sélectionnée', 'Class:OSLicence/Attribute:osversion_name' => 'Nom Version OS', 'Class:OSLicence/Attribute:osversion_name+' => '', 'Class:OSLicence/Attribute:virtualmachines_list' => 'Machines virtuelles', 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 4671b23f02..7ec5a78d0d 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 @@ -36,23 +36,6 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', [ // Class:/UniquenessRule: // Class:/UniquenessRule:+ -////////////////////////////////////////////////////////////////////// -// Classes in 'bizmodel' -////////////////////////////////////////////////////////////////////// -// - -// Dictionnay conventions -// Class: -// Class:+ -// Class:/Attribute: -// Class:/Attribute:+ -// Class:/Attribute:/Value: -// Class:/Attribute:/Value:+ -// Class:/Stimulus: -// Class:/Stimulus:+ -// Class:/UniquenessRule: -// Class:/UniquenessRule:+ - ////////////////////////////////////////////////////////////////////// // Note: The classes have been grouped by categories: bizmodel ////////////////////////////////////////////////////////////////////// @@ -946,6 +929,8 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', [ 'Class:OSPatch/Attribute:functionalcis_list+' => 'Rendszerek, amelyekre telepítve lett ez az OS javítócsomag', 'Class:OSPatch/Attribute:osversion_id' => 'OS verzió', 'Class:OSPatch/Attribute:osversion_id+' => '~~', + 'Class:OSPatch/Attribute:osfamily_id' => 'OS Family~~', + 'Class:OSPatch/Attribute:osfamily_id+' => '~~', 'Class:OSPatch/Attribute:osversion_name' => 'OS verzió név', 'Class:OSPatch/Attribute:osversion_name+' => '~~', ]); @@ -1010,6 +995,8 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', [ 'Class:OSLicence/ComplementaryName' => '%1$s - %2$s~~', 'Class:OSLicence/Attribute:osversion_id' => 'OS verzió', 'Class:OSLicence/Attribute:osversion_id+' => '~~', + 'Class:OSLicence/Attribute:osfamily_id' => 'OS Family~~', + 'Class:OSLicence/Attribute:osfamily_id+' => '~~', 'Class:OSLicence/Attribute:osversion_name' => 'OS verzió név', 'Class:OSLicence/Attribute:osversion_name+' => '~~', 'Class:OSLicence/Attribute:virtualmachines_list' => 'Virtuális gépek', 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 239057ae7a..06f6a6d926 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 @@ -946,6 +946,8 @@ Dict::Add('IT IT', 'Italian', 'Italiano', [ 'Class:OSPatch/Attribute:functionalcis_list+' => 'Tutti i sistemi in cui questa patch è installata', 'Class:OSPatch/Attribute:osversion_id' => 'Versione del Sistema Operativo', 'Class:OSPatch/Attribute:osversion_id+' => '~~', + 'Class:OSPatch/Attribute:osfamily_id' => 'OS Family~~', + 'Class:OSPatch/Attribute:osfamily_id+' => '~~', 'Class:OSPatch/Attribute:osversion_name' => 'Nome della Versione del Sistema Operativo', 'Class:OSPatch/Attribute:osversion_name+' => '~~', ]); @@ -1010,6 +1012,8 @@ Dict::Add('IT IT', 'Italian', 'Italiano', [ 'Class:OSLicence/ComplementaryName' => '%1$s - %2$s', 'Class:OSLicence/Attribute:osversion_id' => 'Versione del sistema operativo', 'Class:OSLicence/Attribute:osversion_id+' => '~~', + 'Class:OSLicence/Attribute:osfamily_id' => 'OS Family~~', + 'Class:OSLicence/Attribute:osfamily_id+' => '~~', 'Class:OSLicence/Attribute:osversion_name' => 'Nome della versione del sistema operativo', 'Class:OSLicence/Attribute:osversion_name+' => '~~', 'Class:OSLicence/Attribute:virtualmachines_list' => 'Macchine virtuali', 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 4178fec449..02bd6448e5 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 @@ -946,6 +946,8 @@ Dict::Add('JA JP', 'Japanese', '日本語', [ 'Class:OSPatch/Attribute:functionalcis_list+' => 'All the systems where this patch is installed~~', 'Class:OSPatch/Attribute:osversion_id' => 'OSバージョン', 'Class:OSPatch/Attribute:osversion_id+' => '', + 'Class:OSPatch/Attribute:osfamily_id' => 'OS Family~~', + 'Class:OSPatch/Attribute:osfamily_id+' => '', 'Class:OSPatch/Attribute:osversion_name' => 'OSバージョン名', 'Class:OSPatch/Attribute:osversion_name+' => '', ]); @@ -1010,6 +1012,8 @@ Dict::Add('JA JP', 'Japanese', '日本語', [ 'Class:OSLicence/ComplementaryName' => '%1$s - %2$s~~', 'Class:OSLicence/Attribute:osversion_id' => 'OSバージョン', 'Class:OSLicence/Attribute:osversion_id+' => '', + 'Class:OSLicence/Attribute:osfamily_id' => 'OS Family~~', + 'Class:OSLicence/Attribute:osfamily_id+' => '~~', 'Class:OSLicence/Attribute:osversion_name' => 'OSバージョン名', 'Class:OSLicence/Attribute:osversion_name+' => '', 'Class:OSLicence/Attribute:virtualmachines_list' => '仮想マシン', 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 7cabf9dbba..63318ef77f 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 @@ -948,6 +948,8 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', [ 'Class:OSPatch/Attribute:functionalcis_list+' => 'Alle systemen waarop deze patch is geïnstalleerd', 'Class:OSPatch/Attribute:osversion_id' => 'Versie besturingssysteem', 'Class:OSPatch/Attribute:osversion_id+' => '', + 'Class:OSPatch/Attribute:osfamily_id' => 'Soort besturingssysteem', + 'Class:OSPatch/Attribute:osfamily_id+' => '', 'Class:OSPatch/Attribute:osversion_name' => 'Naam versie besturingssysteem', 'Class:OSPatch/Attribute:osversion_name+' => '', ]); @@ -1012,6 +1014,8 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', [ 'Class:OSLicence/ComplementaryName' => '%1$s - %2$s', 'Class:OSLicence/Attribute:osversion_id' => 'Versie besturingssysteem', 'Class:OSLicence/Attribute:osversion_id+' => '', + 'Class:OSLicence/Attribute:osfamily_id' => 'Soort besturingssysteem', + 'Class:OSLicence/Attribute:osfamily_id+' => '~~', 'Class:OSLicence/Attribute:osversion_name' => 'Naam versie bestandssysteem', 'Class:OSLicence/Attribute:osversion_name+' => '', 'Class:OSLicence/Attribute:virtualmachines_list' => 'Virtuele machines', 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 ea484725f7..e8c6d2f7e7 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 @@ -946,6 +946,8 @@ Dict::Add('PL PL', 'Polish', 'Polski', [ 'Class:OSPatch/Attribute:functionalcis_list+' => 'Wszystkie systemy, w których jest zainstalowana ta poprawka', 'Class:OSPatch/Attribute:osversion_id' => 'Wersja OS', 'Class:OSPatch/Attribute:osversion_id+' => '', + 'Class:OSPatch/Attribute:osfamily_id' => 'OS Family~~', + 'Class:OSPatch/Attribute:osfamily_id+' => '', 'Class:OSPatch/Attribute:osversion_name' => 'Nazwa wersji OS', 'Class:OSPatch/Attribute:osversion_name+' => '', ]); @@ -1010,6 +1012,8 @@ Dict::Add('PL PL', 'Polish', 'Polski', [ 'Class:OSLicence/ComplementaryName' => '%1$s - %2$s', 'Class:OSLicence/Attribute:osversion_id' => 'Wersja OS', 'Class:OSLicence/Attribute:osversion_id+' => '', + 'Class:OSLicence/Attribute:osfamily_id' => 'OS Family~~', + 'Class:OSLicence/Attribute:osfamily_id+' => '~~', 'Class:OSLicence/Attribute:osversion_name' => 'Nazwa wersji OS', 'Class:OSLicence/Attribute:osversion_name+' => '', 'Class:OSLicence/Attribute:virtualmachines_list' => 'Maszyny wirtualne', 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 c1c2218a5d..f430173e45 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 @@ -946,6 +946,8 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', [ 'Class:OSPatch/Attribute:functionalcis_list+' => 'Todos os sistemas onde essa Atualização de SO está instalada', 'Class:OSPatch/Attribute:osversion_id' => 'Versão do SO', 'Class:OSPatch/Attribute:osversion_id+' => '', + 'Class:OSPatch/Attribute:osfamily_id' => 'OS Family~~', + 'Class:OSPatch/Attribute:osfamily_id+' => '', 'Class:OSPatch/Attribute:osversion_name' => 'Nome da versão do SO', 'Class:OSPatch/Attribute:osversion_name+' => '', ]); @@ -1010,6 +1012,8 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', [ 'Class:OSLicence/ComplementaryName' => '%1$s - %2$s~~', 'Class:OSLicence/Attribute:osversion_id' => 'Versão do SO', 'Class:OSLicence/Attribute:osversion_id+' => '', + 'Class:OSLicence/Attribute:osfamily_id' => 'OS Family~~', + 'Class:OSLicence/Attribute:osfamily_id+' => '~~', 'Class:OSLicence/Attribute:osversion_name' => 'Nome da versão do SO', 'Class:OSLicence/Attribute:osversion_name+' => '', 'Class:OSLicence/Attribute:virtualmachines_list' => 'Máquinas virtuais (VMs)', 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 a4e422cbea..aad16bcbf6 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 @@ -947,6 +947,8 @@ Dict::Add('RU RU', 'Russian', 'Русский', [ 'Class:OSPatch/Attribute:functionalcis_list+' => 'Все системы, где установлен этот патч', 'Class:OSPatch/Attribute:osversion_id' => 'Версия ОС', 'Class:OSPatch/Attribute:osversion_id+' => '', + 'Class:OSPatch/Attribute:osfamily_id' => 'OS Family~~', + 'Class:OSPatch/Attribute:osfamily_id+' => '', 'Class:OSPatch/Attribute:osversion_name' => 'Версия ОС', 'Class:OSPatch/Attribute:osversion_name+' => '', ]); @@ -1011,6 +1013,8 @@ Dict::Add('RU RU', 'Russian', 'Русский', [ 'Class:OSLicence/ComplementaryName' => '%1$s - %2$s~~', 'Class:OSLicence/Attribute:osversion_id' => 'Версия ОС', 'Class:OSLicence/Attribute:osversion_id+' => '', + 'Class:OSLicence/Attribute:osfamily_id' => 'OS Family~~', + 'Class:OSLicence/Attribute:osfamily_id+' => '~~', 'Class:OSLicence/Attribute:osversion_name' => 'Версия ОС', 'Class:OSLicence/Attribute:osversion_name+' => '', 'Class:OSLicence/Attribute:virtualmachines_list' => 'Виртуальные машины', 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 cf5c883773..288434749a 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 @@ -946,6 +946,8 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', [ 'Class:OSPatch/Attribute:functionalcis_list+' => 'All the systems where this patch is installed~~', 'Class:OSPatch/Attribute:osversion_id' => 'Verzia OS', 'Class:OSPatch/Attribute:osversion_id+' => '~~', + 'Class:OSPatch/Attribute:osfamily_id' => 'OS Family~~', + 'Class:OSPatch/Attribute:osfamily_id+' => '~~', 'Class:OSPatch/Attribute:osversion_name' => 'Názov OS verzie', 'Class:OSPatch/Attribute:osversion_name+' => '~~', ]); @@ -1010,6 +1012,8 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', [ 'Class:OSLicence/ComplementaryName' => '%1$s - %2$s~~', 'Class:OSLicence/Attribute:osversion_id' => 'Verzia OS', 'Class:OSLicence/Attribute:osversion_id+' => '~~', + 'Class:OSLicence/Attribute:osfamily_id' => 'OS Family~~', + 'Class:OSLicence/Attribute:osfamily_id+' => '~~', 'Class:OSLicence/Attribute:osversion_name' => 'Názov OS verzie', 'Class:OSLicence/Attribute:osversion_name+' => '~~', 'Class:OSLicence/Attribute:virtualmachines_list' => 'Virtuálne zariadenia', 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 0757c47f78..c88d026d1e 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 @@ -947,6 +947,8 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', [ 'Class:OSPatch/Attribute:functionalcis_list+' => 'Bu yamanın kurulduğu tüm sistemler', 'Class:OSPatch/Attribute:osversion_id' => 'OS Sürümü', 'Class:OSPatch/Attribute:osversion_id+' => '~~', + 'Class:OSPatch/Attribute:osfamily_id' => 'OS Family~~', + 'Class:OSPatch/Attribute:osfamily_id+' => '~~', 'Class:OSPatch/Attribute:osversion_name' => 'OS Sürüm Adı', 'Class:OSPatch/Attribute:osversion_name+' => '~~', ]); @@ -1011,6 +1013,8 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', [ 'Class:OSLicence/ComplementaryName' => '%1$s - %2$s~~', 'Class:OSLicence/Attribute:osversion_id' => 'OS Sürümü', 'Class:OSLicence/Attribute:osversion_id+' => '~~', + 'Class:OSLicence/Attribute:osfamily_id' => 'OS Family~~', + 'Class:OSLicence/Attribute:osfamily_id+' => '~~', 'Class:OSLicence/Attribute:osversion_name' => 'OS Sürüm Adı', 'Class:OSLicence/Attribute:osversion_name+' => '~~', 'Class:OSLicence/Attribute:virtualmachines_list' => 'Sanal Makineler', 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 48c17bfa04..ab8fb2b4a9 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 @@ -963,6 +963,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [ 'Class:OSPatch/Attribute:functionalcis_list+' => '已安装此补丁的所有系统', 'Class:OSPatch/Attribute:osversion_id' => '操作系统版本', 'Class:OSPatch/Attribute:osversion_id+' => '', + 'Class:OSPatch/Attribute:osfamily_id' => 'OS Family~~', + 'Class:OSPatch/Attribute:osfamily_id+' => '', 'Class:OSPatch/Attribute:osversion_name' => '名称', 'Class:OSPatch/Attribute:osversion_name+' => '', ]); @@ -1027,6 +1029,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [ 'Class:OSLicence/ComplementaryName' => '%1$s - %2$s', 'Class:OSLicence/Attribute:osversion_id' => '操作系统版本', 'Class:OSLicence/Attribute:osversion_id+' => '', + 'Class:OSLicence/Attribute:osfamily_id' => 'OS Family~~', + 'Class:OSLicence/Attribute:osfamily_id+' => '~~', 'Class:OSLicence/Attribute:osversion_name' => '名称', 'Class:OSLicence/Attribute:osversion_name+' => '', 'Class:OSLicence/Attribute:virtualmachines_list' => '虚拟机', diff --git a/datamodels/2.x/itop-config-mgmt/images/icons8-ios-version-software.svg b/datamodels/2.x/itop-config-mgmt/images/icons8-ios-version-software.svg new file mode 100644 index 0000000000..24d5e02eaf --- /dev/null +++ b/datamodels/2.x/itop-config-mgmt/images/icons8-ios-version-software.svg @@ -0,0 +1,207 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + x.y + x.y + I + I + diff --git a/datamodels/2.x/itop-config-mgmt/images/icons8-os-family-software.svg b/datamodels/2.x/itop-config-mgmt/images/icons8-os-family-software.svg new file mode 100644 index 0000000000..eba3dc3ba9 --- /dev/null +++ b/datamodels/2.x/itop-config-mgmt/images/icons8-os-family-software.svg @@ -0,0 +1,158 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/datamodels/2.x/itop-config-mgmt/images/icons8-os-version-software.svg b/datamodels/2.x/itop-config-mgmt/images/icons8-os-version-software.svg new file mode 100644 index 0000000000..eebdf49e7a --- /dev/null +++ b/datamodels/2.x/itop-config-mgmt/images/icons8-os-version-software.svg @@ -0,0 +1,180 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + x.y + x.y + 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 b35689d46c..ac15723903 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 @@ -255,7 +255,7 @@ diff --git a/images/icons/icons8-enclosure-new.svg b/images/icons/icons8-enclosure-new.svg new file mode 100644 index 0000000000..02a640dc3c --- /dev/null +++ b/images/icons/icons8-enclosure-new.svg @@ -0,0 +1,402 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +