Merge remote-tracking branch 'origin/develop' into feature/new-dashboard-layout

# Conflicts:
#	dictionaries/en.dictionary.itop.ui.php
#	lib/symfony/cache/Adapter/ArrayAdapter.php

.github/workflows/action.yml

@@ -26,13 +26,23 @@ jobs:
 
           fi
 
-      - name: Add internal tag if member
+      - name: Add internal tag if member of the organization
         if: env.is_member == 'true'
         run: |
           curl -X POST -H "Authorization: token ${{ secrets.PR_AUTOMATICALLY_ADD_TO_PROJECT }}" \
             -H "Accept: application/vnd.github.v3+json" \
             https://api.github.com/repos/Combodo/iTop/issues/${{ github.event.pull_request.number }}/labels \
             -d '{"labels":["internal"]}'
+
+      - name: Set PR author as assignee if member of the organization
+        if: env.is_member == 'true'
+        run: |
+          curl -L \
+            -X POST \
+            -H "Accept: application/vnd.github+json" \
+            -H "Authorization: Bearer ${{ secrets.PR_AUTOMATICALLY_ADD_TO_PROJECT }}" \
+            https://api.github.com/repos/Combodo/iTop/issues/${{ github.event.pull_request.number }}/assignees \
+            -d '{"assignees":["${{ github.event.pull_request.user.login }}"]}'
         env:
           is_member: ${{ env.is_member }}
 
@@ -40,4 +50,4 @@ jobs:
         uses: actions/add-to-project@v1.0.2
         with:
           project-url: ${{ env.project_url }}
-          github-token: ${{ secrets.PR_AUTOMATICALLY_ADD_TO_PROJECT }}
+          github-token: ${{ secrets.PR_AUTOMATICALLY_ADD_TO_PROJECT }}

.phpstorm.meta.php

@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * @copyright   Copyright (C) 2010-2025 Combodo SAS
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+namespace PHPSTORM_META
+{
+	override(\MetaModel::NewObject(0), map([
+		'' => '@',
+	]));
+	override(\MetaModel::GetObject(0), map([
+		'' => '@',
+	]));
+}

application/dashboardlayout.class.inc.php

@@ -16,6 +16,7 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
+use Combodo\iTop\Application\Dashlet\Service\DashletService;
 use Combodo\iTop\Application\UI\Base\Component\Html\Html;
 use Combodo\iTop\Application\UI\Base\Layout\Dashboard\DashboardColumn;
 use Combodo\iTop\Application\UI\Base\Layout\Dashboard\DashboardLayout as DashboardLayoutUIBlock;
@@ -30,7 +31,7 @@ use Combodo\iTop\Application\WebPage\WebPage;
  */
 abstract class DashboardLayout
 {
-	abstract public function Render($oPage, $aDashlets, $bEditMode = false);
+	abstract public function Render($oPage, $aDashlets, $bEditMode = false, array $aExtraParams = []);
 
 	/**
 	 * @param int $iCellIdx
@@ -43,8 +44,8 @@ abstract class DashboardLayout
 	public static function GetInfo()
 	{
 		return [
-			'label' => '',
-			'icon' => '',
+			'label'       => '',
+			'icon'        => '',
 			'description' => '',
 		];
 	}
@@ -74,6 +75,7 @@ abstract class DashboardLayoutMultiCol extends DashboardLayout
 			}
 			$idx++;
 		}
+
 		return $aDashlets;
 	}
 
@@ -94,6 +96,7 @@ abstract class DashboardLayoutMultiCol extends DashboardLayout
 			}
 			$idx++;
 		}
+
 		return $aCells;
 
 	}
@@ -106,26 +109,39 @@ abstract class DashboardLayoutMultiCol extends DashboardLayout
 	 */
 	public function Render($oPage, $aCells, $bEditMode = false, $aExtraParams = [])
 	{
+		/** @var DashletService $oDashletService */
+		$oDashletService = MetaModel::GetService('DashletService');
 		// Trim the list of cells to remove the invisible/empty ones at the end of the array
 		$aCells = $this->TrimCellsArray($aCells);
 
-		$oDashboardLayout = new DashboardLayoutUIBlock();
-		//$oPage->AddUiBlock($oDashboardLayout);
+		$oDashboardLayout = new DashboardLayoutUIBlock($aExtraParams['dashboard_div_id']);
 
 		$iCellIdx = 0;
 		$iNbRows = ceil(count($aCells) / $this->iNbCols);
 
+		// GRID LAYOUT: Global positioning
+		$iGridCurrentX = 0;
+		$iGridCurrentY = 0;
+		$iGridColWidth = (int)(12 / $this->iNbCols);
+
 		//Js given by each dashlet to reload
 		$sJSReload = "";
-
+		$oDashboardGrid = new \Combodo\iTop\Application\UI\Base\Layout\Dashboard\DashboardGrid();
+		$oDashboardLayout->SetGrid($oDashboardGrid);
 		for ($iRows = 0; $iRows < $iNbRows; $iRows++) {
 			$oDashboardRow = new DashboardRow();
-			$oDashboardLayout->AddDashboardRow($oDashboardRow);
+
+			// GRID LAYOUT: Store the maximum column Y in this row
+			$iGridMaxColY = -1;
 
 			for ($iCols = 0; $iCols < $this->iNbCols; $iCols++) {
 				$oDashboardColumn = new DashboardColumn($bEditMode);
 				$oDashboardColumn->SetCellIndex($iCellIdx);
-				$oDashboardRow->AddDashboardColumn($oDashboardColumn);
+
+				// GRID LAYOUT: Column positioning
+				$iGridCurrentColX = 0;
+				$iGridCurrentColY = 0;
+				$iGridMaxHeightDashlet = -1;
 
 				if (array_key_exists($iCellIdx, $aCells)) {
 					$aDashlets = $aCells[$iCellIdx];
@@ -133,7 +149,41 @@ abstract class DashboardLayoutMultiCol extends DashboardLayout
 						/** @var \Dashlet $oDashlet */
 						foreach ($aDashlets as $oDashlet) {
 							if ($oDashlet::IsVisible()) {
-								$oDashboardColumn->AddUIBlock($oDashlet->DoRender($oPage, $bEditMode, true /* bEnclosingDiv */, $aExtraParams));
+								$sDashletId = $oDashlet->GetID();
+								$sDashletClass = $oDashlet->GetDashletType();
+								$aDashletDenormalizedProperties = $oDashlet->GetModelData();
+								$aDashletsInfo = $oDashletService->GetDashletDefinition($sDashletClass);
+
+								// GRID LAYOUT: Set position relative to grid
+								$iPositionX = $iGridCurrentX + $iGridCurrentColX;
+								$iPositionY = $iGridCurrentY + $iGridCurrentColY;
+								$iWidth = array_key_exists('preferred_width', $aDashletsInfo) ? $aDashletsInfo['preferred_width'] : 1;
+								// GRID LAYOUT: Limit dashlet width to fit column width
+								if ($iWidth > $iGridColWidth) {
+									$iWidth = $iGridColWidth;
+								}
+								$iHeight = array_key_exists('preferred_height', $aDashletsInfo) ? $aDashletsInfo['preferred_height'] : 1;
+								// GRID LAYOUT: Store max height of dashlets in this current column
+								if ($iHeight > $iGridMaxHeightDashlet) {
+									$iGridMaxHeightDashlet = $iHeight;
+								}
+								// GRID LAYOUT: Ensure that dashlet fits in the current row of the column
+								if ($iGridCurrentColX + $iWidth > $iGridColWidth) {
+									$iPositionX = $iGridCurrentX;
+									$iPositionY++;
+								}
+
+								$oDashboardGrid->AddDashlet($oDashlet->DoRender($oPage, $bEditMode, true /* bEnclosingDiv */, $aExtraParams), $sDashletId, $sDashletClass, $aDashletDenormalizedProperties, $iPositionX, $iPositionY, $iWidth, $iHeight);
+
+								// GRID LAYOUT: Update column cursor
+								$iGridCurrentColX += $iWidth;
+								if ($iGridCurrentColX >= $iGridColWidth) {
+									$iGridCurrentColX = 0;
+									$iGridCurrentColY += $iGridMaxHeightDashlet;
+									$iGridMaxHeightDashlet = -1;
+								}
+
+								//$oDashboardColumn->AddUIBlock($oDashlet->DoRender($oPage, $bEditMode, true /* bEnclosingDiv */, $aExtraParams));
 							}
 						}
 					} else {
@@ -143,10 +193,25 @@ abstract class DashboardLayoutMultiCol extends DashboardLayout
 					$oDashboardColumn->AddUIBlock(new Html('&nbsp;'));
 				}
 				$iCellIdx++;
+
+				// GRID LAYOUT: Store max y in this current row
+				if ($iGridCurrentColY > $iGridMaxColY) {
+					$iGridMaxColY = $iGridCurrentColY;
+				}
+
+				// GRID LAYOUT: Next column
+				$iGridCurrentX += $iGridColWidth;
+
 			}
+
+			// GRID LAYOUT: Next Row
+			$iGridCurrentY += ($iGridMaxColY + 1);
+			$iGridCurrentX = 0;
+
 			$sJSReload .= $oDashboardRow->GetJSRefreshCallback()." ";
 		}
 
+		// TODO 3.3 We can probably do better with the new dashboard
 		$oPage->add_script("function updateDashboard".$aExtraParams['dashboard_div_id']."(){".$sJSReload."}");
 
 		if ($bEditMode) { // Add one row for extensibility
@@ -168,8 +233,8 @@ abstract class DashboardLayoutMultiCol extends DashboardLayout
 	 */
 	public function GetDashletCoordinates($iCellIdx)
 	{
-		$iColNumber = (int) $iCellIdx % $this->iNbCols;
-		$iRowNumber = (int) floor($iCellIdx / $this->iNbCols);
+		$iColNumber = (int)$iCellIdx % $this->iNbCols;
+		$iRowNumber = (int)floor($iCellIdx / $this->iNbCols);
 
 		return [$iColNumber, $iRowNumber];
 	}
@@ -182,11 +247,12 @@ class DashboardLayoutOneCol extends DashboardLayoutMultiCol
 		parent::__construct();
 		$this->iNbCols = 1;
 	}
+
 	public static function GetInfo()
 	{
 		return [
-			'label' => 'One Column',
-			'icon' => 'images/layout_1col.png',
+			'label'       => 'One Column',
+			'icon'        => 'images/layout_1col.png',
 			'description' => '',
 		];
 	}
@@ -199,11 +265,12 @@ class DashboardLayoutTwoCols extends DashboardLayoutMultiCol
 		parent::__construct();
 		$this->iNbCols = 2;
 	}
+
 	public static function GetInfo()
 	{
 		return [
-			'label' => 'Two Columns',
-			'icon' =>  'images/layout_2col.png',
+			'label'       => 'Two Columns',
+			'icon'        => 'images/layout_2col.png',
 			'description' => '',
 		];
 	}
@@ -216,11 +283,12 @@ class DashboardLayoutThreeCols extends DashboardLayoutMultiCol
 		parent::__construct();
 		$this->iNbCols = 3;
 	}
+
 	public static function GetInfo()
 	{
 		return [
-			'label' => 'Two Columns',
-			'icon' =>  'images/layout_3col.png',
+			'label'       => 'Two Columns',
+			'icon'        => 'images/layout_3col.png',
 			'description' => '',
 		];
 	}

application/datamodel.application.xml

@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:noNamespaceSchemaLocation="https://www.combodo.com/itop-schema/3.3"
+             version="3.3">
   <classes>
     <class id="AbstractResource" _delta="define">
       <parent>cmdbAbstractObject</parent>
       <properties>
-        <comment>/* Resource access control abstraction. Can be herited by abstract resource access control classes. Generaly controlled using UR_ACTION_MODIFY access right. */</comment>
+        <comment>/* Resource access control abstraction. Can be inherited by abstract resource access control classes. Generally controlled using UR_ACTION_MODIFY access right. */</comment>
         <abstract>true</abstract>
       </properties>
       <presentation/>
@@ -552,7 +554,7 @@ Call $this->AddInitialAttributeFlags($sAttCode, $iFlags) for all the initial att
       <description><![CDATA[Inform the listeners about the connection states]]></description>
       <event_data>
         <event_datum id="code">
-          <description>The login step result code (LoginWebPage::EXIT_CODE_...) </description>
+          <description>The login step result code (LoginWebPage::EXIT_CODE_...)</description>
           <type>integer</type>
         </event_datum>
         <event_datum id="state">
@@ -849,5 +851,461 @@ Call $this->AddInitialAttributeFlags($sAttCode, $iFlags) for all the initial att
         </methods>
       </class>
     </classes>
+    <dashlets>
+      <dashlet id="DashletGroupByTable" _delta="define">
+        <label>UI:DashletGroupByTable:Label</label>
+        <icon>images/dashlets/icons8-transaction-list-48.png</icon>
+        <description>UI:DashletGroupByTable:Description</description>
+        <min_width>3</min_width>
+        <min_height>2</min_height>
+        <preferred_width>6</preferred_width>
+        <preferred_height>3</preferred_height>
+        <can_create_by_oql>true</can_create_by_oql>
+        <configuration/>
+      </dashlet>
+      <dashlet id="DashletGroupByBars" _delta="define">
+        <label>UI:DashletGroupByBars:Label</label>
+        <icon>images/dashlets/icons8-bar-chart-48.png</icon>
+        <description>UI:DashletGroupByBars:Description</description>
+        <min_width>2</min_width>
+        <min_height>2</min_height>
+        <preferred_width>6</preferred_width>
+        <preferred_height>3</preferred_height>
+        <can_create_by_oql>true</can_create_by_oql>
+        <configuration/>
+      </dashlet>
+      <dashlet id="DashletGroupByPie" _delta="define">
+        <label>UI:DashletGroupByPie:Label</label>
+        <icon>images/dashlets/icons8-pie-chart-48.png</icon>
+        <description>UI:DashletGroupByPie:Description</description>
+        <min_width>2</min_width>
+        <min_height>2</min_height>
+        <preferred_width>6</preferred_width>
+        <preferred_height>3</preferred_height>
+        <can_create_by_oql>true</can_create_by_oql>
+        <configuration/>
+      </dashlet>
+      <dashlet id="DashletBadge" _delta="define">
+        <label>UI:DashletBadge:Label</label>
+        <icon>images/dashlets/icons8-badge-48.png</icon>
+        <description>UI:DashletBadge:Description</description>
+        <min_width>2</min_width>
+        <min_height>1</min_height>
+        <preferred_width>3</preferred_width>
+        <preferred_height>1</preferred_height>
+        <configuration/>
+      </dashlet>
+      <dashlet id="DashletHeaderDynamic" _delta="define">
+        <label>UI:DashletHeaderDynamic:Label</label>
+        <icon>images/dashlets/icons8-header-altered-48.png</icon>
+        <description>UI:DashletHeaderDynamic:Description</description>
+        <min_width>2</min_width>
+        <min_height>1</min_height>
+        <preferred_width>12</preferred_width>
+        <preferred_height>2</preferred_height>
+        <configuration/>
+      </dashlet>
+      <dashlet id="DashletHeaderStatic" _delta="define">
+        <label>UI:DashletHeaderStatic:Label</label>
+        <icon>images/dashlets/icons8-header-48.png</icon>
+        <description>UI:DashletHeaderStatic:Description</description>
+        <min_width>4</min_width>
+        <min_height>1</min_height>
+        <preferred_width>12</preferred_width>
+        <preferred_height>1</preferred_height>
+        <configuration/>
+      </dashlet>
+      <dashlet id="DashletObjectList" _delta="define">
+        <label>UI:DashletObjectList:Label</label>
+        <icon>images/dashlets/icons8-list-48.png</icon>
+        <description>UI:DashletObjectList:Description</description>
+        <min_width>2</min_width>
+        <min_height>1</min_height>
+        <preferred_width>12</preferred_width>
+        <preferred_height>3</preferred_height>
+        <can_create_by_oql>true</can_create_by_oql>
+        <configuration/>
+      </dashlet>
+      <dashlet id="DashletPlainText" _delta="define">
+        <label>UI:DashletPlainText:Label</label>
+        <icon>images/dashlets/icons8-text-box-48.png</icon>
+        <description>UI:DashletPlainText:Description</description>
+        <min_width>2</min_width>
+        <min_height>1</min_height>
+        <preferred_width>2</preferred_width>
+        <preferred_height>1</preferred_height>
+        <configuration/>
+      </dashlet>
+      <dashlet id="DashletUnknown" _delta="define">
+        <label>UI:DashletUnknown:Label</label>
+        <icon>images/dashlet-unknown.png</icon>
+        <description>UI:DashletUnknown:Description</description>
+        <can_be_created>false</can_be_created>
+        <configuration/>
+      </dashlet>
+    </dashlets>
+    <property_types _delta="define">
+      <property_type id="Dashboard" xsi:type="Combodo-AbstractPropertyType"/>
+      <property_type id="DashboardGrid" xsi:type="Combodo-PropertyType">
+        <extends>Dashboard</extends>
+        <definition xsi:type="Combodo-ValueType-PropertyTree">
+          <label>Dashboard</label>
+          <nodes>
+            <node id="title" xsi:type="Combodo-ValueType-String">
+              <label>UI:DashboardEdit:DashboardTitle</label>
+            </node>
+            <node id="refresh" xsi:type="Combodo-ValueType-Choice"> <!-- Possible de le cacher, etc celui-ci nous met dedans -->
+              <label>UI:DashboardEdit:AutoReload</label>
+              <values>
+                <value id="0">
+                  <label>No auto-refresh</label>
+                </value>
+                <value id="30">
+                  <label>Every 30 seconds</label>
+                </value>
+                <value id="60">
+                  <label>Every 1 minute</label>
+                </value>
+                <value id="300">
+                  <label>Every 5 minutes</label>
+                </value>
+                <value id="600">
+                  <label>Every 10 minutes</label>
+                </value>
+                <value id="1800">
+                  <label>Every 30 minutes</label>
+                </value>
+                <value id="3600">
+                  <label>Every 1 hour</label>
+                </value>
+              </values>
+            </node>
+            <node id="pos_dashlets" xsi:type="Combodo-ValueType-Collection">
+              <label>Dashlet List</label>
+              <xml-format xsi:type="Combodo-XMLFormat-CollectionWithId">
+                <tag-name>pos_dashlet</tag-name>
+              </xml-format>
+              <prototype>
+                <node id="position_x" xsi:type="Combodo-ValueType-Integer">
+                  <label>X</label>
+                </node>
+                <node id="position_y" xsi:type="Combodo-ValueType-Integer">
+                  <label>Y</label>
+                </node>
+                <node id="width" xsi:type="Combodo-ValueType-Integer">
+                  <label>W</label>
+                </node>
+                <node id="height" xsi:type="Combodo-ValueType-Integer">
+                  <label>H</label>
+                </node>
+                <node id="dashlet" xsi:type="Combodo-ValueType-Polymorphic">
+                  <label>Dashlet</label>
+                  <allowed-types>
+                    <allowed-type>Dashlet</allowed-type>
+                  </allowed-types>
+                </node>
+              </prototype>
+            </node>
+          </nodes>
+        </definition>
+      </property_type>
+      <property_type id="Dashlet" xsi:type="Combodo-AbstractPropertyType"/>
+      <property_type id="DashletGroupByTable" xsi:type="Combodo-PropertyType">
+        <extends>Dashlet</extends>
+        <definition xsi:type="Combodo-ValueType-PropertyTree">
+          <label>UI:DashletGroupBy:Title</label>
+          <nodes>
+            <node id="title" xsi:type="Combodo-ValueType-Label">
+              <label>UI:DashletGroupBy:Prop-Title</label>
+            </node>
+            <node id="query" xsi:type="Combodo-ValueType-OQL">
+              <label>UI:DashletGroupBy:Prop-Query</label>
+            </node>
+            <node id="group_by" xsi:type="Combodo-ValueType-ClassAttributeGroupBy">
+              <label>UI:DashletGroupBy:Prop-GroupBy</label>
+              <class>{{query.selected_class}}</class>
+            </node>
+            <node id="style" xsi:type="Combodo-ValueType-Choice"> <!-- Possible de le cacher, etc celui-ci nous met dedans -->
+              <label>UI:DashletGroupBy:Prop-Style</label>
+              <values>
+                <value id="bars">
+                  <label>UI:DashletGroupByBars:Label</label>
+                </value>
+                <value id="pie">
+                  <label>UI:DashletGroupByPie:Label</label>
+                </value>
+                <value id="table">
+                  <label>UI:DashletGroupByTable:Label</label>
+                </value>
+              </values>
+            </node>
+            <node id="aggregation_function" xsi:type="Combodo-ValueType-AggregateFunction">
+              <label>UI:DashletGroupBy:Prop-Function</label>
+              <class>{{query.selected_class}}</class> <!-- pour savoir si il y a des attributs additionnables -->
+            </node>
+            <node id="aggregation_attribute" xsi:type="Combodo-ValueType-ClassAttribute">
+              <label>UI:DashletGroupBy:Prop-FunctionAttribute</label>
+              <relevance-condition>{{aggregation_function.value != 'count'}}</relevance-condition>
+              <class>{{query.selected_class}}</class>
+              <category>numeric</category>
+            </node>
+            <node id="order_by" xsi:type="Combodo-ValueType-ChoiceFromInput">
+              <label>UI:DashletGroupBy:Prop-OrderField</label>
+              <values>
+                <value id="attribute">
+                  <label>{{aggregation_attribute.label}}</label>
+                </value>
+                <value id="function">
+                  <label>{{aggregation_function.label}}</label>
+                </value>
+              </values>
+            </node>
+            <node id="limit" xsi:type="Combodo-ValueType-Integer">
+              <label>UI:DashletGroupBy:Prop-Limit</label>
+              <relevance-condition>{{order_by.value = 'function'}}</relevance-condition>
+            </node>
+            <node id="order_direction" xsi:type="Combodo-ValueType-Choice">
+              <label>UI:DashletGroupBy:Prop-OrderDirection</label>
+              <values>
+                <value id="asc">
+                  <label>UI:DashletGroupBy:Order:asc</label>
+                </value>
+                <value id="desc">
+                  <label>UI:DashletGroupBy:Order:desc</label>
+                </value>
+              </values>
+            </node>
+          </nodes>
+        </definition>
+      </property_type>
+      <property_type id="DashletGroupByBars" xsi:type="Combodo-PropertyType">
+        <extends>Dashlet</extends>
+        <definition xsi:type="Combodo-ValueType-PropertyTree">
+          <label>UI:DashletGroupBy:Title</label>
+          <nodes>
+            <node id="title" xsi:type="Combodo-ValueType-Label">
+              <label>UI:DashletGroupBy:Prop-Title</label>
+            </node>
+            <node id="query" xsi:type="Combodo-ValueType-OQL">
+              <label>UI:DashletGroupBy:Prop-Query</label>
+            </node>
+            <node id="group_by" xsi:type="Combodo-ValueType-ClassAttributeGroupBy">
+              <label>UI:DashletGroupBy:Prop-GroupBy</label>
+              <class>{{query.selected_class}}</class>
+            </node>
+            <node id="style" xsi:type="Combodo-ValueType-Choice"> <!-- Possible de le cacher, etc celui-ci nous met dedans -->
+              <label>UI:DashletGroupBy:Prop-Style</label>
+              <values>
+                <value id="bars">
+                  <label>UI:DashletGroupByBars:Label</label>
+                </value>
+                <value id="pie">
+                  <label>UI:DashletGroupByPie:Label</label>
+                </value>
+                <value id="table">
+                  <label>UI:DashletGroupByTable:Label</label>
+                </value>
+              </values>
+            </node>
+            <node id="aggregation_function" xsi:type="Combodo-ValueType-AggregateFunction">
+              <label>UI:DashletGroupBy:Prop-Function</label>
+              <class>{{query.selected_class}}</class> <!-- pour savoir si il y a des attributs additionnables -->
+            </node>
+            <node id="aggregation_attribute" xsi:type="Combodo-ValueType-ClassAttribute">
+              <label>UI:DashletGroupBy:Prop-FunctionAttribute</label>
+              <relevance-condition>{{aggregation_function.value != 'count'}}</relevance-condition>
+              <class>{{query.selected_class}}</class>
+              <category>numeric</category>
+            </node>
+            <node id="order_by" xsi:type="Combodo-ValueType-ChoiceFromInput">
+              <label>UI:DashletGroupBy:Prop-OrderField</label>
+              <values>
+                <value id="attribute">
+                  <label>{{aggregation_attribute.label}}</label>
+                </value>
+                <value id="function">
+                  <label>{{aggregation_function.label}}</label>
+                </value>
+              </values>
+            </node>
+            <node id="limit" xsi:type="Combodo-ValueType-Integer">
+              <label>UI:DashletGroupBy:Prop-Limit</label>
+              <relevance-condition>{{order_by.value = 'function'}}</relevance-condition>
+            </node>
+            <node id="order_direction" xsi:type="Combodo-ValueType-Choice">
+              <label>UI:DashletGroupBy:Prop-OrderDirection</label>
+              <values>
+                <value id="asc">
+                  <label>UI:DashletGroupBy:Order:asc</label>
+                </value>
+                <value id="desc">
+                  <label>UI:DashletGroupBy:Order:desc</label>
+                </value>
+              </values>
+            </node>
+          </nodes>
+        </definition>
+      </property_type>
+      <property_type id="DashletGroupByPie" xsi:type="Combodo-PropertyType">
+        <extends>Dashlet</extends>
+        <definition xsi:type="Combodo-ValueType-PropertyTree">
+          <label>UI:DashletGroupBy:Title</label>
+          <nodes>
+            <node id="title" xsi:type="Combodo-ValueType-Label">
+              <label>UI:DashletGroupBy:Prop-Title</label>
+            </node>
+            <node id="query" xsi:type="Combodo-ValueType-OQL">
+              <label>UI:DashletGroupBy:Prop-Query</label>
+            </node>
+            <node id="group_by" xsi:type="Combodo-ValueType-ClassAttributeGroupBy">
+              <label>UI:DashletGroupBy:Prop-GroupBy</label>
+              <class>{{query.selected_class}}</class>
+            </node>
+            <node id="style" xsi:type="Combodo-ValueType-Choice"> <!-- Possible de le cacher, etc celui-ci nous met dedans -->
+              <label>UI:DashletGroupBy:Prop-Style</label>
+              <values>
+                <value id="bars">
+                  <label>UI:DashletGroupByBars:Label</label>
+                </value>
+                <value id="pie">
+                  <label>UI:DashletGroupByPie:Label</label>
+                </value>
+                <value id="table">
+                  <label>UI:DashletGroupByTable:Label</label>
+                </value>
+              </values>
+            </node>
+            <node id="aggregation_function" xsi:type="Combodo-ValueType-AggregateFunction">
+              <label>UI:DashletGroupBy:Prop-Function</label>
+              <class>{{query.selected_class}}</class> <!-- pour savoir si il y a des attributs additionnables -->
+            </node>
+            <node id="aggregation_attribute" xsi:type="Combodo-ValueType-ClassAttribute">
+              <label>UI:DashletGroupBy:Prop-FunctionAttribute</label>
+              <relevance-condition>{{aggregation_function.value != 'count'}}</relevance-condition>
+              <class>{{query.selected_class}}</class>
+              <category>numeric</category>
+            </node>
+            <node id="order_by" xsi:type="Combodo-ValueType-ChoiceFromInput">
+              <label>UI:DashletGroupBy:Prop-OrderField</label>
+              <values>
+                <value id="attribute">
+                  <label>{{aggregation_attribute.label}}</label>
+                </value>
+                <value id="function">
+                  <label>{{aggregation_function.label}}</label>
+                </value>
+              </values>
+            </node>
+            <node id="limit" xsi:type="Combodo-ValueType-Integer">
+              <label>UI:DashletGroupBy:Prop-Limit</label>
+              <relevance-condition>{{order_by.value = 'function'}}</relevance-condition>
+            </node>
+            <node id="order_direction" xsi:type="Combodo-ValueType-Choice">
+              <label>UI:DashletGroupBy:Prop-OrderDirection</label>
+              <values>
+                <value id="asc">
+                  <label>UI:DashletGroupBy:Order:asc</label>
+                </value>
+                <value id="desc">
+                  <label>UI:DashletGroupBy:Order:desc</label>
+                </value>
+              </values>
+            </node>
+          </nodes>
+        </definition>
+      </property_type>
+      <property_type id="DashletBadge" xsi:type="Combodo-PropertyType">
+        <extends>Dashlet</extends>
+        <definition xsi:type="Combodo-ValueType-PropertyTree">
+          <nodes>
+            <node id="class" xsi:type="Combodo-ValueType-Class">
+              <label>UI:DashletBadge:Prop-Class</label>
+              <categories-csv>bizmodel</categories-csv>
+            </node>
+          </nodes>
+        </definition>
+      </property_type>
+      <property_type id="DashletHeaderDynamic" xsi:type="Combodo-PropertyType">
+        <extends>Dashlet</extends>
+        <definition xsi:type="Combodo-ValueType-PropertyTree">
+          <label>UI:DashletHeaderDynamic:Title</label>
+          <nodes>
+            <node id="title" xsi:type="Combodo-ValueType-Label">
+              <label>UI:DashletHeaderDynamic:Prop-Title</label>
+            </node>
+            <node id="icon" xsi:type="Combodo-ValueType-Icon">
+              <label>UI:DashletHeaderDynamic:Prop-Icon</label>
+            </node>
+            <node id="subtitle" xsi:type="Combodo-ValueType-Label">
+              <label>UI:DashletHeaderDynamic:Prop-Subtitle</label>
+            </node>
+            <node id="query" xsi:type="Combodo-ValueType-OQL">
+              <label>UI:DashletHeaderDynamic:Prop-Query</label>
+            </node>
+            <node id="group_by" xsi:type="Combodo-ValueType-ClassAttribute">
+              <label>UI:DashletHeaderDynamic:Prop-GroupBy</label>
+              <class>{{query.selected_class}}</class>
+              <category>enum</category>
+            </node>
+            <node id="values" xsi:type="Combodo-ValueType-CollectionOfValues">
+              <label>UI:DashletHeaderDynamic:Prop-Values</label>
+              <xml-format xsi:type="Combodo-XMLFormat-CSV"/>
+              <value-type xsi:type="Combodo-ValueType-ClassAttributeValue">
+                <class>{{query.selected_class}}</class>
+                <attribute>{{group_by.attribute}}</attribute>
+              </value-type>
+            </node>
+          </nodes>
+        </definition>
+      </property_type>
+      <property_type id="DashletHeaderStatic" xsi:type="Combodo-PropertyType">
+        <extends>Dashlet</extends>
+        <definition xsi:type="Combodo-ValueType-PropertyTree">
+          <nodes>
+            <node id="title" xsi:type="Combodo-ValueType-Label">
+              <label>UI:DashletHeaderStatic:Prop-Title</label>
+            </node>
+            <node id="icon" xsi:type="Combodo-ValueType-Icon">
+              <label>UI:DashletHeaderStatic:Prop-Icon</label>
+            </node>
+          </nodes>
+        </definition>
+      </property_type>
+      <property_type id="DashletObjectList" xsi:type="Combodo-PropertyType">
+        <extends>Dashlet</extends>
+        <definition xsi:type="Combodo-ValueType-PropertyTree">
+          <nodes>
+            <node id="title" xsi:type="Combodo-ValueType-Label">
+              <label>UI:DashletObjectList:Prop-Title</label>
+            </node>
+            <node id="query" xsi:type="Combodo-ValueType-OQL">
+              <label>UI:DashletObjectList:Prop-Query</label>
+            </node>
+            <node id="menu" xsi:type="Combodo-ValueType-Boolean">
+              <label>UI:DashletObjectList:Prop-Menu</label>
+              <on>
+                <!-- not so cute, but matches exactly 3.2 implementation of boolean fields -->
+                <label>UI:UserManagement:ActionAllowed:Yes</label>
+                <value>true</value>
+              </on>
+              <off>
+                <label>UI:UserManagement:ActionAllowed:No</label>
+                <value>false</value>
+              </off>
+            </node>
+          </nodes>
+        </definition>
+      </property_type>
+      <property_type id="DashletPlainText" xsi:type="Combodo-PropertyType">
+        <extends>Dashlet</extends>
+        <definition xsi:type="Combodo-ValueType-PropertyTree">
+          <nodes>
+            <node id="text" xsi:type="Combodo-ValueType-Text">
+              <label>UI:DashletPlainText:Prop-Text</label>
+            </node>
+          </nodes>
+        </definition>
+      </property_type>
+    </property_types>
   </meta>
 </itop_design>

application/displayblock.class.inc.php

@@ -984,7 +984,7 @@ JS
 			$aFunctions = [$sFctVar => $oFctExpr];
 		}
 
-		if (!empty($sAggregationAttr)) {
+		if (!empty(trim($sAggregationAttr))) {
 			$sClass = $this->m_oFilter->GetClass();
 			$sAggregationAttr = MetaModel::GetLabel($sClass, $sAggregationAttr);
 		}
@@ -1608,10 +1608,9 @@ JS
 			$iTotalCount = 0;
 			$aURLs = [];
 
-			foreach ($aRes as $iRow => $aRow) {
+			foreach ($aRes as $aRow) {
 				$sValue = $aRow['grouped_by_1'];
 				$sHtmlValue = $oGroupByExp->MakeValueLabel($this->m_oFilter, $sValue, $sValue);
-				$iTotalCount += $aRow['_itop_count_'];
 				$aValues[] = [
 					'label' => html_entity_decode(strip_tags($sHtmlValue), ENT_QUOTES, 'UTF-8'),
 					'label_html' => $sHtmlValue,

application/logintwig.class.inc.php

@@ -243,15 +243,12 @@ class LoginTwigRenderer
 
 	public function GetDefaultVars()
 	{
-		$sVersionShort = Dict::Format('UI:iTopVersion:Short', ITOP_APPLICATION, ITOP_VERSION);
 		$sIconUrl = Utils::GetConfig()->Get('app_icon_url');
 		$sDisplayIcon = Branding::GetLoginLogoAbsoluteUrl();
 
 		$aVars = [
 			'sAppRootUrl' => utils::GetAbsoluteUrlAppRoot(),
 			'aPluginFormData' => $this->GetPluginFormData(),
-			'sItopVersion' => ITOP_VERSION,
-			'sVersionShort' => $sVersionShort,
 			'sIconUrl' => $sIconUrl,
 			'sDisplayIcon' => $sDisplayIcon,
 		];

application/menunode.class.inc.php

@@ -6,6 +6,7 @@
  */
 
 use Combodo\iTop\Application\Helper\WebResourcesHelper;
+use Combodo\iTop\Application\UI\Base\Layout\PageContent\PageContentFactory;
 use Combodo\iTop\Application\WebPage\ErrorPage;
 use Combodo\iTop\Application\WebPage\iTopWebPage;
 use Combodo\iTop\Application\WebPage\WebPage;
@@ -1218,7 +1219,6 @@ class NewObjectMenuNode extends MenuNode
 	}
 }
 
-require_once(APPROOT.'application/dashboard.class.inc.php');
 /**
  * This class defines a menu item which content is based on XML dashboard.
  */
@@ -1279,13 +1279,14 @@ class DashboardMenuNode extends MenuNode
 		if ($oDashboard != null) {
 			WebResourcesHelper::EnableC3JSToWebPage($oPage);
 
+			// TODO 3.3 this works for dashboard menu, what about other places ?
+			$oPageLayout = PageContentFactory::MakeForDashboard();
+			$oPage->SetContentLayout($oPageLayout, $oPage);
 			$sDivId = utils::Sanitize($this->sMenuId, '', 'element_identifier');
-			$oPage->add('<div id="'.$sDivId.'" class="ibo-dashboard" data-role="ibo-dashboard">');
 			$aExtraParams['dashboard_div_id'] = $sDivId;
 			$aExtraParams['from_dashboard_page'] = true;
 			$oDashboard->SetReloadURL($this->GetHyperlink($aExtraParams));
 			$oDashboard->Render($oPage, false, $aExtraParams);
-			$oPage->add('</div>');
 
 			$bEdit = utils::ReadParam('edit', false);
 			if ($bEdit) {
@@ -1311,37 +1312,6 @@ class DashboardMenuNode extends MenuNode
 			$oPage->p("Error: failed to load dashboard file: '{$this->sDashboardFile}'");
 		}
 	}
-
-	/**
-	 * @param WebPage $oPage
-	 * @throws CoreException
-	 * @throws Exception
-	 */
-	public function RenderEditor(WebPage $oPage)
-	{
-		$oDashboard = $this->GetDashboard();
-		if ($oDashboard != null) {
-			$oDashboard->RenderEditor($oPage);
-		} else {
-			$oPage->p("Error: failed to load dashboard file: '{$this->sDashboardFile}'");
-		}
-	}
-
-	/**
-	 * @param $oDashlet
-	 * @throws Exception
-	 */
-	public function AddDashlet($oDashlet)
-	{
-		$oDashboard = $this->GetDashboard();
-		if ($oDashboard != null) {
-			$oDashboard->AddDashlet($oDashlet);
-			$oDashboard->Save();
-		} else {
-			throw new Exception("Error: failed to load dashboard file: '{$this->sDashboardFile}'");
-		}
-	}
-
 }
 
 /**

application/utils.inc.php

@@ -1520,7 +1520,7 @@ class utils
 				$sUploadDashboardTransactId = utils::GetNewTransactionId();
 				$aResult = [
 					new SeparatorPopupMenuItem(),
-					new URLPopupMenuItem('UI:ExportDashboard', Dict::S('UI:ExportDashBoard'), utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php?operation=export_dashboard&id='.$sDashboardId.'&file='.$sDashboardFileURL),
+					new URLPopupMenuItem('UI:ExportDashboard', Dict::S('UI:ExportDashBoard'), utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php?route=dashboard.export&id='.$sDashboardId.'&file='.$sDashboardFileURL),
 					new JSPopupMenuItem('UI:ImportDashboard', Dict::S('UI:ImportDashBoard'), "UploadDashboard({dashboard_id: '$sDashboardId', file: '$sDashboardFileJS', title: '$sDlgTitle', text: '$sDlgText', close_btn: '$sCloseBtn', transaction: '$sUploadDashboardTransactId' })"),
 				];
 				if ($oDashboard->GetReloadURL()) {
@@ -1900,6 +1900,12 @@ SQL;
 		return $response;
 	}
 
+	public static function QuoteForPHP(string $sValue): string
+	{
+		$sEscaped = str_replace(['\\', "'"], ['\\\\', "\\'"], $sValue);
+		return "'$sEscaped'";
+	}
+
 	/**
 	 * Get a standard list of character sets
 	 *
@@ -2982,6 +2988,12 @@ TXT
 		return $sAcronym;
 	}
 
+	public static function IsTrue(mixed $value): bool
+	{
+		$bVal = (is_string($value) ? filter_var($value, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE) : (bool) $value);
+		return ($bVal === null ? false : $bVal);
+	}
+
 	//----------------------------------------------
 	// Text manipulation
 	//----------------------------------------------

bootstrap.inc.php

@@ -42,6 +42,20 @@ define('ITOP_DEFAULT_ENV', 'production');
 define('MAINTENANCE_MODE_FILE', APPROOT.'data/.maintenance');
 define('READONLY_MODE_FILE', APPROOT.'data/.readonly');
 
+// TODO 3.3 To deprecate
+/**
+ * Exclude the parent class from the list
+ *
+ * @package     iTopORM
+ */
+define('ENUM_CHILD_CLASSES_EXCLUDETOP', 1);
+/**
+ * Include the parent class in the list
+ *
+ * @package     iTopORM
+ */
+define('ENUM_CHILD_CLASSES_ALL', 2);
+
 $fItopStarted = microtime(true);
 $iItopInitialMemory = memory_get_usage(true);
 

composer.json

@@ -31,6 +31,7 @@
     "symfony/mailer": "^6.4",
     "symfony/security-csrf": "^6.4",
     "symfony/twig-bundle": "~6.4.0",
+    "symfony/validator" : "^6.4",
     "symfony/yaml": "~6.4.0",
     "tecnickcom/tcpdf": "^6.6.0",
     "thenetworg/oauth2-azure": "^2.0"

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "26fa7aa920057d080bcc0948bf052fda",
+    "content-hash": "3e627286597661542dd598499c2bcc36",
     "packages": [
         {
             "name": "apereo/phpcas",
@@ -1721,16 +1721,16 @@
         },
         {
             "name": "symfony/cache",
-            "version": "v6.4.24",
+            "version": "v6.4.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/cache.git",
-                "reference": "d038cd3054aeaf1c674022a77048b2ef6376a175"
+                "reference": "a463451b7f6ac4a47b98dbfc78ec2d3560c759d8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/cache/zipball/d038cd3054aeaf1c674022a77048b2ef6376a175",
-                "reference": "d038cd3054aeaf1c674022a77048b2ef6376a175",
+                "url": "https://api.github.com/repos/symfony/cache/zipball/a463451b7f6ac4a47b98dbfc78ec2d3560c759d8",
+                "reference": "a463451b7f6ac4a47b98dbfc78ec2d3560c759d8",
                 "shasum": ""
             },
             "require": {
@@ -1797,7 +1797,7 @@
                 "psr6"
             ],
             "support": {
-                "source": "https://github.com/symfony/cache/tree/v6.4.24"
+                "source": "https://github.com/symfony/cache/tree/v6.4.12"
             },
             "funding": [
                 {
@@ -1808,16 +1808,12 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
-                {
-                    "url": "https://github.com/nicolas-grekas",
-                    "type": "github"
-                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-07-30T09:32:03+00:00"
+            "time": "2024-09-16T16:01:33+00:00"
         },
         {
             "name": "symfony/cache-contracts",
@@ -3004,16 +3000,16 @@
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v6.4.25",
+            "version": "v6.4.29",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "6bc974c0035b643aa497c58d46d9e25185e4b272"
+                "reference": "b03d11e015552a315714c127d8d1e0f9e970ec88"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/6bc974c0035b643aa497c58d46d9e25185e4b272",
-                "reference": "6bc974c0035b643aa497c58d46d9e25185e4b272",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/b03d11e015552a315714c127d8d1e0f9e970ec88",
+                "reference": "b03d11e015552a315714c127d8d1e0f9e970ec88",
                 "shasum": ""
             },
             "require": {
@@ -3061,7 +3057,7 @@
             "description": "Defines an object-oriented layer for the HTTP specification",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-foundation/tree/v6.4.25"
+                "source": "https://github.com/symfony/http-foundation/tree/v6.4.29"
             },
             "funding": [
                 {
@@ -3081,7 +3077,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-08-20T06:48:20+00:00"
+            "time": "2025-11-08T16:40:12+00:00"
         },
         {
             "name": "symfony/http-kernel",
@@ -4533,16 +4529,16 @@
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v3.6.0",
+            "version": "v3.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "f021b05a130d35510bd6b25fe9053c2a8a15d5d4"
+                "reference": "45112560a3ba2d715666a509a0bc9521d10b6c43"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/f021b05a130d35510bd6b25fe9053c2a8a15d5d4",
-                "reference": "f021b05a130d35510bd6b25fe9053c2a8a15d5d4",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/45112560a3ba2d715666a509a0bc9521d10b6c43",
+                "reference": "45112560a3ba2d715666a509a0bc9521d10b6c43",
                 "shasum": ""
             },
             "require": {
@@ -4596,7 +4592,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v3.6.0"
+                "source": "https://github.com/symfony/service-contracts/tree/v3.6.1"
             },
             "funding": [
                 {
@@ -4607,12 +4603,16 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-04-25T09:37:31+00:00"
+            "time": "2025-07-15T11:30:57+00:00"
         },
         {
             "name": "symfony/string",
@@ -4983,6 +4983,107 @@
             ],
             "time": "2025-07-10T08:14:14+00:00"
         },
+        {
+            "name": "symfony/validator",
+            "version": "v6.4.29",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/validator.git",
+                "reference": "99df8a769e64e399f510166141ea74f450e8dd1d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/validator/zipball/99df8a769e64e399f510166141ea74f450e8dd1d",
+                "reference": "99df8a769e64e399f510166141ea74f450e8dd1d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1",
+                "symfony/deprecation-contracts": "^2.5|^3",
+                "symfony/polyfill-ctype": "~1.8",
+                "symfony/polyfill-mbstring": "~1.0",
+                "symfony/polyfill-php83": "^1.27",
+                "symfony/translation-contracts": "^2.5|^3"
+            },
+            "conflict": {
+                "doctrine/annotations": "<1.13",
+                "doctrine/lexer": "<1.1",
+                "symfony/dependency-injection": "<5.4",
+                "symfony/expression-language": "<5.4",
+                "symfony/http-kernel": "<5.4",
+                "symfony/intl": "<5.4",
+                "symfony/property-info": "<5.4",
+                "symfony/translation": "<5.4.35|>=6.0,<6.3.12|>=6.4,<6.4.3|>=7.0,<7.0.3",
+                "symfony/yaml": "<5.4"
+            },
+            "require-dev": {
+                "doctrine/annotations": "^1.13|^2",
+                "egulias/email-validator": "^2.1.10|^3|^4",
+                "symfony/cache": "^5.4|^6.0|^7.0",
+                "symfony/config": "^5.4|^6.0|^7.0",
+                "symfony/console": "^5.4|^6.0|^7.0",
+                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
+                "symfony/expression-language": "^5.4|^6.0|^7.0",
+                "symfony/finder": "^5.4|^6.0|^7.0",
+                "symfony/http-client": "^5.4|^6.0|^7.0",
+                "symfony/http-foundation": "^5.4|^6.0|^7.0",
+                "symfony/http-kernel": "^5.4|^6.0|^7.0",
+                "symfony/intl": "^5.4|^6.0|^7.0",
+                "symfony/mime": "^5.4|^6.0|^7.0",
+                "symfony/property-access": "^5.4|^6.0|^7.0",
+                "symfony/property-info": "^5.4|^6.0|^7.0",
+                "symfony/translation": "^5.4.35|~6.3.12|^6.4.3|^7.0.3",
+                "symfony/yaml": "^5.4|^6.0|^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Validator\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/",
+                    "/Resources/bin/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Provides tools to validate values",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/validator/tree/v6.4.29"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-11-06T20:26:06+00:00"
+        },
         {
             "name": "symfony/var-dumper",
             "version": "v6.4.26",
@@ -5073,16 +5174,16 @@
         },
         {
             "name": "symfony/var-exporter",
-            "version": "v6.4.25",
+            "version": "v6.4.26",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-exporter.git",
-                "reference": "4ff50a1b7c75d1d596aca50899d0c8c7e3de8358"
+                "reference": "466fcac5fa2e871f83d31173f80e9c2684743bfc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/4ff50a1b7c75d1d596aca50899d0c8c7e3de8358",
-                "reference": "4ff50a1b7c75d1d596aca50899d0c8c7e3de8358",
+                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/466fcac5fa2e871f83d31173f80e9c2684743bfc",
+                "reference": "466fcac5fa2e871f83d31173f80e9c2684743bfc",
                 "shasum": ""
             },
             "require": {
@@ -5130,7 +5231,7 @@
                 "serialize"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-exporter/tree/v6.4.25"
+                "source": "https://github.com/symfony/var-exporter/tree/v6.4.26"
             },
             "funding": [
                 {
@@ -5150,7 +5251,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-08-18T13:06:32+00:00"
+            "time": "2025-09-11T09:57:09+00:00"
         },
         {
             "name": "symfony/yaml",
@@ -5614,5 +5715,5 @@
     "platform-overrides": {
         "php": "8.1.0"
     },
-    "plugin-api-version": "2.6.0"
+    "plugin-api-version": "2.9.0"
 }

core/config.class.inc.php

@@ -211,6 +211,14 @@ class Config
 			'source_of_value'     => '',
 			'show_in_conf_sample' => true,
 		],
+		'allowed_login_types'                       => [
+			'type'                => 'string',
+			'description'         => 'List of login types allowed (separated by | ): form, external, basic, token',
+			'default'             => DEFAULT_ALLOWED_LOGIN_TYPES,
+			'value'               => '',
+			'source_of_value'     => '',
+			'show_in_conf_sample' => true,
+		],
 		'app_icon_url'                       => [
 			'type'                => 'string',
 			'description'         => 'Hyperlink to redirect the user when clicking on the application icon (in the main window, or login/logoff pages)',
@@ -1946,11 +1954,6 @@ class Config
 	 */
 	protected $m_sDefaultLanguage;
 
-	/**
-	 * @var string Type of login process allowed: form|basic|url|external
-	 */
-	protected $m_sAllowedLoginTypes;
-
 	/**
 	 * @var string Name of the PHP variable in which external authentication information is passed by the web server
 	 */
@@ -2024,7 +2027,6 @@ class Config
 		$this->m_iFastReloadInterval = DEFAULT_FAST_RELOAD_INTERVAL;
 		$this->m_bSecureConnectionRequired = DEFAULT_SECURE_CONNECTION_REQUIRED;
 		$this->m_sDefaultLanguage = 'EN US';
-		$this->m_sAllowedLoginTypes = DEFAULT_ALLOWED_LOGIN_TYPES;
 		$this->m_sExtAuthVariable = DEFAULT_EXT_AUTH_VARIABLE;
 		$this->m_aCharsets = [];
 		$this->m_bQueryCacheEnabled = DEFAULT_QUERY_CACHE_ENABLED;
@@ -2171,7 +2173,6 @@ class Config
 		$this->m_aModuleSettings = isset($MyModuleSettings) ? $MyModuleSettings : [];
 
 		$this->m_sDefaultLanguage = isset($MySettings['default_language']) ? trim($MySettings['default_language']) : 'EN US';
-		$this->m_sAllowedLoginTypes = isset($MySettings['allowed_login_types']) ? trim($MySettings['allowed_login_types']) : DEFAULT_ALLOWED_LOGIN_TYPES;
 		$this->m_sExtAuthVariable = isset($MySettings['ext_auth_variable']) ? trim($MySettings['ext_auth_variable']) : DEFAULT_EXT_AUTH_VARIABLE;
 		$this->m_sEncryptionKey = isset($MySettings['encryption_key']) ? trim($MySettings['encryption_key']) : $this->m_sEncryptionKey;
 		$this->m_sEncryptionLibrary = isset($MySettings['encryption_library']) ? trim($MySettings['encryption_library']) : $this->m_sEncryptionLibrary;
@@ -2331,7 +2332,7 @@ class Config
 
 	public function GetAllowedLoginTypes()
 	{
-		return explode('|', $this->m_sAllowedLoginTypes);
+		return explode('|', $this->m_aSettings['allowed_login_types']['value']);
 	}
 
 	public function GetExternalAuthenticationVariable()
@@ -2409,7 +2410,7 @@ class Config
 
 	public function SetAllowedLoginTypes($aAllowedLoginTypes)
 	{
-		$this->m_sAllowedLoginTypes = implode('|', $aAllowedLoginTypes);
+		$this->Set('allowed_login_types', implode('|', $aAllowedLoginTypes));
 	}
 
 	/**
@@ -2486,7 +2487,6 @@ class Config
 		$aSettings['fast_reload_interval'] = $this->m_iFastReloadInterval;
 		$aSettings['secure_connection_required'] = $this->m_bSecureConnectionRequired;
 		$aSettings['default_language'] = $this->m_sDefaultLanguage;
-		$aSettings['allowed_login_types'] = $this->m_sAllowedLoginTypes;
 		$aSettings['ext_auth_variable'] = $this->m_sExtAuthVariable;
 		$aSettings['encryption_key'] = $this->m_sEncryptionKey;
 		$aSettings['encryption_library'] = $this->m_sEncryptionLibrary;
@@ -2590,7 +2590,6 @@ class Config
 			// Old fashioned remaining values
 			$aOtherValues = [
 				'default_language' => $this->m_sDefaultLanguage,
-				'allowed_login_types' => $this->m_sAllowedLoginTypes,
 				'ext_auth_variable' => $this->m_sExtAuthVariable,
 				'encryption_key' => $this->m_sEncryptionKey,
 				'encryption_library' => $this->m_sEncryptionLibrary,

core/designdocument.class.inc.php

@@ -41,7 +41,7 @@ use utils;
 /**
  * Class \Combodo\iTop\DesignDocument
  *
- * A design document is the DOM tree that modelize behaviors. One of its
+ * A design document is the DOM tree that models behaviors. One of its
  * characteristics is that it can be altered by the mean of the same kind of document.
  *
  */

core/inlineimage.class.inc.php

@@ -259,13 +259,18 @@ class InlineImage extends DBObject
 	 * that refer to an InlineImage (detected via the attribute data-img-id="") so that
 	 * the URL is consistent with the current URL of the application.
 	 *
-	 * @param string $sHtml The HTML fragment to process
+N°8681	 * @param string|null $sHtml The HTML fragment to process
 	 *
 	 * @return string The modified HTML
 	 * @throws \Exception
+	 *
+	 * @since 3.3.0 N°8681 Add type hint for parameters and return value
 	 */
-	public static function FixUrls($sHtml)
+	public static function FixUrls(string|null $sHtml): string
 	{
+		// N°8681 - Ensure to have a string value
+		$sHtml = $sHtml ?? '';
+
 		$aNeedles = [];
 		$aReplacements = [];
 		// Find img tags with an attribute data-img-id
@@ -389,7 +394,7 @@ JS
 	 * Resize an image so that it fits the maximum width/height defined in the config file
 	 * @param ormDocument $oImage The original image stored as an array (content / mimetype / filename)
 	 * @return ormDocument The resampled image (or the original one if it already fit)
-	 * @deprecated Replaced by ormDocument::ResizeImageToFit
+	 * @deprecated since 3.3.0 Replaced by ormDocument::ResizeImageToFit
 	 */
 	public static function ResizeImageToFit(ormDocument $oImage, &$aDimensions = null)
 	{

core/kpi.class.inc.php

@@ -1,18 +1,20 @@
 <?php
 
 /**
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
+ * @copyright   Copyright (C) 2010-2026 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
+use Combodo\iTop\Application\EventRegister\ApplicationEvents;
 use Combodo\iTop\Core\Kpi\KpiLogData;
+use Combodo\iTop\Service\Events\EventService;
+use Combodo\iTop\Service\Events\iEventServiceSetup;
 use Combodo\iTop\Service\Module\ModuleService;
 
 /**
  * Measures operations duration, memory usage, etc. (and some other KPIs)
  */
-
-class ExecutionKPI
+class ExecutionKPI implements iEventServiceSetup
 {
 	protected static $m_bEnabled_Duration = false;
 	protected static $m_bEnabled_Memory = false;
@@ -23,15 +25,18 @@ class ExecutionKPI
 
 	protected static $m_aStats = []; // Recurrent operations
 	protected static $m_aExecData = []; // One shot operations
-	/**
-	 * @var array[ExecutionKPI]
-	 */
-	protected static $m_aExecutionStack = []; // embedded execution stats
+	/** @var true */
+	private static bool $bMetamodelStarted = false;
 
+	private static ?float $fLastReportTime = null;
+	private static ?float $iLastReportMemory = null;
+
+	// For stats
 	protected $m_fStarted = null;
-	protected $m_fChildrenDuration = 0; // Count embedded
 	protected $m_iInitialMemory = null;
 
+	private static array $aBootstrapOperations = [];
+
 	public static function EnableDuration($iLevel)
 	{
 		if ($iLevel > 0) {
@@ -71,6 +76,7 @@ class ExecutionKPI
 				return true;
 			}
 		}
+
 		return false;
 	}
 
@@ -97,7 +103,7 @@ class ExecutionKPI
 		$sFor = self::$m_sAllowedUser == '*' ? 'EVERYBODY' : "'".trim(self::$m_sAllowedUser)."'";
 		$sSlowQueries = '';
 		if (self::$m_fSlowQueries > 0) {
-			$sSlowQueries = ". Slow Queries: ".self::$m_fSlowQueries."s";
+			$sSlowQueries = '. Slow Queries: '.self::$m_fSlowQueries.'s';
 		}
 
 		$aExtensions = [];
@@ -127,7 +133,7 @@ class ExecutionKPI
 			$sRequest .= ' operation: '.$_POST['operation'];
 		}
 
-		$fStop = MyHelpers::getmicrotime();
+		$fStop = microtime(true);
 		if (($fStop - $fItopStarted) > self::$m_fSlowQueries) {
 			// Invoke extensions to log the KPI operation
 			/** @var \iKPILoggerExtension $oExtensionInstance */
@@ -151,17 +157,17 @@ class ExecutionKPI
 
 		$sTableStyle = 'background-color: #ccc; margin: 10px;';
 
-		$sHtml = "<hr/>";
+		$sHtml = '<hr/>';
 		$sHtml .= "<div style=\"background-color: grey; padding: 10px;\">";
 		$sHtml .= "<h3><a name=\"".md5($sExecId)."\">KPIs</a> - $sRequest</h3>";
 		$oStarted = DateTime::createFromFormat('U.u', $fItopStarted);
 		$sHtml .= '<p>'.$oStarted->format('Y-m-d H:i:s.u').'</p>';
-		$sHtml .= "<p>log_kpi_user_id: ".UserRights::GetUserId()."</p>";
-		$sHtml .= "<div>";
+		$sHtml .= '<p>log_kpi_user_id: '.UserRights::GetUserId().'</p>';
+		$sHtml .= '<div>';
 		$sHtml .= "<table border=\"1\" style=\"$sTableStyle\">";
-		$sHtml .= "<thead>";
-		$sHtml .= "   <th>Operation</th><th>Begin</th><th>End</th><th>Duration</th><th>Memory start</th><th>Memory end</th><th>Memory peak</th>";
-		$sHtml .= "</thead>";
+		$sHtml .= '<thead>';
+		$sHtml .= '   <th>Operation</th><th>Begin</th><th>End</th><th>Duration</th><th>Memory start</th><th>Memory end</th><th>Memory peak</th>';
+		$sHtml .= '</thead>';
 		foreach (self::$m_aExecData as $aOpStats) {
 			$sOperation = $aOpStats['op'];
 			$sBegin = round($aOpStats['time_begin'], 3);
@@ -180,12 +186,12 @@ class ExecutionKPI
 				}
 			}
 
-			$sHtml .= "<tr>";
+			$sHtml .= '<tr>';
 			$sHtml .= "   <td>$sOperation</td><td>$sBegin</td><td>$sEnd</td><td>$sDuration</td><td>$sMemBegin</td><td>$sMemEnd</td><td>$sMemPeak</td>";
-			$sHtml .= "</tr>";
+			$sHtml .= '</tr>';
 		}
-		$sHtml .= "</table>";
-		$sHtml .= "</div>";
+		$sHtml .= '</table>';
+		$sHtml .= '</div>';
 
 		$aConsolidatedStats = [];
 		foreach (self::$m_aStats as $sOperation => $aOpStats) {
@@ -208,20 +214,20 @@ class ExecutionKPI
 				}
 			}
 			$aConsolidatedStats[$sOperation] = [
-				'count' => $iTotalOp,
+				'count'    => $iTotalOp,
 				'duration' => $fTotalOp,
-				'min' => $fMinOp,
-				'max' => $fMaxOp,
-				'avg' => $fTotalOp / $iTotalOp,
+				'min'      => $fMinOp,
+				'max'      => $fMaxOp,
+				'avg'      => $fTotalOp / $iTotalOp,
 				'max_args' => $sMaxOpArguments,
 			];
 		}
 
-		$sHtml .= "<div>";
+		$sHtml .= '<div>';
 		$sHtml .= "<table border=\"1\" style=\"$sTableStyle\">";
-		$sHtml .= "<thead>";
-		$sHtml .= "   <th>Operation</th><th>Count</th><th>Duration</th><th>Min</th><th>Max</th><th>Avg</th>";
-		$sHtml .= "</thead>";
+		$sHtml .= '<thead>';
+		$sHtml .= '   <th>Operation</th><th>Count</th><th>Duration</th><th>Min</th><th>Max</th><th>Avg</th>';
+		$sHtml .= '</thead>';
 		foreach ($aConsolidatedStats as $sOperation => $aOpStats) {
 			$sOperation = '<a href="#'.md5($sExecId.$sOperation).'">'.$sOperation.'</a>';
 			$sCount = $aOpStats['count'];
@@ -230,14 +236,14 @@ class ExecutionKPI
 			$sMax = '<a href="#'.md5($sExecId.$aOpStats['max_args']).'">'.round($aOpStats['max'], 3).'</a>';
 			$sAvg = round($aOpStats['avg'], 3);
 
-			$sHtml .= "<tr>";
+			$sHtml .= '<tr>';
 			$sHtml .= "   <td>$sOperation</td><td>$sCount</td><td>$sDuration</td><td>$sMin</td><td>$sMax</td><td>$sAvg</td>";
-			$sHtml .= "</tr>";
+			$sHtml .= '</tr>';
 		}
-		$sHtml .= "</table>";
-		$sHtml .= "</div>";
+		$sHtml .= '</table>';
+		$sHtml .= '</div>';
 
-		$sHtml .= "</div>";
+		$sHtml .= '</div>';
 
 		$sHtml .= "<p><a href=\"#end-".md5($sExecId)."\">Next page stats</a></p>";
 
@@ -287,18 +293,18 @@ class ExecutionKPI
 						$sOperationHtml = '<a name="'.md5($sExecId.$sOperation).'">'.$sOperation.'</a>';
 						$sHtml .= "<h4>$sOperationHtml</h4>";
 						$sHtml .= "<table border=\"1\" style=\"$sTableStyle\">";
-						$sHtml .= "<thead>";
-						$sHtml .= "   <th>Operation details (+ blame caller if log_kpi_duration = 2)</th><th>Count</th><th>Duration</th><th>Min</th><th>Max</th>";
-						$sHtml .= "</thead>";
+						$sHtml .= '<thead>';
+						$sHtml .= '   <th>Operation details (+ blame caller if log_kpi_duration = 2)</th><th>Count</th><th>Duration</th><th>Min</th><th>Max</th>';
+						$sHtml .= '</thead>';
 						$bDisplayHeader = false;
 					}
-					$sHtml .= "<tr>";
+					$sHtml .= '<tr>';
 					$sHtml .= "   <td>$sHtmlArguments</td><td>$iCountInter</td><td>$sTotalInter</td><td>$sMinInter</td><td>$sMaxInter</td>";
-					$sHtml .= "</tr>";
+					$sHtml .= '</tr>';
 				}
 			}
 			if (!$bDisplayHeader) {
-				$sHtml .= "</table>";
+				$sHtml .= '</table>';
 				$sHtml .= "<p><a href=\"#".md5($sExecId)."\">Back to page stats</a></p>";
 			}
 			self::Report($sHtml);
@@ -333,39 +339,50 @@ class ExecutionKPI
 
 		$aNewEntry = null;
 
-		$fStarted = $this->m_fStarted;
-		$fStopped = $this->m_fStarted;
-		if (self::$m_bEnabled_Duration) {
-			$fStopped = MyHelpers::getmicrotime();
-			$aNewEntry = [
-				'op'         => $sOperationDesc,
-				'time_begin' => $this->m_fStarted - $fItopStarted,
-				'time_end'   => $fStopped - $fItopStarted,
-			];
-			// Reset for the next operation (if the object is recycled)
-			$this->m_fStarted = $fStopped;
+		if (is_null(static::$fLastReportTime)) {
+			static::$fLastReportTime = $fItopStarted;
 		}
 
-		$iInitialMemory = is_null($this->m_iInitialMemory) ? 0 : $this->m_iInitialMemory;
-		$iCurrentMemory = 0;
-		$iPeakMemory = 0;
+		if (is_null(static::$iLastReportMemory)) {
+			global $iItopInitialMemory;
+			static::$iLastReportMemory = $iItopInitialMemory;
+		}
+
+		$fStarted = static::$fLastReportTime;
+		$fStopped = microtime(true);
+		if (self::$m_bEnabled_Duration) {
+			$aNewEntry = [
+				'op'         => $sOperationDesc,
+				'time_begin' => $fStarted - $fItopStarted,
+				'time_end'   => $fStopped - $fItopStarted,
+			];
+		}
+		static::$fLastReportTime = $fStopped;
+
+		$iInitialMemory = static::$iLastReportMemory;
+		$iCurrentMemory = $iInitialMemory;
+		$iPeakMemory = $iInitialMemory;
 		if (self::$m_bEnabled_Memory) {
 			$iCurrentMemory = self::memory_get_usage();
 			if (is_null($aNewEntry)) {
 				$aNewEntry = ['op' => $sOperationDesc];
 			}
-			$aNewEntry['mem_begin'] = $this->m_iInitialMemory;
+			$aNewEntry['mem_begin'] = $iInitialMemory;
 			$aNewEntry['mem_end'] = $iCurrentMemory;
 			$iPeakMemory = self::memory_get_peak_usage();
 			$aNewEntry['mem_peak'] = $iPeakMemory;
 			// Reset for the next operation (if the object is recycled)
-			$this->m_iInitialMemory = $iCurrentMemory;
+			static::$iLastReportMemory = $iCurrentMemory;
 		}
 
 		if (self::$m_bEnabled_Duration || self::$m_bEnabled_Memory) {
-			// Invoke extensions to log the KPI operation
-			/** @var \iKPILoggerExtension $oExtensionInstance */
-			foreach (MetaModel::EnumPlugins('iKPILoggerExtension') as $oExtensionInstance) {
+			$aCallstack = ['callstack' => $this->GetCallStack()];
+			if (static::$bMetamodelStarted) {
+				foreach (static::$aBootstrapOperations as $oLog) {
+					$this->LogOperation($oLog);
+				}
+				static::$aBootstrapOperations = [];
+				// Invoke extensions to log the KPI operation
 				$sExtension = ModuleService::GetInstance()->GetModuleNameFromCallStack(1);
 				$oKPILogData = new KpiLogData(
 					KpiLogData::TYPE_REPORT,
@@ -376,9 +393,24 @@ class ExecutionKPI
 					$sExtension,
 					$iInitialMemory,
 					$iCurrentMemory,
-					$iPeakMemory
+					$iPeakMemory,
+					$aCallstack
 				);
-				$oExtensionInstance->LogOperation($oKPILogData);
+				$this->LogOperation($oKPILogData);
+			} else {
+				$oKPILogData = new KpiLogData(
+					KpiLogData::TYPE_REPORT,
+					'Step',
+					$sOperationDesc,
+					$fStarted,
+					$fStopped,
+					'',
+					$iInitialMemory,
+					$iCurrentMemory,
+					$iPeakMemory,
+					$aCallstack
+				);
+				static::$aBootstrapOperations[] = $oKPILogData;
 			}
 		}
 
@@ -388,13 +420,21 @@ class ExecutionKPI
 		$this->ResetCounters();
 	}
 
+	private function LogOperation(KpiLogData $oKPILogData): void
+	{
+		/** @var \iKPILoggerExtension $oExtensionInstance */
+		foreach (MetaModel::EnumPlugins('iKPILoggerExtension') as $oExtensionInstance) {
+			$oExtensionInstance->LogOperation($oKPILogData);
+		}
+	}
+
 	/**
 	 * Compute statistics for a call to an extension
 	 * Note: not working in dev mode (with links to env-production)
 	 *
 	 * @param object|string $object object called
-	 * @param string $sMethod       method called on the object
-	 * @param string $sMessage      additional message
+	 * @param string $sMethod method called on the object
+	 * @param string $sMessage additional message
 	 *
 	 * @return bool true if an extension was found for this object::method
 	 * @throws \ReflectionException
@@ -423,21 +463,23 @@ class ExecutionKPI
 
 		$fDuration = 0;
 		if (self::$m_bEnabled_Duration) {
-			$fStopped = MyHelpers::getmicrotime();
+			$fStopped = microtime(true);
 			$fDuration = $fStopped - $this->m_fStarted;
 			$aCallstack = [];
 			if (self::$m_bGenerateLegacyReport) {
 				if (self::$m_bBlameCaller) {
 					$aCallstack = MyHelpers::get_callstack(1);
 					self::$m_aStats[$sOperation][$sArguments][] = [
-							'time' => $fDuration,
-							'callers' => $aCallstack,
+						'time'    => $fDuration,
+						'callers' => $aCallstack,
 					];
 				} else {
 					self::$m_aStats[$sOperation][$sArguments][] = [
-							'time' => $fDuration,
+						'time' => $fDuration,
 					];
 				}
+			} else {
+				$aCallstack = ['callstack' => $this->GetCallStack()];
 			}
 
 			$iInitialMemory = is_null($this->m_iInitialMemory) ? 0 : $this->m_iInitialMemory;
@@ -448,33 +490,45 @@ class ExecutionKPI
 				$iPeakMemory = self::memory_get_peak_usage();
 			}
 
-			// Invoke extensions to log the KPI operation
-			/** @var \iKPILoggerExtension $oExtensionInstance */
-			foreach (MetaModel::EnumPlugins('iKPILoggerExtension') as $oExtensionInstance) {
-				//$sExtension = ModuleService::GetInstance()->GetModuleNameFromCallStack(1);
-				$sExtension = '';
+			if (static::$bMetamodelStarted) {
+				foreach (static::$aBootstrapOperations as $oLog) {
+					$this->LogOperation($oLog);
+				}
+				static::$aBootstrapOperations = [];
 				$oKPILogData = new KpiLogData(
 					KpiLogData::TYPE_STATS,
 					$sOperation,
 					$sArguments,
 					$this->m_fStarted,
 					$fStopped,
-					$sExtension,
+					'',
 					$iInitialMemory,
 					$iCurrentMemory,
 					$iPeakMemory,
 					$aCallstack
 				);
-				$oExtensionInstance->LogOperation($oKPILogData);
+				$this->LogOperation($oKPILogData);
+			} else {
+				$oKPILogData = new KpiLogData(
+					KpiLogData::TYPE_STATS,
+					$sOperation,
+					$sArguments,
+					$this->m_fStarted,
+					$fStopped,
+					'',
+					$iInitialMemory,
+					$iCurrentMemory,
+					$iPeakMemory,
+					$aCallstack
+				);
+				static::$aBootstrapOperations[] = $oKPILogData;
 			}
 		}
 	}
 
 	protected function ResetCounters()
 	{
-		if (self::$m_bEnabled_Duration) {
-			$this->m_fStarted = microtime(true);
-		}
+		$this->m_fStarted = microtime(true);
 
 		if (self::$m_bEnabled_Memory) {
 			$this->m_iInitialMemory = self::memory_get_usage();
@@ -503,7 +557,33 @@ class ExecutionKPI
 		if (function_exists('memory_get_peak_usage')) {
 			return memory_get_peak_usage($bRealUsage);
 		}
+
 		// PHP > 5.2.1 - this verb depends on a compilation option
 		return 0;
 	}
+
+	/*
+	 * ModuleHandlerApiInterface methods
+	 */
+
+	public static function OnMetaModelStarted()
+	{
+		static::$bMetamodelStarted = true;
+	}
+
+	public function RegisterEventsAndListeners()
+	{
+		EventService::RegisterListener(ApplicationEvents::APPLICATION_EVENT_METAMODEL_STARTED, [$this, 'OnMetaModelStarted']);
+	}
+
+	private function GetCallStack(): string
+	{
+		$aCallStack = MyHelpers::get_callstack(2);
+		$sCallStack = "Call stack:\n";
+		foreach ($aCallStack as $index => $aLine) {
+			$sCallStack .= "#$index ".$aLine['File'].'('.$aLine['Line'].'): '.$aLine['Function']."\n";
+		}
+
+		return $sCallStack;
+	}
 }

core/log.class.inc.php

@@ -691,6 +691,28 @@ abstract class LogAPI
 		static::$m_oMockMetaModelConfig = $oMetaModelConfig;
 	}
 
+	public static function Exception(string $sMessage, throwable $oException, string $sChannel = null, array $aContext = []): void
+	{
+		$aErrorLogs = [];
+		$aErrorLogs[] = static::PrepareErrorLog($sMessage, $oException, $aContext);
+		$oException = $oException->getPrevious();
+		while ($oException !== null) {
+			$aErrorLogs[] = static::PrepareErrorLog($oException->getMessage(), $oException, $aContext, true);
+			$oException = $oException->getPrevious();
+		}
+		$aErrorLogs = array_reverse($aErrorLogs);
+		foreach ($aErrorLogs as $aErrorLog) {
+			static::Error($aErrorLog['message'], $sChannel, $aErrorLog['context']);
+		}
+	}
+
+	private static function PrepareErrorLog(string $sMessage, throwable $oException, array $aContext, bool $isPrevious = false): array
+	{
+		$aContext['Error Message'] = $oException->getMessage();
+		$aContext['Stack Trace'] = $oException->getTraceAsString();
+		return ['message' => ($isPrevious ? "Previous " : '')."Exception: $sMessage", 'context' => $aContext];
+	}
+
 	public static function Error($sMessage, $sChannel = null, $aContext = [])
 	{
 		static::Log(self::LEVEL_ERROR, $sMessage, $sChannel, $aContext);

core/metamodel.class.php

@@ -22,6 +22,7 @@ use Combodo\iTop\Application\EventRegister\ApplicationEvents;
 use Combodo\iTop\Core\MetaModel\FriendlyNameType;
 use Combodo\iTop\Service\Events\EventData;
 use Combodo\iTop\Service\Events\EventService;
+use Combodo\iTop\Service\ServiceLocator\ServiceLocator;
 
 require_once APPROOT.'core/modulehandler.class.inc.php';
 require_once APPROOT.'core/querymodifier.class.inc.php';
@@ -142,6 +143,8 @@ abstract class MetaModel
 	 */
 	protected static array $m_aReentranceProtection = [];
 
+	private static ServiceLocator $oServiceLocator;
+
 	/**
 	 * MetaModel constructor.
 	 */
@@ -7026,6 +7029,46 @@ abstract class MetaModel
 			}
 		}
 	}
+
+	/**
+	 * (Re)Init the global service locator with a configuration file
+	 *
+	 * @param string|null $sRelativeConfigFileName default to the runtime config file when null
+	 *
+	 * @return void
+	 * @api
+	 * @since 3.3.0
+	 */
+	public static function InitServiceLocator(string $sRelativeConfigFileName = null): void
+	{
+		if (!isset(self::$oServiceLocator)) {
+			self::$oServiceLocator = new ServiceLocator();
+		}
+
+		// Read the runtime service locator configuration
+		self::$oServiceLocator->Init($sRelativeConfigFileName);
+	}
+
+	/**
+	 * Get configured service using a service locator
+	 *
+	 * Example: $oModelReflection = \MetaModel::GetService('ModelReflexion');
+	 *
+	 * @param string $sServiceName Name of the service to get
+	 *
+	 * @return mixed The service object instance corresponding to the service name
+	 * @throws \Combodo\iTop\Service\ServiceLocator\ServiceLocatorException
+	 * @api
+	 * @since 3.3.0
+	 */
+	public static function GetService(string $sServiceName): mixed
+	{
+		if (!isset(self::$oServiceLocator)) {
+			// Read the runtime service locator configuration
+			self::InitServiceLocator();
+		}
+		return self::$oServiceLocator->get($sServiceName);
+	}
 }
 
 // Standard attribute lists

core/modelreflection.class.inc.php

@@ -24,19 +24,6 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
-/**
- * Exclude the parent class from the list
- *
- * @package     iTopORM
- */
-define('ENUM_CHILD_CLASSES_EXCLUDETOP', 1);
-/**
- * Include the parent class in the list
- *
- * @package     iTopORM
-*/
-define('ENUM_CHILD_CLASSES_ALL', 2);
-
 abstract class ModelReflection
 {
 	abstract public function GetClassIcon($sClass, $bImgTag = true);
@@ -55,6 +42,11 @@ abstract class ModelReflection
 	abstract public function GetFiltersList($sClass);
 	abstract public function IsValidFilterCode($sClass, $sFilterCode);
 
+	/**
+	 * @since 3.3.0
+	 */
+	abstract public function IsAbstract($sClass): bool;
+
 	/**
 	 * @param string $sOQL
 	 *
@@ -84,9 +76,17 @@ abstract class ModelReflection
 	 * @param string $defaultValue
 	 *
 	 * @return \RunTimeIconSelectionField
+	 * @deprecated since 3.3.0 replaced by GetAvailableIcons
 	 */
 	abstract public function GetIconSelectionField($sCode, $sLabel = '', $defaultValue = '');
 
+	/**
+	 * Find available icons for the current context
+	 *
+	 * @return array of ['value', 'label', 'icon'] where 'value' is the relative path on disk, 'label' the name to display and 'icon' is the URL to get the image
+	 */
+	abstract public function GetAvailableIcons(): array;
+
 	abstract public function GetRootClass($sClass);
 	abstract public function EnumChildClasses($sClass, $iOption = ENUM_CHILD_CLASSES_EXCLUDETOP);
 }
@@ -104,6 +104,8 @@ abstract class QueryReflection
 
 class ModelReflectionRuntime extends ModelReflection
 {
+	private static array $aAllIcons = [];
+
 	public function __construct()
 	{
 	}
@@ -148,7 +150,7 @@ class ModelReflectionRuntime extends ModelReflection
 			$sAttributeClass = get_class($oAttDef);
 			if ($aScope != null) {
 				foreach ($aScope as $sScopeClass) {
-					if (($sAttributeClass == $sScopeClass) || is_subclass_of($sAttributeClass, $sScopeClass)) {
+					if (is_a($sAttributeClass, $sScopeClass, true)) {
 						$aAttributes[$sAttCode] = $sAttributeClass;
 						break;
 					}
@@ -230,6 +232,11 @@ class ModelReflectionRuntime extends ModelReflection
 		return MetaModel::IsValidFilterCode($sClass, $sFilterCode);
 	}
 
+	public function IsAbstract($sClass): bool
+	{
+		return MetaModel::IsAbstract($sClass);
+	}
+
 	public function GetQuery($sOQL)
 	{
 		return new QueryReflectionRuntime($sOQL, $this);
@@ -245,6 +252,52 @@ class ModelReflectionRuntime extends ModelReflection
 		return new RunTimeIconSelectionField($sCode, $sLabel, $defaultValue);
 	}
 
+	public function GetAvailableIcons(): array
+	{
+		$aFolderList = [
+			APPROOT.'env-'.utils::GetCurrentEnvironment() => utils::GetAbsoluteUrlModulesRoot(),
+			APPROOT.'images/icons' => utils::GetAbsoluteUrlAppRoot().'images/icons',
+		];
+		if (count(self::$aAllIcons) == 0) {
+			foreach ($aFolderList as $sFolderPath => $sUrlPrefix) {
+				$aIcons = self::FindIconsOnDisk($sFolderPath);
+				ksort($aIcons);
+
+				foreach ($aIcons as $sFilePath) {
+					self::$aAllIcons[] = ['value' => $sFilePath, 'label' => basename($sFilePath), 'icon' => $sUrlPrefix.$sFilePath];
+				}
+			}
+		}
+
+		return self::$aAllIcons;
+	}
+
+	private static function FindIconsOnDisk(string $sBaseDir, string $sDir = '', array &$aFilesSpecs = []): array
+	{
+		$aResult = [];
+		// Populate automatically the list of icon files
+		if ($hDir = @opendir($sBaseDir.'/'.$sDir)) {
+			while (($sFile = readdir($hDir)) !== false) {
+				$aMatches = [];
+				if (($sFile != '.') && ($sFile != '..') && ($sFile != 'lifecycle') && is_dir($sBaseDir.'/'.$sDir.'/'.$sFile)) {
+					$sDirSubPath = ($sDir == '') ? $sFile : $sDir.'/'.$sFile;
+					$aResult = array_merge($aResult, self::FindIconsOnDisk($sBaseDir, $sDirSubPath, $aFilesSpecs));
+				}
+				$sSize = filesize($sBaseDir.'/'.$sDir.'/'.$sFile);
+				if (isset($aFilesSpecs[$sFile]) && $aFilesSpecs[$sFile] == $sSize) {
+					continue;
+				}
+				if (preg_match('/\.(png|jpg|jpeg|gif|svg)$/i', $sFile, $aMatches)) { // png, jp(e)g, gif and svg are considered valid
+					$aResult[$sFile.'_'.$sDir] = $sDir.'/'.$sFile;
+					$aFilesSpecs[$sFile] = $sSize;
+				}
+			}
+			closedir($hDir);
+		}
+
+		return $aResult;
+	}
+
 	public function GetRootClass($sClass)
 	{
 		return MetaModel::GetRootClass($sClass);

core/oql/expression.class.inc.php

@@ -2103,12 +2103,18 @@ class VariableExpression extends UnaryExpression
 
 	/**
 	 * Evaluate the value of the expression
+	 *
 	 * @param array $aArgs
-	 * @throws \Exception if terms cannot be evaluated as scalars
-*/
+	 *
+	 * @return mixed
+	 * @throws \MissingQueryArgument
+	 */
 	public function Evaluate(array $aArgs)
 	{
-		throw new Exception('not implemented yet');
+		if (!isset($aArgs[$this->m_sName])) {
+			throw new MissingQueryArgument('Missing variable expression argument', array('expecting'=>$this->m_sName));
+		}
+		return $aArgs[$this->m_sName];
 	}
 
 	/**

core/oql/oqlexception.class.inc.php

@@ -72,9 +72,15 @@ class OQLException extends CoreException
 		}
 		else
 		{
-			$sExpectations = '{'.implode(', ', $this->m_aExpecting).'}';
+			$sMessage = "$sIssue - found '{$this->m_sUnexpected}' at $iCol in '$sInput'";
+			if (count($this->m_aExpecting) < 30) {
+				$sExpectations = '{'.implode(', ', $this->m_aExpecting).'}';
+				$sMessage .= ', expecting '.json_encode($sExpectations);
+			}
 			$sSuggest = self::FindClosestString($this->m_sUnexpected, $this->m_aExpecting);
-			$sMessage = "$sIssue - found '{$this->m_sUnexpected}' at $iCol in '$sInput', expecting $sExpectations, I would suggest to use '$sSuggest'";
+			if (strlen($sSuggest) > 0) {
+				$sMessage .= ", I would suggest to use ".json_encode($sSuggest);
+			}
 		}
 		
 		// make sure everything is assigned properly
@@ -155,5 +161,3 @@ class OQLException extends CoreException
 		return $sRet;
 	}
 }
-
-?>

core/oql/oqlquery.class.inc.php

@@ -57,15 +57,15 @@ class OqlName
 	{
 		return $this->m_iPos;
 	}
-	
+
 	public function __toString()
 	{
 		return $this->m_sValue;
-	} 
+	}
 }
 
 /**
- * 
+ *
  * Store hexadecimal values as strings so that we can support 64-bit values
  *
  */
@@ -77,12 +77,12 @@ class OqlHexValue
 	{
 		$this->m_sValue = $sValue;
 	}
-	
+
 	public function __toString()
 	{
 		return $this->m_sValue;
 	}
-	
+
 }
 
 class OqlJoinSpec
@@ -109,6 +109,7 @@ class OqlJoinSpec
 	{
 		return $this->m_oClass->GetValue();
 	}
+
 	public function GetClassAlias()
 	{
 		return $this->m_oClassAlias->GetValue();
@@ -118,6 +119,7 @@ class OqlJoinSpec
 	{
 		return $this->m_oClass;
 	}
+
 	public function GetClassAliasDetails()
 	{
 		return $this->m_oClassAlias;
@@ -127,10 +129,12 @@ class OqlJoinSpec
 	{
 		return $this->m_oLeftField;
 	}
+
 	public function GetRightField()
 	{
 		return $this->m_oRightField;
 	}
+
 	public function GetOperator()
 	{
 		return $this->m_sOperator;
@@ -146,8 +150,9 @@ interface CheckableExpression
 	 * @param ModelReflection $oModelReflection MetaModel to consider
 	 * @param array $aAliases Aliases to class names (for the current query)
 	 * @param string $sSourceQuery For the reporting
+	 *
 	 * @throws OqlNormalizeException
-	 */	 	
+	 */
 	public function Check(ModelReflection $oModelReflection, $aAliases, $sSourceQuery);
 }
 
@@ -168,13 +173,11 @@ class MatchOqlExpression extends MatchExpression implements CheckableExpression
 		$this->m_oRightExpr->Check($oModelReflection, $aAliases, $sSourceQuery);
 
 		// Only field MATCHES scalar is allowed
-		if (!$this->m_oLeftExpr instanceof FieldExpression)
-		{
+		if (!$this->m_oLeftExpr instanceof FieldExpression) {
 			throw new OqlNormalizeException('Only "field MATCHES string" syntax is allowed', $sSourceQuery, new OqlName($this->m_oLeftExpr->RenderExpression(true), 0));
 		}
 		// Only field MATCHES scalar is allowed
-		if (!$this->m_oRightExpr instanceof ScalarExpression && !$this->m_oRightExpr instanceof VariableOqlExpression)
-		{
+		if (!$this->m_oRightExpr instanceof ScalarExpression && !$this->m_oRightExpr instanceof VariableOqlExpression) {
 			throw new OqlNormalizeException('Only "field MATCHES string" syntax is allowed', $sSourceQuery, new OqlName($this->m_oRightExpr->RenderExpression(true), 0));
 		}
 	}
@@ -198,7 +201,7 @@ class NestedQueryOqlExpression extends NestedQueryExpression implements Checkabl
 	 *
 	 * @param OQLObjectQuery $oOQLObjectQuery
 	 */
-	public function __construct($oOQLObjectQuery )
+	public function __construct($oOQLObjectQuery)
 	{
 		parent::__construct($oOQLObjectQuery->ToDBSearch(""));
 		$this->m_oOQLObjectQuery = $oOQLObjectQuery;
@@ -232,8 +235,7 @@ class FieldOqlExpression extends FieldExpression implements CheckableExpression
 
 	public function __construct($oName, $oParent = null)
 	{
-		if (is_null($oParent))
-		{
+		if (is_null($oParent)) {
 			$oParent = new OqlName('', 0);
 		}
 		$this->m_oParent = $oParent;
@@ -256,37 +258,28 @@ class FieldOqlExpression extends FieldExpression implements CheckableExpression
 	{
 		$sClassAlias = $this->GetParent();
 		$sFltCode = $this->GetName();
-		if (empty($sClassAlias))
-		{
+		if (empty($sClassAlias)) {
 			// Try to find an alias
 			// Build an array of field => array of aliases
 			$aFieldClasses = array();
-			foreach($aAliases as $sAlias => $sReal)
-			{
-				foreach($oModelReflection->GetFiltersList($sReal) as $sAnFltCode)
-				{
+			foreach ($aAliases as $sAlias => $sReal) {
+				foreach ($oModelReflection->GetFiltersList($sReal) as $sAnFltCode) {
 					$aFieldClasses[$sAnFltCode][] = $sAlias;
 				}
 			}
-			if (!array_key_exists($sFltCode, $aFieldClasses))
-			{
+			if (!array_key_exists($sFltCode, $aFieldClasses)) {
 				throw new OqlNormalizeException('Unknown filter code', $sSourceQuery, $this->GetNameDetails(), array_keys($aFieldClasses));
 			}
-			if (count($aFieldClasses[$sFltCode]) > 1)
-			{
+			if (count($aFieldClasses[$sFltCode]) > 1) {
 				throw new OqlNormalizeException('Ambiguous filter code', $sSourceQuery, $this->GetNameDetails());
 			}
 			$sClassAlias = $aFieldClasses[$sFltCode][0];
-		}
-		else
-		{
-			if (!array_key_exists($sClassAlias, $aAliases))
-			{
+		} else {
+			if (!array_key_exists($sClassAlias, $aAliases)) {
 				throw new OqlNormalizeException('Unknown class [alias]', $sSourceQuery, $this->GetParentDetails(), array_keys($aAliases));
 			}
 			$sClass = $aAliases[$sClassAlias];
-			if (!$oModelReflection->IsValidFilterCode($sClass, $sFltCode))
-			{
+			if (!$oModelReflection->IsValidFilterCode($sClass, $sFltCode)) {
 				throw new OqlNormalizeException('Unknown filter code', $sSourceQuery, $this->GetNameDetails(), $oModelReflection->GetFiltersList($sClass));
 			}
 		}
@@ -305,8 +298,7 @@ class ListOqlExpression extends ListExpression implements CheckableExpression
 {
 	public function Check(ModelReflection $oModelReflection, $aAliases, $sSourceQuery)
 	{
-		foreach ($this->GetItems() as $oItemExpression)
-		{
+		foreach ($this->GetItems() as $oItemExpression) {
 			$oItemExpression->Check($oModelReflection, $aAliases, $sSourceQuery);
 		}
 	}
@@ -316,8 +308,7 @@ class FunctionOqlExpression extends FunctionExpression implements CheckableExpre
 {
 	public function Check(ModelReflection $oModelReflection, $aAliases, $sSourceQuery)
 	{
-		foreach ($this->GetArgs() as $oArgExpression)
-		{
+		foreach ($this->GetArgs() as $oArgExpression) {
 			$oArgExpression->Check($oModelReflection, $aAliases, $sSourceQuery);
 		}
 	}
@@ -350,6 +341,7 @@ abstract class OqlQuery
 	 * Determine the class
 	 *
 	 * @param ModelReflection $oModelReflection MetaModel to consider
+	 *
 	 * @return string
 	 * @throws Exception
 	 */
@@ -392,6 +384,7 @@ class OqlObjectQuery extends OqlQuery
 	 * Determine the class
 	 *
 	 * @param ModelReflection $oModelReflection MetaModel to consider
+	 *
 	 * @return string
 	 * @throws Exception
 	 */
@@ -415,6 +408,7 @@ class OqlObjectQuery extends OqlQuery
 	{
 		return $this->m_oClass;
 	}
+
 	public function GetClassAliasDetails()
 	{
 		return $this->m_oClassAlias;
@@ -424,6 +418,7 @@ class OqlObjectQuery extends OqlQuery
 	{
 		return $this->m_aJoins;
 	}
+
 	public function GetCondition()
 	{
 		return $this->m_oCondition;
@@ -432,44 +427,37 @@ class OqlObjectQuery extends OqlQuery
 	/**
 	 * Recursively check the validity of the expression with regard to the data model
 	 * and the query in which it is used
-	 * 	 	 
-	 * @param ModelReflection $oModelReflection MetaModel to consider	 	
+	 *
+	 * @param ModelReflection $oModelReflection MetaModel to consider
+	 *
 	 * @throws OqlNormalizeException
-	 */	 	
+	 */
 	public function Check(ModelReflection $oModelReflection, $sSourceQuery, $aParentAliases = array())
 	{
 		$sClass = $this->GetClass($oModelReflection);
 		$sClassAlias = $this->GetClassAlias();
 
-		if (!$oModelReflection->IsValidClass($sClass))
-		{
+		if (!$oModelReflection->IsValidClass($sClass)) {
 			throw new UnknownClassOqlException($sSourceQuery, $this->GetClassDetails(), $oModelReflection->GetClasses());
 		}
 
-		$aAliases = array_merge(array($sClassAlias => $sClass),$aParentAliases);
+		$aAliases = array_merge(array($sClassAlias => $sClass), $aParentAliases);
 
 		$aJoinSpecs = $this->GetJoins();
-		if (is_array($aJoinSpecs))
-		{
-			foreach ($aJoinSpecs as $oJoinSpec)
-			{
+		if (is_array($aJoinSpecs)) {
+			foreach ($aJoinSpecs as $oJoinSpec) {
 				$sJoinClass = $oJoinSpec->GetClass();
 				$sJoinClassAlias = $oJoinSpec->GetClassAlias();
-				if (!$oModelReflection->IsValidClass($sJoinClass))
-				{
+				if (!$oModelReflection->IsValidClass($sJoinClass)) {
 					throw new UnknownClassOqlException($sSourceQuery, $oJoinSpec->GetClassDetails(), $oModelReflection->GetClasses());
 				}
-				if (array_key_exists($sJoinClassAlias, $aAliases))
-				{
-					if ($sJoinClassAlias != $sJoinClass)
-					{
+				if (array_key_exists($sJoinClassAlias, $aAliases)) {
+					if ($sJoinClassAlias != $sJoinClass) {
 						throw new OqlNormalizeException('Duplicate class alias', $sSourceQuery, $oJoinSpec->GetClassAliasDetails());
-					}
-					else
-					{
+					} else {
 						throw new OqlNormalizeException('Duplicate class name', $sSourceQuery, $oJoinSpec->GetClassDetails());
 					}
-				} 
+				}
 
 				// Assumption: ext key on the left only !!!
 				// normalization should take care of this
@@ -480,85 +468,74 @@ class OqlObjectQuery extends OqlQuery
 				$oRightField = $oJoinSpec->GetRightField();
 				$sToClass = $oRightField->GetParent();
 				$sPKeyDescriptor = $oRightField->GetName();
-				if ($sPKeyDescriptor != 'id')
-				{
+				if ($sPKeyDescriptor != 'id') {
 					throw new OqlNormalizeException('Wrong format for Join clause (right hand), expecting an id', $sSourceQuery, $oRightField->GetNameDetails(), array('id'));
 				}
 
 				$aAliases[$sJoinClassAlias] = $sJoinClass;
 
-				if (!array_key_exists($sFromClass, $aAliases))
-				{
+				if (!array_key_exists($sFromClass, $aAliases)) {
 					throw new OqlNormalizeException('Unknown class in join condition (left expression)', $sSourceQuery, $oLeftField->GetParentDetails(), array_keys($aAliases));
 				}
-				if (!array_key_exists($sToClass, $aAliases))
-				{
+				if (!array_key_exists($sToClass, $aAliases)) {
 					throw new OqlNormalizeException('Unknown class in join condition (right expression)', $sSourceQuery, $oRightField->GetParentDetails(), array_keys($aAliases));
 				}
 				$aExtKeys = $oModelReflection->ListAttributes($aAliases[$sFromClass], \Combodo\iTop\Core\AttributeDefinition\AttributeExternalKey::class);
 				$aObjKeys = $oModelReflection->ListAttributes($aAliases[$sFromClass], \Combodo\iTop\Core\AttributeDefinition\AttributeObjectKey::class);
 				$aAllKeys = array_merge($aExtKeys, $aObjKeys);
-				if (!array_key_exists($sExtKeyAttCode, $aAllKeys))
-				{
+				if (!array_key_exists($sExtKeyAttCode, $aAllKeys)) {
 					throw new OqlNormalizeException('Unknown key in join condition (left expression)', $sSourceQuery, $oLeftField->GetNameDetails(), array_keys($aAllKeys));
 				}
 
-				if ($sFromClass == $sJoinClassAlias)
-				{
+				if ($sFromClass == $sJoinClassAlias) {
 					if (array_key_exists($sExtKeyAttCode, $aExtKeys)) // Skip that check for object keys
 					{
 						$sTargetClass = $oModelReflection->GetAttributeProperty($aAliases[$sFromClass], $sExtKeyAttCode, 'targetclass');
-						if(!$oModelReflection->IsSameFamilyBranch($aAliases[$sToClass], $sTargetClass))
-						{
+						if (!$oModelReflection->IsSameFamilyBranch($aAliases[$sToClass], $sTargetClass)) {
 							throw new OqlNormalizeException("The joined class ($aAliases[$sFromClass]) is not compatible with the external key, which is pointing to $sTargetClass", $sSourceQuery, $oLeftField->GetNameDetails());
 						}
 					}
-				}
-				else
-				{
+				} else {
 					$sOperator = $oJoinSpec->GetOperator();
-					switch($sOperator)
-					{
+					switch ($sOperator) {
 						case '=':
-						$iOperatorCode = TREE_OPERATOR_EQUALS;
-						break;
+							$iOperatorCode = TREE_OPERATOR_EQUALS;
+							break;
 						case 'BELOW':
-						$iOperatorCode = TREE_OPERATOR_BELOW;
-						break;
+							$iOperatorCode = TREE_OPERATOR_BELOW;
+							break;
 						case 'BELOW_STRICT':
-						$iOperatorCode = TREE_OPERATOR_BELOW_STRICT;
-						break;
+							$iOperatorCode = TREE_OPERATOR_BELOW_STRICT;
+							break;
 						case 'NOT_BELOW':
-						$iOperatorCode = TREE_OPERATOR_NOT_BELOW;
-						break;
+							$iOperatorCode = TREE_OPERATOR_NOT_BELOW;
+							break;
 						case 'NOT_BELOW_STRICT':
-						$iOperatorCode = TREE_OPERATOR_NOT_BELOW_STRICT;
-						break;
+							$iOperatorCode = TREE_OPERATOR_NOT_BELOW_STRICT;
+							break;
 						case 'ABOVE':
-						$iOperatorCode = TREE_OPERATOR_ABOVE;
-						break;
+							$iOperatorCode = TREE_OPERATOR_ABOVE;
+							break;
 						case 'ABOVE_STRICT':
-						$iOperatorCode = TREE_OPERATOR_ABOVE_STRICT;
-						break;
+							$iOperatorCode = TREE_OPERATOR_ABOVE_STRICT;
+							break;
 						case 'NOT_ABOVE':
-						$iOperatorCode = TREE_OPERATOR_NOT_ABOVE;
-						break;
+							$iOperatorCode = TREE_OPERATOR_NOT_ABOVE;
+							break;
 						case 'NOT_ABOVE_STRICT':
-						$iOperatorCode = TREE_OPERATOR_NOT_ABOVE_STRICT;
-						break;
+							$iOperatorCode = TREE_OPERATOR_NOT_ABOVE_STRICT;
+							break;
 					}
 					if (array_key_exists($sExtKeyAttCode, $aExtKeys)) // Skip that check for object keys
 					{
 						$sTargetClass = $oModelReflection->GetAttributeProperty($aAliases[$sFromClass], $sExtKeyAttCode, 'targetclass');
-						if(!$oModelReflection->IsSameFamilyBranch($aAliases[$sToClass], $sTargetClass))
-						{
+						if (!$oModelReflection->IsSameFamilyBranch($aAliases[$sToClass], $sTargetClass)) {
 							throw new OqlNormalizeException("The joined class ($aAliases[$sToClass]) is not compatible with the external key, which is pointing to $sTargetClass", $sSourceQuery, $oLeftField->GetNameDetails());
 						}
 					}
 					$aAttList = $oModelReflection->ListAttributes($aAliases[$sFromClass]);
 					$sAttType = $aAttList[$sExtKeyAttCode];
-					if(($iOperatorCode != TREE_OPERATOR_EQUALS) && !is_subclass_of($sAttType, \Combodo\iTop\Core\AttributeDefinition\AttributeHierarchicalKey::class) && ($sAttType != \Combodo\iTop\Core\AttributeDefinition\AttributeHierarchicalKey::class))
-					{
+					if (($iOperatorCode != TREE_OPERATOR_EQUALS) && !is_a($sAttType, \Combodo\iTop\Core\AttributeDefinition\AttributeHierarchicalKey::class, true)) {
 						throw new OqlNormalizeException("The specified tree operator $sOperator is not applicable to the key", $sSourceQuery, $oLeftField->GetNameDetails());
 					}
 				}
@@ -567,26 +544,23 @@ class OqlObjectQuery extends OqlQuery
 
 		// Check the select information
 		//
-		foreach ($this->GetSelectedClasses() as $oClassDetails)
-		{
+		foreach ($this->GetSelectedClasses() as $oClassDetails) {
 			$sClassToSelect = $oClassDetails->GetValue();
-			if (!array_key_exists($sClassToSelect, $aAliases))
-			{
+			if (!array_key_exists($sClassToSelect, $aAliases)) {
 				throw new OqlNormalizeException('Unknown class [alias]', $sSourceQuery, $oClassDetails, array_keys($aAliases));
 			}
 		}
 
 		// Check the condition tree
 		//
-		if ($this->m_oCondition instanceof Expression)
-		{
+		if ($this->m_oCondition instanceof Expression) {
 			$this->m_oCondition->Check($oModelReflection, $aAliases, $sSourceQuery);
 		}
 	}
 
 	/**
 	 * Make the relevant DBSearch instance (FromOQL)
-	 */	 	
+	 */
 	public function ToDBSearch($sQuery)
 	{
 		$sClass = $this->GetClass(new ModelReflectionRuntime());
@@ -594,6 +568,7 @@ class OqlObjectQuery extends OqlQuery
 
 		$oSearch = new DBObjectSearch($sClass, $sClassAlias);
 		$oSearch->InitFromOqlQuery($this, $sQuery);
+
 		return $oSearch;
 	}
 }
@@ -606,19 +581,15 @@ class OqlUnionQuery extends OqlQuery
 	{
 		parent::__construct();
 		$this->aQueries[] = $oLeftQuery;
-		if ($oRightQueryOrUnion instanceof OqlUnionQuery)
-		{
-			foreach ($oRightQueryOrUnion->GetQueries() as $oSingleQuery)
-			{
+		if ($oRightQueryOrUnion instanceof OqlUnionQuery) {
+			foreach ($oRightQueryOrUnion->GetQueries() as $oSingleQuery) {
 				$this->aQueries[] = $oSingleQuery;
 			}
-		}
-		else
-		{
+		} else {
 			$this->aQueries[] = $oRightQueryOrUnion;
 		}
 	}
-	
+
 	public function GetQueries()
 	{
 		return $this->aQueries;
@@ -627,66 +598,54 @@ class OqlUnionQuery extends OqlQuery
 	/**
 	 * Check the validity of the expression with regard to the data model
 	 * and the query in which it is used
-	 * 	 	 
-	 * @param ModelReflection $oModelReflection MetaModel to consider	 	
+	 *
+	 * @param ModelReflection $oModelReflection MetaModel to consider
+	 *
 	 * @throws OqlNormalizeException
-	 */	 	
+	 */
 	public function Check(ModelReflection $oModelReflection, $sSourceQuery)
 	{
 		$aColumnToClasses = array();
-		foreach ($this->aQueries as $iQuery => $oQuery)
-		{
+		foreach ($this->aQueries as $iQuery => $oQuery) {
 			$oQuery->Check($oModelReflection, $sSourceQuery);
 
 			$aAliasToClass = array($oQuery->GetClassAlias() => $oQuery->GetClass($oModelReflection));
 			$aJoinSpecs = $oQuery->GetJoins();
-			if (is_array($aJoinSpecs))
-			{
-				foreach ($aJoinSpecs as $oJoinSpec)
-				{
+			if (is_array($aJoinSpecs)) {
+				foreach ($aJoinSpecs as $oJoinSpec) {
 					$aAliasToClass[$oJoinSpec->GetClassAlias()] = $oJoinSpec->GetClass();
 				}
 			}
 
 			$aSelectedClasses = $oQuery->GetSelectedClasses();
-			if ($iQuery != 0)
-			{
-				if (count($aSelectedClasses) < count($aColumnToClasses))
-				{
+			if ($iQuery != 0) {
+				if (count($aSelectedClasses) < count($aColumnToClasses)) {
 					$oLastClass = end($aSelectedClasses);
 					throw new OqlNormalizeException('Too few selected classes in the subquery', $sSourceQuery, $oLastClass);
 				}
-				if (count($aSelectedClasses) > count($aColumnToClasses))
-				{
+				if (count($aSelectedClasses) > count($aColumnToClasses)) {
 					$oLastClass = end($aSelectedClasses);
 					throw new OqlNormalizeException('Too many selected classes in the subquery', $sSourceQuery, $oLastClass);
 				}
 			}
-			foreach ($aSelectedClasses as $iColumn => $oClassDetails)
-			{
+			foreach ($aSelectedClasses as $iColumn => $oClassDetails) {
 				$sAlias = $oClassDetails->GetValue();
 				$sClass = $aAliasToClass[$sAlias];
 				$aColumnToClasses[$iColumn][] = array(
-					'alias' => $sAlias,
-					'class' => $sClass,
+					'alias'      => $sAlias,
+					'class'      => $sClass,
 					'class_name' => $oClassDetails,
 				);
 			}
 		}
-		foreach ($aColumnToClasses as $iColumn => $aClasses)
-		{
+		foreach ($aColumnToClasses as $iColumn => $aClasses) {
 			$sRootClass = null;
-			foreach ($aClasses as $iQuery => $aData)
-			{
-				if ($iQuery == 0)
-				{
+			foreach ($aClasses as $iQuery => $aData) {
+				if ($iQuery == 0) {
 					// Establish the reference
 					$sRootClass = $oModelReflection->GetRootClass($aData['class']);
-				}
-				else
-				{
-					if ($oModelReflection->GetRootClass($aData['class']) != $sRootClass)
-					{
+				} else {
+					if ($oModelReflection->GetRootClass($aData['class']) != $sRootClass) {
 						$aSubclasses = $oModelReflection->EnumChildClasses($sRootClass, ENUM_CHILD_CLASSES_ALL);
 						throw new OqlNormalizeException('Incompatible classes: could not find a common ancestor', $sSourceQuery, $aData['class_name'], $aSubclasses);
 					}
@@ -699,21 +658,21 @@ class OqlUnionQuery extends OqlQuery
 	 * Determine the class
 	 *
 	 * @param ModelReflection $oModelReflection MetaModel to consider
+	 *
 	 * @return string
 	 * @throws Exception
 	 */
 	public function GetClass(ModelReflection $oModelReflection)
 	{
 		$aFirstColClasses = array();
-		foreach ($this->aQueries as $iQuery => $oQuery)
-		{
+		foreach ($this->aQueries as $iQuery => $oQuery) {
 			$aFirstColClasses[] = $oQuery->GetClass($oModelReflection);
 		}
 		$sClass = self::GetLowestCommonAncestor($oModelReflection, $aFirstColClasses);
-		if (is_null($sClass))
-		{
+		if (is_null($sClass)) {
 			throw new Exception('Could not determine the class of the union query. This issue should have been detected earlier by calling OqlQuery::Check()');
 		}
+
 		return $sClass;
 	}
 
@@ -726,6 +685,7 @@ class OqlUnionQuery extends OqlQuery
 	public function GetClassAlias()
 	{
 		$sAlias = $this->aQueries[0]->GetClassAlias();
+
 		return $sAlias;
 	}
 
@@ -735,29 +695,25 @@ class OqlUnionQuery extends OqlQuery
 	 *
 	 * @param ModelReflection $oModelReflection MetaModel to consider
 	 * @param array $aClasses Flat list of classes
+	 *
 	 * @return string the lowest common ancestor amongst classes, null if none has been found
 	 * @throws Exception
 	 */
 	public static function GetLowestCommonAncestor(ModelReflection $oModelReflection, $aClasses)
 	{
 		$sAncestor = null;
-		foreach($aClasses as $sClass)
-		{
-			if (is_null($sAncestor))
-			{
+		foreach ($aClasses as $sClass) {
+			if (is_null($sAncestor)) {
 				// first loop
 				$sAncestor = $sClass;
-			}
-			elseif ($oModelReflection->GetRootClass($sClass) != $oModelReflection->GetRootClass($sAncestor))
-			{
+			} elseif ($oModelReflection->GetRootClass($sClass) != $oModelReflection->GetRootClass($sAncestor)) {
 				$sAncestor = null;
 				break;
-			}
-			else
-			{
+			} else {
 				$sAncestor = self::LowestCommonAncestor($oModelReflection, $sAncestor, $sClass);
 			}
 		}
+
 		return $sAncestor;
 	}
 
@@ -766,37 +722,32 @@ class OqlUnionQuery extends OqlQuery
 	 */
 	protected static function LowestCommonAncestor(ModelReflection $oModelReflection, $sClassA, $sClassB)
 	{
-		if ($sClassA == $sClassB)
-		{
+		if ($sClassA == $sClassB) {
 			$sRet = $sClassA;
-		}
-		elseif (in_array($sClassA, $oModelReflection->EnumChildClasses($sClassB)))
-		{
+		} elseif (in_array($sClassA, $oModelReflection->EnumChildClasses($sClassB))) {
 			$sRet = $sClassB;
-		}
-		elseif (in_array($sClassB, $oModelReflection->EnumChildClasses($sClassA)))
-		{
+		} elseif (in_array($sClassB, $oModelReflection->EnumChildClasses($sClassA))) {
 			$sRet = $sClassA;
-		}
-		else
-		{
+		} else {
 			// Recurse
 			$sRet = self::LowestCommonAncestor($oModelReflection, $sClassA, $oModelReflection->GetParentClass($sClassB));
 		}
+
 		return $sRet;
 	}
+
 	/**
 	 * Make the relevant DBSearch instance (FromOQL)
-	 */	 	
+	 */
 	public function ToDBSearch($sQuery)
 	{
 		$aSearches = array();
-		foreach ($this->aQueries as $oQuery)
-		{
+		foreach ($this->aQueries as $oQuery) {
 			$aSearches[] = $oQuery->ToDBSearch($sQuery);
 		}
 
 		$oSearch = new DBUnionSearch($aSearches);
+
 		return $oSearch;
 	}
 }

core/ormpassword.class.inc.php

@@ -98,9 +98,9 @@ class ormPassword
 		$bResult = false;
 		$aInfo = password_get_info($this->m_sHashed);
 		if (is_null($aInfo["algo"]) || $aInfo["algo"] === 0) {
-			//unknown, assume it's a legacy password
+			// - Unknown algorithm, assume it's a legacy password
 			$sHashedPwd = $this->ComputeHash($sClearTextPassword);
-			$bResult = ($this->m_sHashed == $sHashedPwd);
+			$bResult = hash_equals($this->m_sHashed, $sHashedPwd);
 		} else {
 			$bResult = password_verify($sClearTextPassword, $this->m_sHashed);
 		}

core/userrights.class.inc.php

@@ -415,12 +415,7 @@ abstract class User extends cmdbAbstractObject
 							$this->m_aCheckIssues[] = Dict::S('Class:User/Error:CurrentProfilesHaveInsufficientRights');
 						}
 						$oAddon->ResetCache();
-
-						if (is_null($aCurrentProfiles)) {
-							Session::IsSet('profile_list');
-						} else {
-							Session::Set('profile_list', $aCurrentProfiles);
-						}
+						Session::Set('profile_list', $aCurrentProfiles);
 					}
 					// Prevent an administrator to remove their own admin profile
 					if (UserRights::IsAdministrator($this)) {

css/backoffice/blocks-integrations/dashlet/_dashlet-within-dashboard.scss

@@ -20,4 +20,213 @@ $ibo-dashlet-within-dashboard--dashlet-header-static--margin-top--is-not-first-d
       }
     }
   }
-}
+}
+
+// TODO 3.3: This css is for dashboard editor demo purpose and needs to be updated
+
+ibo-dashboard[data-edit-mode="edit"]{
+  ibo-dashlet .ibo-dashlet{
+    pointer-events: none;
+  }
+}
+
+
+ibo-dashlet{
+  // do not apply to this dashlets
+  container-type: inline-size;
+  
+  &:not([data-dashlet-type="DashletBadge"]):not([data-dashlet-type="DashletHeaderStatic"]){
+    border: 1px solid #ccd4db;
+    border-radius: 5px;
+    background-color: white;
+    padding: 16px;
+    &::before {
+        position: absolute;
+        top: 0;
+        left: 0;
+        display: block;
+        background-color: $ibo-color-blue-800;
+        content: "";
+        width: 100%;
+        height: 8px;
+        padding-bottom: 8px;
+    }
+  }
+
+  // Make the dashlet body take all the available height to allow scrollbars when needed
+  .ibo-dashlet > .ibo-content-block{
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    row-gap: 10px;
+    .ibo-panel--header{
+      align-items: flex-start;
+    }
+    > .ibo-panel--body{
+      flex-grow: 1;
+      overflow: auto;
+    }
+  }
+}
+
+
+ibo-dashlet[data-dashlet-type="DashletBadge"] {
+  .ibo-dashlet-badge{
+    max-width: unset;
+  }
+  .ibo-dashlet-badge--body{
+    height: 100%;
+    display: flex;
+  }
+  
+  @container (width < 175px) {
+    .ibo-dashlet-badge--action-list-label, .ibo-dashlet-badge--action-create-label {
+      display: none;
+    }
+  }
+}
+
+ibo-dashboard[data-edit-mode="edit"] ibo-dashlet[data-dashlet-type="DashletHeaderStatic"]{
+  border: 1px solid #ccd4db;
+  background-color: $ibo-color-grey-100;
+  border-radius: 3px;
+  > .ibo-content-block{
+    display: flex;
+    align-items: center;
+    > .ibo-dashlet-header-static{
+      padding: 0;
+      width: 100%;
+    }
+  }
+}
+
+ibo-dashlet[data-dashlet-type="DashletHeaderDynamic"] {
+  > .ibo-content-block > .ibo-content-block{
+    .ibo-panel--body{
+      border: none;
+      padding: 0;
+      &:before{
+        display: none;
+      }
+      .ibo-panel-boy{
+        flex-grow: 1;
+        overflow-y: scroll;
+      }
+    }
+  }
+}
+
+ibo-dashlet[data-dashlet-type="DashletObjectList"] {
+  overflow-y: hidden!important;
+
+  > .ibo-dashlet > .ibo-content-block >  .ibo-content-block{
+    display: flex;
+    max-height: 100%;
+    flex-direction: column;
+
+    .dataTables_wrapper{
+      height: 100%;
+
+      .dataTables_scroll{
+        max-height: 100%;
+        height: 100%;
+        display: flex;
+        flex-direction: column;
+
+        .dataTables_scrollHead{
+          overflow: hidden;
+          position: relative;
+          border: 0px;
+          width: 100%;
+          flex-shrink: 0;
+        }
+
+        .dataTables_scrollBody{
+          max-height: unset!important;
+        }
+      }
+    }
+  }
+
+  .ibo-panel--body{
+    margin: 0 -16px;
+    border: none;
+    padding: 0;
+    padding-top: 16px;
+    &:before{
+      display: none;
+    }
+    .ibo-datatable{
+      margin-top: 10px;
+    }
+  }
+}
+
+ibo-dashlet[data-dashlet-type="DashletGroupByTable"] {
+  overflow-y: hidden!important;
+
+  > .ibo-dashlet > .ibo-content-block >  .ibo-content-block{
+    display: flex;
+    max-height: 100%;
+    flex-direction: column;
+
+    .dataTables_wrapper{
+      height: 100%;
+
+      .dataTables_scroll{
+        max-height: 100%;
+        height: 100%;
+        display: flex;
+        flex-direction: column;
+
+        .dataTables_scrollHead{
+          overflow: hidden;
+          position: relative;
+          border: 0;
+          width: 100%;
+          flex-shrink: 0;
+        }
+
+        .dataTables_scrollBody{
+          max-height: unset!important;
+        }
+      }
+    }
+
+    .ibo-panel--body{
+      margin: 0 -16px;
+      border: none;
+      padding: 0;
+      padding-top: 16px;
+      &:before{
+        display: none;
+      }
+      .ibo-datatable{
+        margin-top: 10px;
+      }
+    }
+
+  }
+}
+
+
+ibo-dashlet[data-dashlet-type="DashletGroupByPie"] {
+  .ibo-panel--body {
+    border: none;
+    padding: 0;
+    &:before {
+      display: none;
+    }
+  }
+}
+
+ibo-dashlet[data-dashlet-type="DashletGroupByBars"] {
+  .ibo-panel--body {
+    border: none;
+    padding: 0;
+    &:before {
+      display: none;
+    }
+  }
+}
+

css/backoffice/blocks-integrations/field/_field-with-field.scss

@@ -4,7 +4,7 @@
  */
 $ibo-field--spacing-top--with-same-block: $ibo-spacing-500 !default;
 
-.ibo-field + .ibo-field {
+.ibo-field + .ibo-field:not(:empty) {
   margin-top: $ibo-field--spacing-top--with-same-block;
 }
 

css/backoffice/components/_form.scss

@@ -6,4 +6,96 @@
 .ibo-prop-header {
   @extend %ibo-font-size-150;
   padding-bottom: 14px;
-}
+}
+
+.help-text{
+  padding: 1px 5px;
+  background-color: #d7e3f8;
+  border: 1px solid #c6e7f5;
+  border-radius: 5px;
+  margin: 5px 0;
+  font-size: 0.9em;
+}
+
+.form-error ul{
+  padding: 1px 5px;
+  background-color: #f8d7da;
+  border: 1px solid #f5c6cb;
+  border-radius: 5px;
+  margin: 5px 0;
+  font-size: 0.9em;
+}
+
+.subform{
+  background-color: #efefef;
+  border-radius: 5px;
+  padding: 10px;
+}
+
+.form-buttons{
+  margin: 20px 0;
+}
+
+.form select{
+  padding: 0;
+  overflow-y: auto;
+}
+
+.form select option{
+  height: 30px;
+  display: flex;
+  align-items: center;
+}
+
+.turbo-refreshing{
+  opacity: .5;
+}
+
+.ibo-field legend{
+  margin-top: 24px;
+}
+
+collection-entry-element {
+  margin-top: 8px;
+  display: block;
+  padding: 10px 10px;
+  background-color: #f5f5f5;
+  border-radius: 5px;
+}
+.ts-control{
+  height: auto;
+  min-height: 30px;
+}
+
+.ibo-form-actions > .ibo-button > span{
+  margin-right: 5px;
+}
+
+.ibo-form textarea{
+  resize: vertical;
+}
+
+.ibo-form-compact{
+
+  .ibo-field{
+    display: flex;
+    flex-direction: column;
+    gap: 4px;
+
+    .ibo-field--label{
+      min-width: 100px;
+      max-width: unset;
+      width: unset;
+    }
+
+    .ibo-input-type-checkbox{
+      align-self: flex-start;
+    }
+
+    .ibo-input-type-date{
+      display: block;
+    }
+}
+
+}
+

css/backoffice/components/dashlet/_dashlet.scss

@@ -19,7 +19,10 @@ $ibo-dashlet-blocker--height: 100% !default;
 .ibo-dashlet {
   position: relative;
   width: calc(#{$ibo-dashlet--width} - #{$ibo-dashlet--elements-spacing-x});
-  margin: calc(#{$ibo-dashlet--elements-spacing-y} / 2) calc(#{$ibo-dashlet--elements-spacing-x} / 2);
+  //margin: calc(#{$ibo-dashlet--elements-spacing-y} / 2) calc(#{$ibo-dashlet--elements-spacing-x} / 2);
+
+  height: 100% !important;
+  width: 100% !important;
 
   &.dashlet-selected {
     position: relative;
@@ -38,4 +41,21 @@ $ibo-dashlet-blocker--height: 100% !default;
   width: $ibo-dashlet-blocker--width;
   height: $ibo-dashlet-blocker--height;
   cursor: not-allowed;
+}
+
+.ibo-dashlet--actions {
+  position: absolute;
+  z-index: 1000;
+  top: 0px;
+  right: 0px;
+  display: none;
+  padding: 4px;
+  border-radius: 4px;
+
+  background-color: $ibo-color-white-100;
+  @extend %ibo-elevation-100;
+}
+
+ibo-dashlet[data-edit-mode="edit"] {
+  z-index: 3;
 }

css/backoffice/components/input/_input-select-icon.scss

@@ -54,3 +54,32 @@ $ibo-input-select-icon--menu--icon--margin-right: 10px !default;
 		}
 	}
 }
+
+.ts-control > .ibo-input-select-icon--menu--item{
+
+  display: flex;
+  column-gap: 5px;
+  align-items: center;
+  padding: 5px 0;
+
+  > img{
+    width: 20px;
+  }
+
+  &:hover{
+    background: transparent;
+  }
+
+}
+
+.ts-dropdown > .ts-dropdown-content > .ibo-input-select-icon--menu--item{
+
+  display: flex;
+  column-gap: 5px;
+  align-items: center;
+
+  > img{
+    width: 32px;
+  }
+
+}

css/backoffice/layout/_all.scss

@@ -15,3 +15,4 @@
 @import "wizard-container/wizard-container";
 @import "object/all";
 @import "activity-panel/all";
+@import "dashlet-panel/all";

css/backoffice/layout/dashboard/_dashboard.scss

@@ -175,3 +175,78 @@ input:checked + .ibo-dashboard--slider:before {
 input:checked + .ibo-dashboard--slider:after {
   content: $ibo-dashboard--slider--before--content;
 }
+
+// TODO 3.3 Cleanup variables
+// TODO 3.3 Move to vendor what's from gridstack
+
+
+.grid-stack {
+  display: block;
+}
+
+.ibo-dashboard[data-edit-mode="edit"] .grid-stack{
+  background-size: calc(100% / 12) var(--gs-cell-height);
+  background-color: $ibo-color-white-100;
+  background-image: linear-gradient(to right, $ibo-color-white-200 8px, transparent 8px), linear-gradient(to bottom, $ibo-color-white-200 8px, transparent 8px);
+  --gs-item-margin-top: 8px;
+  --gs-item-margin-bottom: 0;
+  --gs-item-margin-right: 0;
+  --gs-item-margin-left: 8px;
+}
+
+ibo-dashboard[data-edit-mode="view"] {
+  .ibo-dashboard--form {
+    display: none;
+  }
+}
+
+.ibo-dashboard--form {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+
+  height: 55px;
+  background-color: $ibo-color-blue-200;
+  margin: -16px -36px 24px -36px;
+  padding: 0 36px;
+}
+
+.ibo-dashboard--form--inputs {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  gap: 12px;
+
+  @extend %common-font-ral-med-250;
+
+  > [name="dashboard_title"] {
+    width: 300px;
+  }
+
+}
+
+.ibo-dashboard[data-edit-mode="edit"] ibo-dashlet:not([data-edit-mode="edit"]):hover .ibo-dashlet--actions {
+  display: block;
+}
+
+.ibo-dashboard[data-edit-mode="error"] .grid-stack{
+  background-image: url($approot-relative + '/images/alpha-fatal-error.gif');
+}
+
+// Our edit mode dashboard already has its own header, so we hide the standard one
+#ibo-page-header:has(+ ibo-dashboard[data-edit-mode="edit"]) {
+  display: none;
+}
+
+.ibo-dashboard[data-edit-mode="edit"] .ibo-dashboard--grid:has(ibo-dashboard-grid-slot > ibo-dashlet[data-edit-mode="edit"]) .ibo-dashboard--grid--backdrop {
+
+  position: absolute;
+  height: calc(100% + 24px);
+  // 36px is $ibo-page-container--elements-padding-x, handle variable resolution
+  width: calc(100% + 36px + 36px);
+  margin: -24px -#{36px} 0 -#{36px};
+  background-color: $ibo-color-grey-400;
+  z-index: 2;
+  opacity: 60%;
+}

css/backoffice/layout/dashlet-panel/_all.scss

@@ -0,0 +1,2 @@
+@import "dashlet-entry";
+@import "dashlet-panel";

css/backoffice/layout/dashlet-panel/_dashlet-entry.scss

@@ -0,0 +1,51 @@
+// TODO 3.3 Cleanup variables
+
+.ibo-dashlet-entry {
+  display: flex;
+  flex-direction: row;
+  gap: 10px;
+
+
+  border: 1px solid $ibo-color-grey-300;
+  border-radius: 5px;
+  padding: 12px;
+  background-color: $ibo-color-grey-100;
+
+  cursor: pointer;
+  text-align: left;
+
+  &:hover {
+    background-color: $ibo-color-grey-200;
+    border-color: $ibo-color-grey-400;
+  }
+  &:active {
+    background-color: $ibo-color-grey-50;
+    border-color: $ibo-color-grey-500;
+  }
+}
+
+.ibo-dashlet-entry--icon {
+  flex-shrink: 0;
+  height: 36px;
+  width: 36px;
+}
+
+.ibo-dashlet-entry--content {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  overflow-x: hidden;
+  gap: 4px;
+}
+
+.ibo-dashlet-entry--title {
+  font-size: 14px;
+  font-weight: 600;
+  color: $ibo-color-grey-900;
+}
+
+.ibo-dashlet-entry--description {
+  font-size: 12px;
+  color: $ibo-color-grey-700;
+
+}

css/backoffice/layout/dashlet-panel/_dashlet-panel.scss

@@ -0,0 +1,66 @@
+// TODO 3.3 Cleanup variables
+
+.ibo-dashlet-panel {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  width: 326px;
+  background-color: $ibo-color-white-100;
+}
+
+.ibo-dashlet-panel--title {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+
+  height: 55px;
+  background-color: $ibo-color-white-200;
+  padding: 0 16px;
+  flex-grow: 0;
+  @extend %common-font-ral-med-300;
+}
+
+.ibo-dashlet-panel--entries, .ibo-dashlet-panel--form-container {
+  flex-grow: 1;
+  display: flex;
+  flex-direction: column;
+  overflow: auto;
+
+  padding: 16px;
+  gap: 12px;
+  &.ibo-is-hidden {
+    display: none;
+  }
+}
+
+.ibo-center-container:has(ibo-dashboard[data-edit-mode="view"]) .ibo-dashlet-panel{
+  display: none;
+}
+
+.ibo-dashlet-panel--form-container turbo-frame {
+ height: 100%;
+}
+.ibo-dashlet-panel--form-container .ibo-form {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  > .form {
+    overflow: auto;
+    margin-bottom: 16px;
+  }
+}
+
+.ibo-dashlet-panel--form-container--buttons {
+  display: flex;
+  flex-direction: row !important;
+  justify-content: end;
+  align-items: center;
+
+  margin: 0 -16px -16px -16px;
+  padding: 0 16px;
+  min-height: 60px;
+
+  background-color: $ibo-color-grey-50;
+  border-top: solid 1px $ibo-color-grey-400;
+}

css/backoffice/layout/multi-column/_multi-column.scss

@@ -5,9 +5,11 @@
 
 $ibo-multi-column--margin-x: -$ibo-spacing-500 !default; /* This is to compensate columns padding and make the whole multicolumn align with the parent borders (cf. Bootstrap rows / cols) */
 $ibo-multi-column--margin-y: $ibo-spacing-0 !default;
+$ibo-multi-column--row-gap: $ibo-spacing-800 !default;
 
 .ibo-multi-column {
   display: flex;
   flex-wrap: wrap;
   margin: $ibo-multi-column--margin-y $ibo-multi-column--margin-x;
+  row-gap: $ibo-multi-column--row-gap;
 }

css/backoffice/vendors/_tomselect.scss

@@ -0,0 +1,3 @@
+@import "../../../node_modules/tom-select/dist/scss/tom-select.scss";
+
+$select-color-item-active-border: $ibo-input--focus--border-color;

css/setup.scss

@@ -311,29 +311,35 @@ fieldset {
 }
 
 .module-selection-body {
-  overflow: auto;
-  box-shadow: inset 0 2px 4px 0 rgba(0, 0, 0, .06) !important;
-  background-color: #F7FAFC;
-  padding: 10px;
-
-  .wiz-choice:checked ~ .description {
-    #itop-ticket-mgmt-simple-ticket-enhanced-portal:not(:checked),
-    #itop-ticket-mgmt-itil-enhanced-portal:not(:checked) {
-      ~ .description::after {
-        content: "Legacy portal is no longer part of iTop, by leaving this option unchecked your portal users won't be able to access iTop anymore.";
-        display: block;
-        margin-top: 0.5em;
-        font-weight: bold;
-        color: $legacy-portal-removal-text-color;
-      }
-    }
-  }
+	overflow: auto;
+	box-shadow: inset 0 2px 4px 0 rgba(0, 0, 0, .06) !important;
+	background-color: #F7FAFC;
+	padding: 10px;
+	.wiz-choice{
+		&:checked ~ .description {
+			#itop-ticket-mgmt-simple-ticket-enhanced-portal:not(:checked),
+			#itop-ticket-mgmt-itil-enhanced-portal:not(:checked) {
+				~ .description::after {
+					content: "Legacy portal is no longer part of iTop, by leaving this option unchecked your portal users won't be able to access iTop anymore.";
+					display: block;
+					margin-top: 0.5em;
+					font-weight: bold;
+					color: $legacy-portal-removal-text-color;
+				}
+			}
+		}
+		&:not(:checked) ~ label .setup-extension-tag.checked{
+			display:none;
+		}
+		&:checked ~ label .setup-extension-tag.unchecked{
+			display:none;
+		}
+	}
 }
 
 
 
 
-
 body {
   font-size: 1.17rem;
   font-family: "Raleway";
@@ -595,6 +601,35 @@ body {
   color: $ibo-color-blue-700;
   font-size: $ibo-font-size-200;
 }
+.setup-extension--missing .setup-extension--icon{
+	color:#a00000;
+}
+.setup-extension-tag {
+	background-color: grey;
+	border-radius: 8px;
+	padding-left: 3px;
+	padding-right: 3px;
+	margin-right: 3px;
+	&.installed{
+		background-color:#9eff9e
+	}
+	&.notinstalled{
+		background-color:#ed9eff
+	}
+	&.tobeinstalled{
+		background-color:#9ef0ff
+	}
+	&.tobeuninstalled{
+		background-color:#ff9e9e
+	}
+	&.notuninstallable{
+		background-color:#ffc98c
+	}
+	&.removed{
+		background-color: #969594
+	}
+}
+
 .setup--wizard-choice--label + .setup--wizard-choice--more-info {
   margin-left: 0.5rem;
 }

datamodels/2.x/authent-local/datamodel.authent-local.xml

@@ -2,7 +2,7 @@
 <itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <module_parameters>
     <parameters id="authent-local" _delta="define">
-      <password_validation.pattern>^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^\da-zA-Z]).{8,}$</password_validation.pattern>
+      <password_validation.pattern>^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^\da-zA-Z]).{12,}$</password_validation.pattern>
       <password_validation.message type="hash"/>
     </parameters>
   </module_parameters>

datamodels/2.x/authent-local/dictionaries/cs.dict.authent-local.php

@@ -29,7 +29,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', [
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => 'Heslo nemůže uživatel změnit.',
 	'Class:UserLocal/Attribute:password_renewed_date' => 'Heslo bylo obnoveno',
 	'Class:UserLocal/Attribute:password_renewed_date+' => 'Termín, kdy bylo heslo změneno',
-	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Heslo musí obsahovat minimálně 8 znaků a musí obsahovat minimálně jedno velké písmeno, jedno malé písmeno, jedno číslo a speciální znak.',
+	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Heslo musí obsahovat minimálně 12 znaků a musí obsahovat minimálně jedno velké písmeno, jedno malé písmeno, jedno číslo a speciální znak.',
 	'UserLocal:password:expiration' => 'Níže uvedená pole vyžadují rozšíření',
 	'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => 'Nastavení exspirace "Jednorázového hesla" nelze u vlastního účtu uživatele.',
 ]);

datamodels/2.x/authent-local/dictionaries/da.dict.authent-local.php

@@ -28,7 +28,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', [
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => 'Password cannot be changed by the user.~~',
 	'Class:UserLocal/Attribute:password_renewed_date' => 'Password renewed on~~',
 	'Class:UserLocal/Attribute:password_renewed_date+' => 'When the password was last changed~~',
-	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Password must be at least 8 characters and include uppercase, lowercase, numeric and special characters.~~',
+	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Password must be at least 12 characters and include uppercase, lowercase, numeric and special characters.~~',
 	'UserLocal:password:expiration' => 'The fields below require an extension~~',
 	'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => 'Setting password expiration to "One-time password" is not allowed for your own User~~',
 ]);

datamodels/2.x/authent-local/dictionaries/de.dict.authent-local.php

@@ -28,7 +28,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', [
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => '',
 	'Class:UserLocal/Attribute:password_renewed_date' => 'Letzte Passworterneuerung',
 	'Class:UserLocal/Attribute:password_renewed_date+' => 'Letztes Änderungsdatum',
-	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Das Passwort entspricht nicht dem in den Konfigurationsregeln hinterlegten RegEx-Ausdruck',
+	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Das Passwort muss mindestens 12 Zeichen lang sein und Großbuchstaben, Kleinbuchstaben, Zahlen und Sonderzeichen enthalten.',
 	'UserLocal:password:expiration' => 'Die folgenden Felder benötigen eine '.ITOP_APPLICATION_SHORT.' Erweiterung',
 	'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => 'Das setzen des Passwortablaufs auf "Einmalpasswort" ist für den eigenen Benutzer nicht erlaubt.',
 ]);

datamodels/2.x/authent-local/dictionaries/en.dict.authent-local.php

@@ -55,7 +55,7 @@ Dict::Add('EN US', 'English', 'English', [
 	'Class:UserLocal/Attribute:password_renewed_date' => 'Password renewed on',
 	'Class:UserLocal/Attribute:password_renewed_date+' => 'When the password was last changed',
 
-	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Password must be at least 8 characters and include uppercase, lowercase, numeric and special characters.',
+	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Password must be at least 12 characters and include uppercase, lowercase, numeric and special characters.',
 	'UserLocal:password:expiration' => 'The fields below require an extension',
 	'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => 'Setting password expiration to "One-time password" is not allowed for your own User',
 ]);

datamodels/2.x/authent-local/dictionaries/en_gb.dict.authent-local.php

@@ -55,7 +55,7 @@ Dict::Add('EN GB', 'British English', 'British English', [
 	'Class:UserLocal/Attribute:password_renewed_date' => 'Password renewed on',
 	'Class:UserLocal/Attribute:password_renewed_date+' => 'When the password was last changed',
 
-	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Password must be at least 8 characters and include uppercase, lowercase, numeric and special characters.',
+	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Password must be at least 12 characters and include uppercase, lowercase, numeric and special characters.',
 	'UserLocal:password:expiration' => 'The fields below require an extension',
 	'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => 'Setting password expiration to "One-time password" is not allowed for your own User',
 ]);

datamodels/2.x/authent-local/dictionaries/es_cr.dict.authent-local.php

@@ -25,7 +25,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => 'El usuario no puede cambiar la contraseña.',
 	'Class:UserLocal/Attribute:password_renewed_date' => 'Renovación de contraseña',
 	'Class:UserLocal/Attribute:password_renewed_date+' => 'Cuando fue el último cambio de contraseña',
-	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'La contraseña debe ser de al menos 8 caracteres e incluír mayúsculas, minúsculas, números y caracteres especiales.',
+	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'La contraseña debe ser de al menos 12 caracteres e incluir mayúsculas, minúsculas, números y caracteres especiales.',
 	'UserLocal:password:expiration' => 'El siguiente campo requiere una extensión',
 	'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => 'Configurar expiración de contraseña para "ontraseña de un solo uso" no está permitido para su propio Usuario',
 ]);

datamodels/2.x/authent-local/dictionaries/fr.dict.authent-local.php

@@ -27,7 +27,7 @@ Dict::Add('FR FR', 'French', 'Français', [
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => '',
 	'Class:UserLocal/Attribute:password_renewed_date' => 'Mot de passe changé le',
 	'Class:UserLocal/Attribute:password_renewed_date+' => 'Dernière date à laquelle le mot de passe a été changé',
-	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Le mot de passe doit contenir au moins 8 caractères, avec minuscule, majuscule, nombre et caractère spécial.',
+	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Le mot de passe doit contenir au moins 12 caractères, avec minuscule, majuscule, nombre et caractère spécial.',
 	'UserLocal:password:expiration' => 'Les champs ci-dessous nécessitent une extension',
 	'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => 'Impossible de mettre "Usage unique" comme validité du mot de passe pour son propre utilisateur.',
 ]);

datamodels/2.x/authent-local/dictionaries/hu.dict.authent-local.php

@@ -27,7 +27,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', [
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => 'A felhasználó nem változtathat jelszót.',
 	'Class:UserLocal/Attribute:password_renewed_date' => 'Jelszó megújítás ideje',
 	'Class:UserLocal/Attribute:password_renewed_date+' => 'A jelszó legutóbbi módosításának időpontja',
-	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'A jelszónak legalább 8 karakterből kell állnia, és tartalmaznia kell nagybetűket, kisbetűket, numerikus és speciális karaktereket.',
+	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'A jelszónak legalább 12 karakterből kell állnia, és tartalmaznia kell nagybetűket, kisbetűket, numerikus és speciális karaktereket.',
 	'UserLocal:password:expiration' => 'Az alábbi mezőkhöz egy bővítmény szükséges',
 	'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => 'A jelszó lejárati idejének beállítása "Egyszeri jelszóra" nem engedélyezett a saját Felhasználó számára.',
 ]);

datamodels/2.x/authent-local/dictionaries/it.dict.authent-local.php

@@ -27,7 +27,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', [
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => 'La password non può essere cambiata dall\'utente.',
 	'Class:UserLocal/Attribute:password_renewed_date' => 'Rinnovo della password',
 	'Class:UserLocal/Attribute:password_renewed_date+' => 'Quando è stata cambiata l\'ultima volta la password',
-	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'La password deve essere di almeno 8 caratteri e includere lettere maiuscole, minuscole, numeri e caratteri speciali.',
+	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'La password deve essere di almeno 12 caratteri e includere lettere maiuscole, minuscole, numeri e caratteri speciali.',
 	'UserLocal:password:expiration' => 'I campi sottostanti richiedono un\'estensione',
 	'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => 'Impostare la scadenza della password su "Password monouso" non è consentito per il proprio utente',
 ]);

datamodels/2.x/authent-local/dictionaries/ja.dict.authent-local.php

@@ -28,7 +28,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', [
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => 'Password cannot be changed by the user.~~',
 	'Class:UserLocal/Attribute:password_renewed_date' => 'Password renewed on~~',
 	'Class:UserLocal/Attribute:password_renewed_date+' => 'When the password was last changed~~',
-	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Password must be at least 8 characters and include uppercase, lowercase, numeric and special characters.~~',
+	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Password must be at least 12 characters and include uppercase, lowercase, numeric and special characters.~~',
 	'UserLocal:password:expiration' => 'The fields below require an extension~~',
 	'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => 'Setting password expiration to "One-time password" is not allowed for your own User~~',
 ]);

datamodels/2.x/authent-local/dictionaries/nl.dict.authent-local.php

@@ -28,7 +28,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => 'De gebruiker kan dit wachtwoord niet veranderen.',
 	'Class:UserLocal/Attribute:password_renewed_date' => 'Wachtwoord laatst aangepast',
 	'Class:UserLocal/Attribute:password_renewed_date+' => 'Tijdstip waarop het wachtwoord het laatst aangepast werd.',
-	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Het wachtwoord bestaat uit minstens 8 tekens en bestaat uit een mix van minstens 1 hoofdletter, kleine letter, cijfer en speciaal teken.',
+	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Het wachtwoord bestaat uit minstens 12 tekens en bestaat uit een mix van minstens 1 hoofdletter, kleine letter, cijfer en speciaal teken.',
 	'UserLocal:password:expiration' => 'De velden hieronder vereisen een extensie.',
 	'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => 'Je kan geen eenmalig wachtwoord instellen voor je eigen gebruiker.',
 ]);

datamodels/2.x/authent-local/dictionaries/pl.dict.authent-local.php

@@ -27,7 +27,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', [
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => 'Hasło nie może być zmienione przez użytkownika.',
 	'Class:UserLocal/Attribute:password_renewed_date' => 'Odnowienie hasła',
 	'Class:UserLocal/Attribute:password_renewed_date+' => 'Kiedy ostatnio zmieniano hasło',
-	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Hasło musi mieć co najmniej 8 znaków i zawierać duże, małe litery, cyfry i znaki specjalne.',
+	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Hasło musi mieć co najmniej 12 znaków i zawierać duże, małe litery, cyfry i znaki specjalne.',
 	'UserLocal:password:expiration' => 'Poniższe pola wymagają rozszerzenia',
 	'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => 'Ustawienie wygaśnięcia hasła "Hasło jednorazowe" nie jest dozwolone dla własnego użytkownika',
 ]);

datamodels/2.x/authent-local/dictionaries/ru.dict.authent-local.php

@@ -28,7 +28,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', [
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => 'Password cannot be changed by the user.~~',
 	'Class:UserLocal/Attribute:password_renewed_date' => 'Дата изменения пароля',
 	'Class:UserLocal/Attribute:password_renewed_date+' => 'Когда пароль был изменен в последний раз',
-	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Пароль должен содержать не менее 8 символов и включать прописные, строчные, числовые и специальные символы.',
+	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Пароль должен содержать не менее 12 символов и включать прописные, строчные, числовые и специальные символы.',
 	'UserLocal:password:expiration' => 'Поля требуют наличия доп. расширения',
 	'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => 'Setting password expiration to "One-time password" is not allowed for your own User~~',
 ]);

datamodels/2.x/authent-local/dictionaries/sk.dict.authent-local.php

@@ -27,7 +27,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', [
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => 'Password cannot be changed by the user.~~',
 	'Class:UserLocal/Attribute:password_renewed_date' => 'Password renewed on~~',
 	'Class:UserLocal/Attribute:password_renewed_date+' => 'When the password was last changed~~',
-	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Password must be at least 8 characters and include uppercase, lowercase, numeric and special characters.~~',
+	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Password must be at least 12 characters and include uppercase, lowercase, numeric and special characters.~~',
 	'UserLocal:password:expiration' => 'The fields below require an extension~~',
 	'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => 'Setting password expiration to "One-time password" is not allowed for your own User~~',
 ]);

datamodels/2.x/authent-local/dictionaries/tr.dict.authent-local.php

@@ -28,7 +28,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', [
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => 'Password cannot be changed by the user.~~',
 	'Class:UserLocal/Attribute:password_renewed_date' => 'Password renewed on~~',
 	'Class:UserLocal/Attribute:password_renewed_date+' => 'When the password was last changed~~',
-	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Password must be at least 8 characters and include uppercase, lowercase, numeric and special characters.~~',
+	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Password must be at least 12 characters and include uppercase, lowercase, numeric and special characters.~~',
 	'UserLocal:password:expiration' => 'The fields below require an extension~~',
 	'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => 'Setting password expiration to "One-time password" is not allowed for your own User~~',
 ]);

datamodels/2.x/authent-local/dictionaries/zh_cn.dict.authent-local.php

@@ -51,7 +51,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => '用户不允许修改密码.',
 	'Class:UserLocal/Attribute:password_renewed_date' => '密码更新',
 	'Class:UserLocal/Attribute:password_renewed_date+' => '上次修改密码的时间',
-	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => '密码必须至少8个字符, 包含大小写, 数字和特殊字符.',
+	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => '密码必须至少12个字符, 包含大小写, 数字和特殊字符.',
 	'UserLocal:password:expiration' => '下面的区域需要插件扩展',
 	'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => '不允许用户为自己设置 "一次性密码" 的失效期限',
 ]);

datamodels/2.x/combodo-db-tools/module.combodo-db-tools.php

@@ -30,7 +30,7 @@ SetupWebPage::AddModule(
 		// Identification
 		//
 		'label' => 'Database maintenance tools',
-		'category' => 'business',
+		'category' => 'Application management',
 
 		// Setup
 		//

datamodels/2.x/installation.xml

@@ -71,6 +71,19 @@
 						<module>itop-virtualization-mgmt</module>
 					</modules>
 					<default>true</default>
+          <sub_options>
+            <options type="array">
+              <choice>
+                <extension_code>itop-container-mgmt</extension_code>
+                <title>Containerization</title>
+                <description><![CDATA[Manage Container Images, Applications and Hosts]]></description>
+                <modules type="array">
+                  <module>itop-container-mgmt</module>
+                </modules>
+                <default>false</default>
+              </choice>
+            </options>
+          </sub_options>
 				</choice>
 			</options>
 		</step>

datamodels/2.x/itop-attachments/main.itop-attachments.php

@@ -5,10 +5,12 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
+use Combodo\iTop\Application\UI\Base\Component\FieldSet\FieldSetUIBlockFactory;
 use Combodo\iTop\Application\WebPage\WebPage;
 use Combodo\iTop\Service\Events\EventData;
 use Combodo\iTop\Service\Events\EventService;
 use Combodo\iTop\Service\Events\iEventServiceSetup;
+use Combodo\iTop\Application\UI\Base\Component\Html\Html;
 
 class AttachmentPlugIn implements iApplicationUIExtension, iEventServiceSetup
 {
@@ -236,10 +238,14 @@ class AttachmentPlugIn implements iApplicationUIExtension, iEventServiceSetup
 		}
 		$oAttachmentsRenderer = AttachmentsRendererFactory::GetInstance($oPage, $sObjClass, $iObjKey, $sTransactionId);
 
+		$iCount = $oAttachmentsRenderer->GetAttachmentsSet()->Count() + $oAttachmentsRenderer->GetTempAttachmentsSet()->Count();
+		$sTitle = ($iCount > 0) ? Dict::Format('Attachments:TabTitle_Count', $iCount) : Dict::S('Attachments:EmptyTabTitle');
 		if ($this->GetAttachmentsPosition() === 'relations') {
-			$iCount = $oAttachmentsRenderer->GetAttachmentsSet()->Count() + $oAttachmentsRenderer->GetTempAttachmentsSet()->Count();
-			$sTitle = ($iCount > 0) ? Dict::Format('Attachments:TabTitle_Count', $iCount) : Dict::S('Attachments:EmptyTabTitle');
 			$oPage->SetCurrentTab('Attachments:Tab', $sTitle);
+		} else {
+			$oBlock = FieldSetUIBlockFactory::MakeStandard($sTitle);
+			$oBlock->AddSubBlock(new Html(''));
+			$oPage->AddUiBlock($oBlock);
 		}
 
 		$bIsReadOnlyState = self::IsReadonlyState($oObject, $oObject->GetState(), AttachmentPlugIn::ENUM_GUI_BACKOFFICE);

datamodels/2.x/itop-attachments/src/Hook/EventListener.php

@@ -67,15 +67,17 @@ class EventListener implements iEventServiceSetup
 		/** @var \DBObject $oAttachment */
 		$oAttachment = $oEventData->Get('object');
 		$oHostObj = MetaModel::GetObject($oAttachment->Get('item_class'), $oAttachment->Get('item_id'), false /* false to avoid exception during trigger */, true);
-		/** @var \ormDocument $oDocument */
-		$oDocument = $oEventData->Get('document');
+		if ($oHostObj != null) {
+			/** @var \ormDocument $oDocument */
+			$oDocument = $oEventData->Get('document');
 
-		$this->OnAttachmentActivateTriggers(
-			$oHostObj,
-			$oAttachment,
-			$oDocument,
-			TriggerOnAttachmentDownload::class
-		);
+			$this->OnAttachmentActivateTriggers(
+				$oHostObj,
+				$oAttachment,
+				$oDocument,
+				TriggerOnAttachmentDownload::class
+			);
+		}
 	}
 
 	/**

datamodels/2.x/itop-config-mgmt/data/en_us.data.itop-brand.xml

@@ -1,42 +1,205 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Set>
-    <Brand alias="Brand" id="1">
-        <name>Acer</name>
-    </Brand>
-    <Brand alias="Brand" id="2">
-        <name>Apple</name>
-    </Brand>
-    <Brand alias="Brand" id="3">
-        <name>Asus</name>
-    </Brand>
-    <Brand alias="Brand" id="4">
-        <name>Cisco</name>
-    </Brand>
-    <Brand alias="Brand" id="5">
-        <name>Dell</name>
-    </Brand>
-    <Brand alias="Brand" id="6">
-        <name>HP Inc</name>
-    </Brand>
-    <Brand alias="Brand" id="7">
-        <name>HPE</name>
-    </Brand>
-    <Brand alias="Brand" id="8">
-        <name>IBM</name>
-    </Brand>
-    <Brand alias="Brand" id="9">
-        <name>Lenovo</name>
-    </Brand>
-    <Brand alias="Brand" id="10">
-        <name>Razer</name>
-    </Brand>
-    <Brand alias="Brand" id="11">
-        <name>Samsung</name>
-    </Brand>
-    <Brand alias="Brand" id="12">
-        <name>Sony</name>
-    </Brand>
-    <Brand alias="Brand" id="13">
-        <name>Toshiba</name>
-    </Brand>
+<Brand alias="Brand" id="1">
+  <name>Acer</name>
+  <logo><mimetype>image/svg+xml</mimetype><filename>icon-acer.svg</filename><data>PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+Cjxzdmc6c3ZnIHhtbG5zOmlua3NjYXBlPSJodHRwOi8vd3d3Lmlua3NjYXBlLm9yZy9uYW1lc3BhY2VzL2lua3NjYXBlIiB4bWxuczpzb2RpcG9kaT0iaHR0cDovL3NvZGlwb2RpLnNvdXJjZWZvcmdlLm5ldC9EVEQvc29kaXBvZGktMC5kdGQiIHhtbG5zOnN2Zz0iaH
+    R0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZlcnNpb249IjEuMSIgaWQ9ImFjZXIiIHg9IjBweCIgeT0iMHB4IiB3aWR0aD0iODMiIGhlaWdodD0iODMiIHZpZXdCb3g9IjAgMCA4MyA4MyIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSIgc29kaXBvZGk6ZG9jbmFtZT0iaWNvbi1hY2VyLnN2ZyIgaW5rc2NhcGU6dmVyc2lvbj0iMS40LjMgKDBkMTVmNzUwNDIsIDIwMjUtMTItMjUpIj48c3ZnOmRlZnMgaWQ9ImRlZnMxIi8+PHNvZGlwb2RpOm5hbWVkdmlldyBpZD0ibmFtZWR2
+    aWV3MSIgcGFnZWNvbG9yPSIjZmZmZmZmIiBib3JkZXJjb2xvcj0iIzAwMDAwMCIgYm9yZGVyb3BhY2l0eT0iMC4yNSIgaW5rc2NhcGU6c2hvd3BhZ2VzaGFkb3c9IjIiIGlua3NjYXBlOnBhZ2VvcGFjaXR5PSIwLjAiIGlua3NjYXBlOnBhZ2VjaGVja2VyYm9hcmQ9IjAiIGlua3NjYXBlOmRlc2tjb2xvcj0iI2QxZDFkMSIgc2hvd2d1aWRlcz0idHJ1ZSIgaW5rc2NhcGU6em9vbT0iMTAuNDgzMDcxIiBpbmtzY2FwZTpjeD0iNzUuNzg4ODYiIGlua3NjYXBlOmN5PSIzNS
+    42NzY1NjgiIGlua3NjYXBlOndpbmRvdy13aWR0aD0iMjU2MCIgaW5rc2NhcGU6d2luZG93LWhlaWdodD0iMTM2MCIgaW5rc2NhcGU6d2luZG93LXg9IjAiIGlua3NjYXBlOndpbmRvdy15PSIwIiBpbmtzY2FwZTp3aW5kb3ctbWF4aW1pemVkPSIxIiBpbmtzY2FwZTpjdXJyZW50LWxheWVyPSJhY2VyIj48c29kaXBvZGk6Z3VpZGUgcG9zaXRpb249IjQwLjMwNzkxOSw0MS4yMjAyMTQiIG9yaWVudGF0aW9uPSIwLC0xIiBpZD0iZ3VpZGUxIiBpbmtzY2FwZTpsb2NrZWQ9
+    ImZhbHNlIi8+PC9zb2RpcG9kaTpuYW1lZHZpZXc+Cjxzdmc6cGF0aCBpZD0iYWNlci1sb2dvIiBzdHlsZT0iZmlsbDojODBjMzQzIiBkPSJtIDgyLjg1LDMyLjc2MDg5MyBjIC0wLjI5LC0wLjQyIC0wLjYyLC0wLjcgLTIuMDQsLTAuODEgLTAuMzcsLTAuMDMgLTEuNiwtMC4wNyAtMy42NiwtMC4wNyAtNS40MiwwIC05LjEsMS42NSAtMTAuOTgsNC45MSAwLjUyLC0zLjI4IC0yLjY3LC00LjkyIC05LjU1LC00LjkyIC04LjA5LDAgLTEzLjE0LDMuMjcgLTE1LjE1LDkuOD
+    EgLTAuNzQsMS45MSAtMC44Miw0LjAyIC0wLjIzLDUuOTggbCAtMS45MSwwLjEzIGMgLTEuNDksMC4xMSAtMy40NiwwLjIyIC00LjY2LDAuMjIgLTIuOTYsMCAtNC44LC0wLjUgLTUuNTEsLTEuNSAtMC42NCwtMC45IC0wLjU3LC0yLjU2IDAuMTcsLTQuOTggMS4yMywtNC4wMiA0LjI5LC01LjgyIDkuMTgsLTUuODIgMi41MywwIDUsMC4yNyA1LDAuMjcgMC4zLC0wLjA1IDAuNTEsLTAuMzMgMC40NiwtMC42NCAwLC0wLjAxIDAsLTAuMDIgLTAuMDEsLTAuMDMgbCAtMC4w
+    NSwtMC4zOCAtMC4xNywtMS4zNSBjIC0wLjExLC0wLjg5IC0wLjc3LC0xLjQxIC0xLjk3LC0xLjU3IC0xLjEsLTAuMDcgLTEuOTEsLTAuMTMgLTMuMTIsLTAuMTMgaCAtMC4wNyBjIC02LjM5LDAuMDEgLTEwLjg0LDIuMTIgLTEzLjM2LDYuMzIgMC45MiwtNC4yMSAtMi4wNCwtNi4zMiAtOC44NywtNi4zMiAtMi43MywtMC4wNSAtNS40NiwwLjA2IC04LjE4LDAuMzMgLTEuMDMsLTAuMDMgLTEuOTYsMC42MSAtMi4zMywxLjU3IGwgLTAuNTQsMS43MyBjIC0wLjEsMC4zMi
+    AwLjA1LDAuNDggMC40NiwwLjQ4IGggMC4wMSBjIDAuMywtMC4wNCAxLjQ2LC0wLjE1IDMuNDQsLTAuMzEgMi42MiwtMC4yMSA0LjU1LC0wLjMyIDUuODMsLTAuMzIgMy43NywwIDUuMzUsMC45NSA0Ljc2LDIuODQgLTAuMTEsMC40IC0wLjQ0LDAuNzEgLTAuODUsMC43OCAtMy41NiwwLjU5IC02LjM5LDEuMDIgLTguNDgsMS4yOCAtNS44OSwwLjc1IC05LjI5LDIuNTkgLTEwLjIsNS41MiAtMS4yNSw0LjAzIDEuODksNi4wNCA5LjQ0LDYuMDQgMy4xNywwLjA0IDYuMzQs
+    LTAuMTggOS40OCwtMC42NSAxLjQ3LC0wLjI1IDIuMjIsLTAuNjMgMi41MSwtMS41OCBsIDEuNDEsLTQuNDkgYyAtMC4xNSw0LjQ5IDIuOTksNi43NSA5LjQxLDYuNzUgMi4yMywwLjA0IDQuNDUsLTAuMDYgNi42NiwtMC4zMSAxLjMyLC0wLjIzIDEuOTUsLTAuNTIgMi4yNCwtMS41MSBsIDAuMjgsLTEuNDEgYyAxLjM3LDIuMTQgNC4zNywzLjIxIDkuMDEsMy4yMSA0Ljg5LDAgNy43NCwtMC4xNCA4LjU1LC0wLjQxIDAuNTcsLTAuMTIgMS4wNCwtMC41MiAxLjI1LC0xLj
+    A2IDAuMDMsLTAuMDkgMC4wNSwtMC4xOSAwLjA2LC0wLjI4IGwgMC41OSwtMS45MSBjIDAuMSwtMC4zMyAtMC4wNSwtMC40OSAtMC40NSwtMC40OCBsIC0zLjEzLDAuMTUgYyAtMi4wOSwwLjEyIC0zLjcyLDAuMTggLTQuOSwwLjE3IC0xLjU0LDAuMDggLTMuMDgsLTAuMDcgLTQuNTgsLTAuNDYgLTEuMiwtMC40MSAtMS45NCwtMS42MSAtMS43NywtMi44NiBsIDkuOTEsLTEuMjcgYyA0LjQ0LC0wLjU3IDcuNDIsLTEuOTQgOC45MiwtNC4xMiBsIC0zLjM3LDExLjczIGMg
+    LTAuMDcsMC4xOCAtMC4wNCwwLjM4IDAuMDcsMC41MyAwLjE4LDAuMTcgMC40MSwwLjI1IDAuNjUsMC4yMiBoIDQuMSBjIDAuNDcsMC4wNyAwLjkzLC0wLjIyIDEuMDYsLTAuNjggbCAzLjYyLC0xMi42NyBjIDAuNDgsLTEuNjcgMiwtMi40OCA0LjY3LC0yLjQ4IDIuNDEsMCA0LjIyLDAuMDIgNS4zOCwwLjA3IDAuMDMsMCAwLjA2LDAgMC4wOSwwIDAuMzksMCAwLjc0LC0wLjI2IDAuODQsLTAuNjMgbCAwLjYzLC0xLjc0IGMgMC4xNSwtMC4zIDAuMTIsLTAuNjMgLTAuMD
+    UsLTAuODkgbSAtNjYuMTIsMTUuMjQgYyAtMS44MywwLjIzIC0zLjY4LDAuMzMgLTUuNTIsMC4zIC00LjE3LDAgLTUuOTksLTAuODQgLTUuNDYsLTIuNTMgMC4zOCwtMS4yMSAxLjQ3LC0xLjk0IDMuMjgsLTIuMTkgbCA5LjQ4LC0xLjI4IHogbSA0My44MywtMTAuMjcgYyAtMC40LDEuMyAtMi4yNSwyLjE5IC01LjU2LDIuNjcgbCAtNy45LDEuMTMgMC4yLC0wLjY1IGMgMC4zOSwtMS43NCAxLjM3LC0zLjI4IDIuNzksLTQuMzcgMS4yLC0wLjc3IDMuMTUsLTEuMTYgNS44NiwtMS4xNiAzLjU2LDAgNS4xLDAuOCA0LjYxLDIuMzgiLz4KPC9zdmc6c3ZnPgo=</data><downloads_count>0</downloads_count></logo>
+  <finalclass>Brand</finalclass>
+  <friendlyname>Acer</friendlyname>
+</Brand>
+<Brand alias="Brand" id="2">
+  <name>Apple</name>
+  <logo><mimetype>image/svg+xml</mimetype><filename>icons8-mac-os.svg</filename><data>PD94bWwgdmVyc2lvbj0iMS4wIj8+CjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2aWV3Qm94PSIwIDAgNDggNDgiIHdpZHRoPSI0OHB4IiBoZWlnaHQ9IjQ4cHgiPjxwYXRoIGZpbGw9IiMwODgzZDkiIGQ9Ik0zNi4yMzIsMjMuOTg1YzAtNS44NjUsNC43NjYtOC41MSw0Ljk2Ni04LjYzNmMtMi41OTYtMy45OTMtNi43OS00LjQ2Ny
+    04LjM2Mi00LjQ2OCBjLTMuNjQzLDAtNi44NjMsMi4wMjItOC41ODUsMi4wMjJjLTEuNzk3LDAtNC40MTgtMi4xMjEtNy4zNjMtMi4wMjJjLTMuODQzLDAuMDc1LTcuMzYzLDIuMzQ2LTkuMzM0LDUuNjkxIGMtMS4zOTcsMi4zOTYtMS45NDcsNS4yMTctMS44OTYsOC4wODdjMC4wMDIsMC4xMTMsMC4wMTcsMC4yMjgsMC4wMiwwLjM0MUgzNi4zMkMzNi4yNzksMjQuNjcxLDM2LjI0MywyNC4zMzcsMzYuMjMyLDIzLjk4NXoiLz48cGF0aCBmaWxsPSIjMDg4M2Q5IiBkPSJN
+    MzAuNTY1LDcuMDYzQzMyLjI2MSw1LjE5MSwzMy4yMSwyLjYyMSwzMy4wNiwwYy0yLjM0NiwwLTUuMDY2LDEuMzcyLTYuNzg4LDMuMzk0IGMtMS4zNDgsMS42NzItMi43OTUsNC4yOTMtMi4yNzEsNi45MTNDMjYuNDIyLDEwLjYwNywyOS4wNDMsOS4wODUsMzAuNTY1LDcuMDYzeiIvPjxwYXRoIGZpbGw9IiMwMzcwYzgiIGQ9Ik0xNy41MTEsNDVjMi43NzEsMCwzLjc5NC0xLjg0OCw3LjQxMy0xLjg0OGMzLjM3LDAsNC40MTgsMS44NDgsNy4zMzgsMS44NDggYzMuMDcsMCw1LjA5Mi0yLjc5NSw2LjkxMy01LjU2N2MyLjI5NS0zLjIxOCwzLjA3LTYuMjg4LDMuMTY5LTYuNDE0Yy0wLjA5NCwwLTUuMjg3LTIuMTEyLTYuMDI2LTguMDE5SDUuNjc4IGMwLjE1Nyw1LjMxMSwyLjIyOCwxMC43OSw0LjY3MSwxNC4zMDlDMTIuMjcsNDIuMDU1LDE0LjQ0MSw0NSwxNy41MTEsNDV6Ii8+PC9zdmc+Cg==</data><downloads_count>0</downloads_count></logo>
+  <finalclass>Brand</finalclass>
+  <friendlyname>Apple</friendlyname>
+</Brand>
+<Brand alias="Brand" id="3">
+  <name>Asus</name>
+  <logo><mimetype>image/svg+xml</mimetype><filename>icons8-asus.svg</filename><data>PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcgeG1sbnM6aW5rc2NhcGU9Imh0dHA6Ly93d3cuaW5rc2NhcGUub3JnL25hbWVzcGFjZXMvaW5rc2NhcGUiIHhtbG5zOnNvZGlwb2RpPSJodHRwOi8vc29kaXBvZGkuc291cmNlZm9yZ2UubmV0L0RURC9zb2RpcG9kaS0wLmR0ZCIgeG1sbnM9Imh0dHA6Ly93
+    d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczpzdmc9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2aWV3Qm94PSIwLDAsMjU2LDI1NiIgd2lkdGg9IjY0cHgiIGhlaWdodD0iNjRweCIgZmlsbC1ydWxlPSJub256ZXJvIiB2ZXJzaW9uPSIxLjEiIGlkPSJzdmcxMyIgc29kaXBvZGk6ZG9jbmFtZT0iaWNvbnM4LWFzdXMgKDEpLnN2ZyIgaW5rc2NhcGU6dmVyc2lvbj0iMS40LjMgKDBkMTVmNzUwNDIsIDIwMjUtMTItMjUpIj48c29kaXBvZGk6bmFtZWR2aWV3IGlkPS
+    JuYW1lZHZpZXcxMyIgcGFnZWNvbG9yPSIjZmZmZmZmIiBib3JkZXJjb2xvcj0iIzAwMDAwMCIgYm9yZGVyb3BhY2l0eT0iMC4yNSIgaW5rc2NhcGU6c2hvd3BhZ2VzaGFkb3c9IjIiIGlua3NjYXBlOnBhZ2VvcGFjaXR5PSIwLjAiIGlua3NjYXBlOnBhZ2VjaGVja2VyYm9hcmQ9IjAiIGlua3NjYXBlOmRlc2tjb2xvcj0iI2QxZDFkMSIgaW5rc2NhcGU6em9vbT0iMTcuMTg3NSIgaW5rc2NhcGU6Y3g9IjMxLjk3MDkwOSIgaW5rc2NhcGU6Y3k9IjMyIiBpbmtzY2FwZTp3
+    aW5kb3ctd2lkdGg9IjI1NjAiIGlua3NjYXBlOndpbmRvdy1oZWlnaHQ9IjEzNjAiIGlua3NjYXBlOndpbmRvdy14PSIwIiBpbmtzY2FwZTp3aW5kb3cteT0iMCIgaW5rc2NhcGU6d2luZG93LW1heGltaXplZD0iMSIgaW5rc2NhcGU6Y3VycmVudC1sYXllcj0iZzEzIi8+PGRlZnMgaWQ9ImRlZnMxMCI+PHJhZGlhbEdyYWRpZW50IGN4PSIzNC42MjUiIGN5PSIzMS44NzUiIHI9IjIzLjIwNiIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIGlkPSJjb2xvci0xIj
+    48c3RvcCBvZmZzZXQ9IjAiIHN0b3AtY29sb3I9IiNmNGU5YzMiIGlkPSJzdG9wMSIvPjxzdG9wIG9mZnNldD0iMC4yMTkiIHN0b3AtY29sb3I9IiNmOGVlY2QiIGlkPSJzdG9wMiIvPjxzdG9wIG9mZnNldD0iMC42NDQiIHN0b3AtY29sb3I9IiNmZGY0ZGMiIGlkPSJzdG9wMyIvPjxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iI2ZmZjZlMSIgaWQ9InN0b3A0Ii8+PC9yYWRpYWxHcmFkaWVudD48bGluZWFyR3JhZGllbnQgeDE9IjAuMzY1IiB5MT0iMzIuNSIgeDI9
+    IjY0IiB5Mj0iMzIuNSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIGlkPSJjb2xvci0yIj48c3RvcCBvZmZzZXQ9IjAuMDUzIiBzdG9wLWNvbG9yPSIjMDAwMDAwIiBpZD0ic3RvcDUiLz48c3RvcCBvZmZzZXQ9IjEiIHN0b3AtY29sb3I9IiMwMDAwMDAiIGlkPSJzdG9wNiIvPjwvbGluZWFyR3JhZGllbnQ+PHJhZGlhbEdyYWRpZW50IGN4PSIzNC42MjUiIGN5PSIzMS44NzUiIHI9IjIzLjIwNiIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIGlkPS
+    Jjb2xvci0zIj48c3RvcCBvZmZzZXQ9IjAiIHN0b3AtY29sb3I9IiNmNGU5YzMiIGlkPSJzdG9wNyIvPjxzdG9wIG9mZnNldD0iMC4yMTkiIHN0b3AtY29sb3I9IiNmOGVlY2QiIGlkPSJzdG9wOCIvPjxzdG9wIG9mZnNldD0iMC42NDQiIHN0b3AtY29sb3I9IiNmZGY0ZGMiIGlkPSJzdG9wOSIvPjxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iI2ZmZjZlMSIgaWQ9InN0b3AxMCIvPjwvcmFkaWFsR3JhZGllbnQ+PC9kZWZzPjxnIGZpbGw9Im5vbmUiIGZpbGwtcnVs
+    ZT0ibm9uemVybyIgc3Ryb2tlPSJub25lIiBzdHJva2Utd2lkdGg9IjEiIHN0cm9rZS1saW5lY2FwPSJidXR0IiBzdHJva2UtbGluZWpvaW49Im1pdGVyIiBzdHJva2UtbWl0ZXJsaW1pdD0iMTAiIHN0cm9rZS1kYXNoYXJyYXk9IiIgc3Ryb2tlLWRhc2hvZmZzZXQ9IjAiIGZvbnQtZmFtaWx5PSJub25lIiBmb250LXdlaWdodD0ibm9uZSIgZm9udC1zaXplPSJub25lIiB0ZXh0LWFuY2hvcj0ibm9uZSIgc3R5bGU9Im1peC1ibGVuZC1tb2RlOiBub3JtYWwiIGlkPSJnMT
+    MiPjxnIHRyYW5zZm9ybT0ic2NhbGUoNCw0KSIgaWQ9ImcxMiI+PHBhdGggZD0iTTYuMTU2LDI5LjI0M2wtNS43MjMsOS45MTljLTAuMTkyLDAuMzMzIDAuMDQ4LDAuNzUgMC40MzMsMC43NWgyLjc2NGMwLjM1NiwwIDAuNjg2LC0wLjE5IDAuODY1LC0wLjQ5OGw1LjYyOSwtOS43MDF6TTYuMjk5LDI5LjAwNWMwLDAgMC44MTUsLTEuNDg2IDEuNjI1LC0yLjkyYzAuMzU0LC0wLjYyOCAxLjAxOSwtMS4wMTQgMS43NCwtMS4wMTRjMS40MDgsMC4wMDEgMy43NTcsMC4wMDMg
+    NS4wODYsMC4wMDRjMC41NTIsMCAwLjk5NSwwLjQ0OCAwLjk5NSwxLjAwMXYyLjYxYzAsMCAwLjMyMywtMS4zODYgMC44OTEsLTIuMDQzYzAuNTM0LC0wLjYxOSAxLjI0NiwtMS40NzggMi44NzIsLTEuNTkyaDEwLjk2M2MwLjU1MiwwIDEsMC40NDggMSwxdjEuOTU1YzAsMC41NTIgLTAuNDQ4LDEgLTEsMXpNNjQsMjguMDA4di0xLjk1OGMwLC0wLjU1MiAtMC40NDgsLTEgLTEsLTFoLTExLjhjLTEuNjIyLDAuMTE0IC0yLjMzNywwLjk3MiAtMi44NzIsMS41OTJjLTAuNT
+    Y5LDAuNjU3IC0wLjg5LDIuMDQzIC0wLjg5LDIuMDQzdjAuMzE4bDE1LjU2MiwwLjAwNWMwLjU1MiwwIDEsLTAuNDQ4IDEsLTF6TTMzLjA5NSwyNS4wN2gxLjU3OGMwLjU1MiwwIDEsMC40NDggMSwxdjIuOTM1aC0zLjU3OHYtMi45MzVjMCwtMC41NTIgMC40NDgsLTEgMSwtMXpNNDQuODM5LDI1LjA3aDEuNTc0YzAuNTUyLDAgMSwwLjQ0OCAxLDF2Mi45MzVoLTMuNTc0di0yLjkzNWMwLC0wLjU1MiAwLjQ0NywtMSAxLC0xek00Ny40MTMsMzAuNDI1bC0zLjUxNCwtMC4y
+    MzN2NC41NjZjMCwwIC0wLjAxLDEuMzE0IC0xLjE1OCwxLjMxNGMtMS4xMzgsMCAtNi4wMzksMCAtNi4wMzksMGMwLDAgLTEuMDIzLC0wLjA5MyAtMS4wMjMsLTEuMzAzYzAsLTEuMjA3IDAsLTUuMTk2IDAsLTUuMTk2bC0zLjU0OSwtMC4yODV2Ny4wMDFjMC41NzQsMy4zNTkgMy4zMTEsMy42MTcgMy4zMTEsMy42MTdjMCwwIDAuMjc4LDAuMDIyIDAuMzI0LDAuMDI2aDguMTU2YzAsMCAzLjQ5MSwtMC4zMTEgMy40OTEsLTQuMDIzYzAuMDAxLC0zLjcxMyAwLjAwMSwtNS
+    40ODQgMC4wMDEsLTUuNDg0ek0xMy4xMTEsMzkuOTE0aDE1LjczYzIuOTE0LC0wLjY0NyAzLjIxOCwtMy41NzcgMy4yMTgsLTMuNTc3YzAuMTM2LC0wLjg3MSAwLjA1NywtMS41NzQgMC4wNTcsLTEuNTc0Yy0wLjA4OCwtMC41ODggLTEuMDk0LC0zLjE3OCAtMy4yODEsLTMuNDA1Yy0xLjMwNCwtMC4xMzQgLTEyLjkxLC0xLjE1NSAtMTIuOTEsLTEuMTU1YzAuMjI1LDEuMjg4IDAuNzQ4LDEuOTM4IDEuMDk0LDIuMzExYzAuODA1LDAuODU3IDIuMDg3LDEuMDk5IDIuMDg3
+    LDEuMDk5YzAuMzA5LDAuMDMzIDguOTQ1LDAuODI0IDguOTQ1LDAuODI0YzAuMjc0LDAuMDE3IDAuNzk3LDAuMDkzIDAuNzksMC44NDljMCwwLjA5MSAtMC4wNzUsMC43NTcgLTAuNzM4LDAuNzU3aC0xMi4wMTRjLTAuMjc2LDAgLTAuNSwtMC4yMjQgLTAuNSwtMC41di01LjM3M2wtMy40NzgsLTAuMjgxdjkuMDI3YzAsMC41NSAwLjQ0OCwwLjk5OCAxLDAuOTk4ek00Ny40NDQsMzcuMDE3YzAuMDAxLC0wLjU1MiAwLjQ0OCwtMC45OTggMSwtMC45OThoMTEuNDI5YzAuMj
+    g2LDAgMC41OTUsLTAuMTg3IDAuNTk1LC0wLjE4N2MwLjEzLC0wLjEyOSAwLjIzNSwtMC4zNjQgMC4yMzUsLTAuNTkxYzAsLTAuNzUzIC0wLjU2MSwtMC43ODYgLTAuODQzLC0wLjgwM2MwLDAgLTguNzMyLC0wLjgwOCAtOS4wMzYsLTAuODM0YzAsMCAtMS4yMTEsLTAuMjA3IC0yLjAxNywtMS4wNjhjLTAuMzUxLC0wLjM2OSAtMC44MTUsLTAuNzcxIC0xLjE2MSwtMi4wOTljMCwwIDExLjY3MSwwLjc2MyAxMi45NjgsMC44OTdjMi4xODksMC4yMzIgMy4yMTUsMi42MzIgMy4zMDgsMy40M2MwLDAgMC4wOTMsMC43MjIgLTAuMDIsMS42MDdjMCwwIC0wLjQ1NCwzLjM3NCAtMy42NjQsMy41NzloLTExLjc5N2MtMC41NTMsMCAtMS4wMDEsLTAuNDQ5IC0xLC0xLjAwMnoiIGZpbGw9InVybCgjY29sb3ItMikiIGlkPSJwYXRoMTEiLz48L2c+PC9nPjwvc3ZnPgo=</data><downloads_count>0</downloads_count></logo>
+  <finalclass>Brand</finalclass>
+  <friendlyname>Asus</friendlyname>
+</Brand>
+<Brand alias="Brand" id="4">
+  <name>Cisco</name>
+  <logo><mimetype>image/svg+xml</mimetype><filename>icon-cisco.svg</filename><data>PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcgeG1sbnM6aW5rc2NhcGU9Imh0dHA6Ly93d3cuaW5rc2NhcGUub3JnL25hbWVzcGFjZXMvaW5rc2NhcGUiIHhtbG5zOnNvZGlwb2RpPSJodHRwOi8vc29kaXBvZGkuc291cmNlZm9yZ2UubmV0L0RURC9zb2RpcG9kaS0wLmR0ZCIgeG1sbnM9Imh0dHA6Ly93d
+    3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczpzdmc9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiIHhtbG5zOmNjPSJodHRwOi8vY3JlYXRpdmVjb21tb25zLm9yZy9ucyMiIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgd2lkdGg9IjEwOCIgaGVpZ2h0PSIxMDgiIHZpZXdCb3g9IjAgMCAxMDggMTA4IiByb2xlPSJpbWciIHZlcnNpb24
+    9IjEuMSIgaWQ9InN2ZzExIiBzb2RpcG9kaTpkb2NuYW1lPSJpY29uLWNpc2NvLnN2ZyIgaW5rc2NhcGU6dmVyc2lvbj0iMS40LjMgKDBkMTVmNzUwNDIsIDIwMjUtMTItMjUpIj48c29kaXBvZGk6bmFtZWR2aWV3IGlkPSJuYW1lZHZpZXcxMSIgcGFnZWNvbG9yPSIjZmZmZmZmIiBib3JkZXJjb2xvcj0iIzAwMDAwMCIgYm9yZGVyb3BhY2l0eT0iMC4yNSIgaW5rc2NhcGU6c2hvd3BhZ2VzaGFkb3c9IjIiIGlua3NjYXBlOnBhZ2VvcGFjaXR5PSIwLjAiIGlua3NjYXBlO
+    nBhZ2VjaGVja2VyYm9hcmQ9IjAiIGlua3NjYXBlOmRlc2tjb2xvcj0iI2QxZDFkMSIgc2hvd2d1aWRlcz0idHJ1ZSIgaW5rc2NhcGU6em9vbT0iNi44MjI5NjAyIiBpbmtzY2FwZTpjeD0iNDguODc5MDc4IiBpbmtzY2FwZTpjeT0iNTEuNzM3MDc1IiBpbmtzY2FwZTp3aW5kb3ctd2lkdGg9IjI1NjAiIGlua3NjYXBlOndpbmRvdy1oZWlnaHQ9IjEzNjAiIGlua3NjYXBlOndpbmRvdy14PSIwIiBpbmtzY2FwZTp3aW5kb3cteT0iMCIgaW5rc2NhcGU6d2luZG93LW1heGl
+    taXplZD0iMSIgaW5rc2NhcGU6Y3VycmVudC1sYXllcj0ic3ZnMTEiPjxzb2RpcG9kaTpndWlkZSBwb3NpdGlvbj0iMTYuOTM5NTg3LDUzLjM3NjMwMyIgb3JpZW50YXRpb249IjAsLTEiIGlkPSJndWlkZTExIiBpbmtzY2FwZTpsb2NrZWQ9ImZhbHNlIi8+PC9zb2RpcG9kaTpuYW1lZHZpZXc+PHRpdGxlIGlkPSJmdy1jLWhlYWRlcl9fbG9nby10aXRsZSI+Q2lzY28uY29tIEZyYW5jZTwvdGl0bGU+PGRlZnMgaWQ9ImRlZnMxIj48cGF0aCBkPSJtIDAsMjIuNzY5IGEgM
+    i4zNDgsMi4zNDggMCAwIDAgMy45MzUsMS41NDUgYyAwLjQzNCwtMC40MDMgMC43LC0wLjk1NSAwLjc0NCwtMS41NDUgdiAtNS4yIGEgMi4zNCwyLjM0IDAgMCAwIC00LjY3OSwwIHYgNS4yIiBpZD0iYmFyX3Nob3J0IiBjbGFzcz0iYmFyIi8+PHBhdGggZD0ibSAxMi45NSwyMi43NjkgYSAyLjM0OSwyLjM0OSAwIDAgMCAyLjM0LDIuMTcxIDIuMzQ2LDIuMzQ2IDAgMCAwIDIuMzM5LC0yLjE3MSBWIDExLjExMiBhIDIuMzQxLDIuMzQxIDAgMCAwIC00LjY3OSwwIFYgMjI
+    uNzciIGlkPSJiYXJfdGFsbCIgY2xhc3M9ImJhciIvPjxwYXRoIGQ9Im0gMjUuODMyLDI3LjQ2NCBhIDIuMzQ1LDIuMzQ1IDAgMCAwIDQuNjc4LDAgViAyLjI0OSBhIDIuMzQyLDIuMzQyIDAgMCAwIC00LjY3OCwwIHYgMjUuMjE1IiBpZD0iYmFyX2dyYW5kZSIgY2xhc3M9ImJhciIvPjxwYXRoIGQ9Im0gMjQuMDI2LDU2LjI3NyB2IC01LjAwMiBsIC0wLjA5OCwwLjA0MyBhIDkuMjUzLDkuMjUzIDAgMCAxIC0zLjYwNSwwLjkxNSA1LjMwMyw1LjMwMyAwIDAgMSAtMy42M
+    ywtMS4wNyA0LjY0NCw0LjY0NCAwIDAgMSAtMS41OCwtMi4yNDQgNS4zOTUsNS4zOTUgMCAwIDEgLTAuMTA2LC0zIDQuNiw0LjYgMCAwIDEgMS42MDksLTIuNTY2IDQuODIzLDQuODIzIDAgMCAxIDIuNTI4LC0xLjA5IDguMzMyLDguMzMyIDAgMCAxIDQuNzc0LDAuODk1IGwgMC4xMDgsMC4wNTYgdiAtNS4wMyBsIC0wLjIyOCwtMC4wNjEgYSAxMi43OCwxMi43OCAwIDAgMCAtNC41NTIsLTAuNTk2IDEwLjUzNCwxMC41MzQgMCAwIDAgLTQuMDY1LDAuOTMgOS4yOSw5LjI
+    5IDAgMCAwIC0zLjMyOSwyLjU3MiAxMC4wMTQsMTAuMDE0IDAgMCAwIC0wLjE4MiwxMi4xOCA5LjU0Niw5LjU0NiAwIDAgMCA1LjI5MiwzLjQwMyBjIDIuMjExLDAuNTM4IDQuNTI4LDAuNDU2IDYuNjk3LC0wLjIzNCBsIDAuMzY3LC0wLjEwMSIgaWQ9ImNpc2NvX2MiLz48L2RlZnM+PGcgZmlsbD0iIzAyYzhmZiIgZmlsbC1ydWxlPSJldmVub2RkIiBpZD0iZzExIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgtMC4wOTQ2Njg1OSwyNi4yMzQ5NDYpIj48dXNlIGhyZWY9IiNja
+    XNjb19jIiBpZD0idXNlMSIvPjx1c2UgaHJlZj0iI2Npc2NvX2MiIHg9IjQ5LjUiIGlkPSJ1c2UyIi8+PHBhdGggZD0ibSA0MS42OSw1Mi4xMjUgLTAuMDE5LDQuMzA4IDAuMzE1LDAuMDU0IGMgMC45ODksMC4xODUgMS45ODcsMC4zMTMgMi45OSwwLjM4NSBhIDE4LjEsMTguMSAwIDAgMCAyLjY0MiwwLjA1MSBjIDAuODQyLC0wLjA2IDEuNjc1LC0wLjIxOCAyLjQ4LC0wLjQ2OCBhIDYuODYyLDYuODYyIDAgMCAwIDIuNTczLC0xLjM3MSA1LjE5LDUuMTkgMCAwIDAgMS4
+    0OTgsLTIuMTQ4IDUuOTEyLDUuOTEyIDAgMCAwIC0wLjAzLC00LjMyNCA0Ljg1Miw0Ljg1MiAwIDAgMCAtMS4zNDMsLTEuODYyIDUuNTY4LDUuNTY4IDAgMCAwIC0xLjk3LC0xLjE0NyBsIC0zLjI1LC0xLjIwNiBhIDEuNzQyLDEuNzQyIDAgMCAxIC0wLjg4NywtMC44NDUgMS4xMDcsMS4xMDcgMCAwIDEgMC4wMzYsLTAuOTg2IDEuMjksMS4yOSAwIDAgMSAwLjIxNywtMC4yOTEgMS43NSwxLjc1IDAgMCAxIDAuNDgsLTAuMzQ3IGMgMC4zNjMsLTAuMTggMC43NTUsLTAuM
+    jkzIDEuMTU4LC0wLjMzNyBhIDYuNzYsNi43NiAwIDAgMSAyLjA3MiwwLjAyMiBjIDAuODEsMC4wODggMS42MTMsMC4yMzEgMi40MDIsMC40MyBsIDAuMTY4LDAuMDM3IHYgLTMuOTc0IGwgLTAuMzEsLTAuMDY3IGEgMjEuMTQsMjEuMTQgMCAwIDAgLTIuNDQ0LC0wLjQzNSAxMi41NDUsMTIuNTQ1IDAgMCAwIC0zLjIxMywtMC4wMTQgNi45NDUsNi45NDUgMCAwIDAgLTMuNjk5LDEuNDg4IDQuOTA4LDQuOTA4IDAgMCAwIC0xLjU4LDIuMTc4IDUuOTg0LDUuOTg0IDAgMCA
+    wIC0wLjAwMyw0LjA1IGMgMC4yNDIsMC42NSAwLjYzLDEuMjM3IDEuMTM2LDEuNzE0IDAuNDM3LDAuNDIyIDAuOTMyLDAuNzggMS40NywxLjA2NSAwLjcwOCwwLjM4IDEuNDU4LDAuNjc1IDIuMjM1LDAuODc4IDAuMjU3LDAuMDc3IDAuNTEyLDAuMTU4IDAuNzY2LDAuMjQzIGwgMC4zODUsMC4xNDEgMC4xMSwwLjA0NSBjIDAuMzgsMC4xMzYgMC43MjYsMC4zNSAxLjAxOCwwLjYyOCAwLjIwMiwwLjE5IDAuMzU4LDAuNDIzIDAuNDU1LDAuNjgzIDAuMDYsMC4yMzcgMC4wN
+    jEsMC40ODUgMC4wMDMsMC43MjMgYSAxLjUzNiwxLjUzNiAwIDAgMSAtMC43NDQsMC44OTIgMy42OTEsMy42OTEgMCAwIDEgLTEuMjM5LDAuMzg3IDksOSAwIDAgMSAtMS45MiwwLjA5NyAyMS45NzMsMjEuOTczIDAgMCAxIC0yLjUwNywtMC4zMzQgYyAtMC40MzMsLTAuMDkgLTAuODY0LC0wLjE5IC0xLjI5MSwtMC4zMDMgeiBtIC0xMS4xNDQsNC40ODIgaCA0LjczIFYgMzcuODQ2IGggLTQuNzMgeiBNIDg1LjMwNSw0My4zODYgYSA0LjkzNCw0LjkzNCAwIDEgMSA2LjE
+    1Nyw3LjcxMSA0LjkzNCw0LjkzNCAwIDAgMSAtNi4xNTcsLTcuNzEgbSAtNi44NjcsMy44NDggYSA5Ljg3LDkuODcgMCAwIDAgMTIuMDAyLDkuNDg1IDkuNjI5LDkuNjI5IDAgMCAwIDMuMTU3LC0xNy43MjkgOS45MzQsOS45MzQgMCAwIDAgLTE1LjE2LDguMjQ0IiBpZD0icGF0aDIiLz48dXNlIGhyZWY9IiNiYXJfc2hvcnQiIHg9IjAiIGlkPSJ1c2UzIi8+PHVzZSBocmVmPSIjYmFyX3RhbGwiIHg9IjAiIGlkPSJ1c2U0Ii8+PHVzZSBocmVmPSIjYmFyX2dyYW5kZSIge
+    D0iMCIgaWQ9InVzZTUiLz48dXNlIGhyZWY9IiNiYXJfdGFsbCIgeD0iMjUuODc1IiBpZD0idXNlNiIvPjx1c2UgaHJlZj0iI2Jhcl9zaG9ydCIgeD0iNTEuNzUiIGlkPSJ1c2U3Ii8+PHVzZSBocmVmPSIjYmFyX3RhbGwiIHg9IjUxLjc1IiBpZD0idXNlOCIvPjx1c2UgaHJlZj0iI2Jhcl9ncmFuZGUiIHg9IjUxLjc1IiBpZD0idXNlOSIvPjx1c2UgaHJlZj0iI2Jhcl90YWxsIiB4PSI3Ny42MjUiIGlkPSJ1c2UxMCIvPjx1c2UgaHJlZj0iI2Jhcl9zaG9ydCIgeD0iMTAzLjM3NSIgaWQ9InVzZTExIi8+PC9nPjxtZXRhZGF0YSBpZD0ibWV0YWRhdGExMSI+PHJkZjpSREY+PGNjOldvcmsgcmRmOmFib3V0PSIiPjxkYzp0aXRsZT5DaXNjby5jb20gRnJhbmNlPC9kYzp0aXRsZT48L2NjOldvcms+PC9yZGY6UkRGPjwvbWV0YWRhdGE+PC9zdmc+Cg==</data><downloads_count>0</downloads_count></logo>
+  <finalclass>Brand</finalclass>
+  <friendlyname>Cisco</friendlyname>
+</Brand>
+<Brand alias="Brand" id="5">
+  <name>Dell</name>
+  <logo><mimetype>image/svg+xml</mimetype><filename>icons8-dell.svg</filename><data>PD94bWwgdmVyc2lvbj0iMS4wIj8+CjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2aWV3Qm94PSIwIDAgNDggNDgiIHdpZHRoPSI0OHB4IiBoZWlnaHQ9IjQ4cHgiPjxwYXRoIGZpbGw9IiMwMjg4ZDEiIGQ9Ik0yNCw0QzEyLjk1Niw0LDQsMTIuOTU2LDQsMjRzOC45NTYsMjAsMjAsMjBzMjAtOC45NTYsMjAtMjBTMzUuMDQ0LDQsMjQs
+    NHogTTI0LDQxYy05LjM5MSwwLTE3LTcuNjA5LTE3LTE3UzE0LjYwOSw3LDI0LDdzMTcsNy42MDksMTcsMTdTMzMuMzkxLDQxLDI0LDQxeiIvPjxwYXRoIGZpbGw9IiMwMjg4ZDEiIGQ9Ik0zNS42NDEsMjUuNTYzbDIuODQsMC4wMDRsLTAuMDA0LDIuMzk1bC01LjY5MS0wLjAxMmwwLjAxMi04LjE3MmwyLjg1NSwwLjAwNEwzNS42NDEsMjUuNTYzeiBNMjYuMzQsMjUuMTAybC00LjY5OSwzLjY4NGwtNC4yODUtMy4zNzljLTAuNjIxLDEuNDg0LTIuMTA5LDIuNTItMy44Mz
+    YsMi41MTZsLTMuNjY0LTAuMDA0bDAuMDA4LTguMTcybDMuNjY4LDAuMDA0YzEuOTI2LDAuMDA0LDMuMzA5LDEuMjIzLDMuODI4LDIuNTMxbDQuMjk3LTMuMzY3bDEuNTg2LDEuMjVsLTMuOTM0LDMuMDg2bDAuNzU0LDAuNTk0bDMuOTM0LTMuMDg2bDEuNTksMS4yNTRsLTMuOTM0LDMuMDgybDAuNzUsMC41OTRsMy45NDEtMy4wODJsMC4wMDQtMi44MzZsMi44NTIsMC4wMDRsLTAuMDA4LDUuNzgxbDIuODQsMC4wMDRsLTAuMDA0LDIuMzkxbC01LjY5MS0wLjAwOEwyNi4zNCwyNS4xMDJ6IE0xNS4wMTIsMjMuODRjMC0xLjExMy0wLjczLTEuNzQyLTEuNzctMS43NDJoLTAuNjM3bC0wLjAwNCwzLjQ3N2gwLjYyMUMxNC4xODQsMjUuNTc0LDE1LjAxMiwyNS4wNTEsMTUuMDEyLDIzLjg0Ii8+PC9zdmc+Cg==</data><downloads_count>0</downloads_count></logo>
+  <finalclass>Brand</finalclass>
+  <friendlyname>Dell</friendlyname>
+</Brand>
+<Brand alias="Brand" id="6">
+  <name>HP Inc</name>
+  <logo><mimetype>image/svg+xml</mimetype><filename>icons8-hp.svg</filename><data>PD94bWwgdmVyc2lvbj0iMS4wIj8+CjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2aWV3Qm94PSIwIDAgNDggNDgiIHdpZHRoPSI0OHB4IiBoZWlnaHQ9IjQ4cHgiPjxwYXRoIGZpbGw9IiNmZmYiIGQ9Ik0yNCA0QTIwIDIwIDAgMSAwIDI0IDQ0QTIwIDIwIDAgMSAwIDI0IDRaIi8+PHBhdGggZmlsbD0iIzE5NzZkMiIgZD0iTTI0LDQzLj
+    k5N2MtMC4xOTksMC0wLjY1MiwwLjAwNi0wLjg1LDBsNC0xMC45OTloNS42MjVjMC45ODcsMCwyLjA3MS0wLjc1OSwyLjQwOS0xLjY4Nmw0Ljc0OC0xMi42ODdjMC43MjUtMS45OTUtMC40MTctMy42MjYtMi41MzktMy42MjZoLTcuODA0bC02LjUxOCwxOC4yNTdoLTAuMDAybC0zLjcxMiwxMC4xOThDMTAuNTUsNDEuMzYxLDQsMzMuNDQ1LDQsMjMuOTk5YzAtOS4xNzQsNi4xNzgtMTYuOTA1LDE0LjYtMTkuMjYxbC0zLjgzLDEwLjUyNmgtMC4wMDFMOC4xNSwzMi45OTho
+    NC4yMzlsNS41NzYtMTQuOTk5aDMuMTg1bC01LjU3NiwxNC45OTlsMy45MTksMC4wMDFsNS40MzgtMTQuMzc0YzAuNzI2LTEuOTk1LTAuNDE2LTMuNjI2LTIuNTM2LTMuNjI2SDE5LjE1bDMuOTUxLTEwLjk3OEMyMy4zOTksNC4wMDgsMjMuNjk5LDQsMjQsNGMxMS4wNDYsMCwyMCw4Ljk1MywyMCwxOS45OTlTMzUuMDQ2LDQzLjk5NywyNCw0My45OTd6IE0zNi4xNSwxNy45OTloLTMuMTg1bC00LjUwOSwxMS45OTloMy4xODVMMzYuMTUsMTcuOTk5eiIvPjwvc3ZnPgo=</data><downloads_count>0</downloads_count></logo>
+  <finalclass>Brand</finalclass>
+  <friendlyname>HP Inc</friendlyname>
+</Brand>
+<Brand alias="Brand" id="7">
+  <name>HPE</name>
+  <logo><mimetype>image/svg+xml</mimetype><filename>icon-hpe.svg</filename><data>PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcgeG1sbnM6aW5rc2NhcGU9Imh0dHA6Ly93d3cuaW5rc2NhcGUub3JnL25hbWVzcGFjZXMvaW5rc2NhcGUiIHhtbG5zOnNvZGlwb2RpPSJodHRwOi8vc29kaXBvZGkuc291cmNlZm9yZ2UubmV0L0RURC9zb2RpcG9kaS0wLmR0ZCIgeG1sbnM9Imh0dHA6Ly93d3c
+    udzMub3JnLzIwMDAvc3ZnIiB4bWxuczpzdmc9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2ZXJzaW9uPSIxLjAiIGlkPSJrYXRtYW5fMSIgeD0iMHB4IiB5PSIwcHgiIHZpZXdCb3g9IjAgMCA2MzAgNjMwIiB4bWw6c3BhY2U9InByZXNlcnZlIiBzb2RpcG9kaTpkb2NuYW1lPSJpY29uLWhwZS5zdmciIHdpZHRoPSI2MzAiIGhlaWdodD0iNjMwIiBpbmtzY2FwZTp2ZXJzaW9uPSIxLjQuMyAoMGQxNWY3NTA0MiwgMjAyNS0xMi0yNSkiPjxkZWZzIGlkPSJkZWZzM
+    iIvPjxzb2RpcG9kaTpuYW1lZHZpZXcgaWQ9Im5hbWVkdmlldzIiIHBhZ2Vjb2xvcj0iI2ZmZmZmZiIgYm9yZGVyY29sb3I9IiMwMDAwMDAiIGJvcmRlcm9wYWNpdHk9IjAuMjUiIGlua3NjYXBlOnNob3dwYWdlc2hhZG93PSIyIiBpbmtzY2FwZTpwYWdlb3BhY2l0eT0iMC4wIiBpbmtzY2FwZTpwYWdlY2hlY2tlcmJvYXJkPSIwIiBpbmtzY2FwZTpkZXNrY29sb3I9IiNkMWQxZDEiIHNob3dndWlkZXM9InRydWUiIGlua3NjYXBlOnpvb209IjAuNjkwNTUxNSIgaW5rc2N
+    hcGU6Y3g9Ii0yMTcuOTQxNzUiIGlua3NjYXBlOmN5PSIyNzUuMTQyNCIgaW5rc2NhcGU6d2luZG93LXdpZHRoPSIyNTYwIiBpbmtzY2FwZTp3aW5kb3ctaGVpZ2h0PSIxMzYwIiBpbmtzY2FwZTp3aW5kb3cteD0iMCIgaW5rc2NhcGU6d2luZG93LXk9IjAiIGlua3NjYXBlOndpbmRvdy1tYXhpbWl6ZWQ9IjEiIGlua3NjYXBlOmN1cnJlbnQtbGF5ZXI9ImthdG1hbl8xIj48c29kaXBvZGk6Z3VpZGUgcG9zaXRpb249IjE5Ny42NjI0NCwzMTQuNDg4NDgiIG9yaWVudGF0a
+    W9uPSIwLC0xIiBpZD0iZ3VpZGUyIiBpbmtzY2FwZTpsb2NrZWQ9ImZhbHNlIi8+PC9zb2RpcG9kaTpuYW1lZHZpZXc+CjxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyIgaWQ9InN0eWxlMSI+Cgkuc3Qwe2ZpbGw6bm9uZTtzdHJva2U6IzAwMDAwMDtzdHJva2Utd2lkdGg6MzY7fQoJLnN0MXtmaWxsOm5vbmU7c3Ryb2tlOiMwM0E4ODM7c3Ryb2tlLXdpZHRoOjM2O30KPC9zdHlsZT4KPHBhdGggY2xhc3M9InN0MCIgZD0ibSAxOC41MTE5ODcsNDA1LjkzMDEyIHYgLTE4MCBtIDE
+    1NC4wMDAwMDMsMTgwIHYgLTE4MCBtIC0xNTQuMDAwMDAzLDg5IEggMTU1LjUxMTk5IG0gOTUsOTEgdiAtMTgwIG0gMCwxOCBoIDEwMiBjIDI3LjYsMCA1MCwyMi40IDUwLDUwIDAsMjcuNiAtMjIuNCw1MCAtNTAsNTAgaCAtMTAyIG0gMjIyLC02NyB2IC0zMyBoIDE1OCIgaWQ9InBhdGgxIi8+CjxwYXRoIGNsYXNzPSJzdDEiIGQ9Im0gNjMwLjUxMTk5LDM4Ny45MzAxMiBoIC0xNTggdiAtNzYgaCAxNTgiIGlkPSJwYXRoMiIvPgo8L3N2Zz4K</data><downloads_count>0</downloads_count></logo>
+  <finalclass>Brand</finalclass>
+  <friendlyname>HPE</friendlyname>
+</Brand>
+<Brand alias="Brand" id="8">
+  <name>IBM</name>
+  <logo><mimetype>image/svg+xml</mimetype><filename>icons8-ibm.svg</filename><data>PD94bWwgdmVyc2lvbj0iMS4wIj8+CjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2aWV3Qm94PSIwIDAgNDggNDgiIHdpZHRoPSI0OHB4IiBoZWlnaHQ9IjQ4cHgiPjxwYXRoIGZpbGw9IiMzZjUxYjUiIGQ9Ik00OCAxNkw0OCAxNCA0MC40NjkgMTQgMzkuODA5IDE2ek0zMyAzMUwzMyAyOSAyOSAyOSAyNyAyOSAyNyAzMXpNMzkuNzY2I
+    DI4TDQwLjUxIDI2IDM0LjUxIDI2IDM1LjI2NiAyOHpNMjkgMjZIMzNWMjhIMjl6TTI5IDIzSDMzVjI1SDI5ek00MiAyOUw0MiAzMSA0OCAzMSA0OCAyOSA0NiAyOXpNMzYuMTgxIDE5TDM1LjUyMSAxNyAyNyAxNyAyNyAxOSAyOSAxOXpNMzcuMTcgMjJMMzYuNTEgMjAgMjkgMjAgMjkgMjJ6TTMzLjM3OCAyM0wzNC4xMzMgMjUgNDAuODgzIDI1IDQxLjYyOCAyM3pNNDIgMjNINDZWMjVINDJ6TTI3IDMySDMzVjM0SDI3ek0zNS4xOTEgMTZMMzQuNTMxIDE0IDI3IDE0IDI
+    3IDE2ek0zNi43NzYgMzJMMzcuNTMxIDM0IDM4LjI3NiAzMnpNNDIgMzJINDhWMzRINDJ6TTM5LjQ3OSAxN0wzOC44MTkgMTkgNDYgMTkgNDggMTkgNDggMTd6TTM5LjM5MyAyOUwzNS42NDMgMjkgMzYuMzk4IDMxIDM4LjY0OCAzMXpNNDIgMjZINDZWMjhINDJ6TTM4LjQ5IDIwTDM3LjgzIDIyIDQ2IDIyIDQ2IDIwek0wIDE0SDhWMTZIMHpNMCAxN0g4VjE5SDB6TTIgMjBINlYyMkgyek0yIDIzSDZWMjVIMnpNMiAyNkg2VjI4SDJ6TTAgMjlIOFYzMUgwek0wIDMySDhWM
+    zRIMHpNMTAgMTdIMThWMTlIMTB6TTI0Ljk3NyAxNmMtLjkxMy0xLjIwOC0yLjM0Ny0yLTMuOTc3LTJIMTB2Mmg3LjAyM0gyNC45Nzd6Ii8+PHBhdGggZmlsbD0iIzNmNTFiNSIgZD0iTTI1LjU3OCAxN2gtOS4xMzFDMTYuMTcxIDE3LjYxMyAxNiAxOC4yODMgMTYgMTloMTBDMjYgMTguMjg4IDI1Ljg0NiAxNy42MTMgMjUuNTc4IDE3ek0yMy45NzUgMjNIMTJ2MmgxMS45NzNjLS44MzMtLjYyLTEuODU0LTEtMi45NzMtMUMyMi4xMTkgMjQgMjMuMTQyIDIzLjYyMSAyMy4
+    5NzUgMjN6TTE3LjAyMyAzMkgxMHYyaDExYzEuNjMgMCAzLjA2NS0uNzkyIDMuOTc3LTJIMTcuMDIzek0xOCAyOWgtMi02djJoNi40NDdIMThoNy41NzhDMjUuODQ2IDMwLjM4NyAyNiAyOS43MTIgMjYgMjlIMTh6TTIxIDIwYzAgMCAwIC4wODMgMCAxcy0xIDEtMSAxaDQuOTc5Yy40NDEtLjU4NC43Ny0xLjI1Ny45MjEtMkgyMXpNMTIgMjBIMTdWMjJIMTJ6Ii8+PGc+PHBhdGggZmlsbD0iIzNmNTFiNSIgZD0iTTIxIDI4aDQuODg1Yy0uMTU2LS43MzgtLjQ2Ny0xLjQxOC0uOTA3LTJIMjBjMCAwIDEgLjE2NyAxIDFTMjEgMjggMjEgMjh6TTEyIDI2SDE3VjI4SDEyeiIvPjwvZz48L3N2Zz4K</data><downloads_count>0</downloads_count></logo>
+  <finalclass>Brand</finalclass>
+  <friendlyname>IBM</friendlyname>
+</Brand>
+<Brand alias="Brand" id="9">
+  <name>Lenovo</name>
+  <logo><mimetype>image/svg+xml</mimetype><filename>icons8-lenovo.svg</filename><data>PD94bWwgdmVyc2lvbj0iMS4wIj8+CjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2aWV3Qm94PSIwIDAgNDggNDgiIHdpZHRoPSI0OHB4IiBoZWlnaHQ9IjQ4cHgiPjxyZWN0IHdpZHRoPSI0OCIgaGVpZ2h0PSIxNiIgeT0iMTYiIGZpbGw9IiNmZjE3NDQiLz48cGF0aCBmaWxsPSIjZmZmIiBkPSJNMTEuOTM1LDI2LjA2MmMwLjM3LD
+    AuMzQxLDAuNzgyLDAuNDUsMS4yMjcsMC40NzhjMC42NDUsMC4wMzksMS4yMTctMC4xNTYsMS43MjQtMC41NDYgYzAuMTI0LTAuMDk2LDAuMTYzLTAuMTI2LDAuMTYzLTAuMTI2czAuNzc3LDAuNjA5LDEuMDk3LDAuODU1Yy0wLjI2MSwwLjMwOS0wLjU2NywwLjUyMS0wLjkwMSwwLjY5MiBjLTEuMTAzLDAuNTY1LTIuMjQ5LDAuNjg3LTMuNDI0LDAuMjY0Yy0xLjM0Ni0wLjQ4NS0yLjEzMS0xLjY5My0yLjA1OS0zLjExN2MwLjA3My0xLjQ0MSwxLjAwNS0yLjYwOCwyLjM5
+    Mi0yLjk0NCBjMS4wNjQtMC4yNTcsMi4wODQtMC4xNDMsMi45OCwwLjUzOWMwLjY1MSwwLjQ5NiwxLjAwMSwxLjI4LDEuMTQ3LDIuMDY4YzAsMC0yLjU5NSwxLjExLTMuNzk1LDEuNjA2IEMxMi4zMTMsMjUuOTAzLDEyLjE0MSwyNS45NzUsMTEuOTM1LDI2LjA2MnogTTExLjQ3MiwyNC45MjhjMC45NjktMC40MDEsMS45MzUtMC44MDEsMi45MDEtMS4yMDEgYy0wLjMzNC0wLjcyMi0xLjA5Ni0xLjAxNy0xLjg2Ni0wLjc0OEMxMS43NTgsMjMuMjQsMTEuMjgsMjQuMTI0LD
+    ExLjQ3MiwyNC45Mjh6Ii8+PHBhdGggZmlsbD0iI2ZmZiIgZD0iTTI3LjA3NiwyNy45MzRjLTEuNjMyLTAuMDE3LTIuOTU2LTEuMDY4LTMuMjYxLTIuNmMtMC4zNy0xLjg1MiwwLjk2OS0zLjYzMywyLjg2LTMuODA4IGMxLjI4MS0wLjExOCwyLjM3MywwLjI1NCwzLjE1NSwxLjNjMS40NTEsMS45NDEsMC4yMiw0Ljc1Ny0yLjE5Myw1LjA1NUMyNy40NSwyNy45MDUsMjcuMjYzLDI3LjkxNywyNy4wNzYsMjcuOTM0eiBNMjcuMTEsMjYuNDM0IGMwLjkyOSwwLjAwMiwxLjYy
+    Mi0wLjcyMywxLjYyOC0xLjcwNGMwLjAwNi0wLjk3LTAuNzI0LTEuNzQyLTEuNjQ5LTEuNzQ1Yy0wLjkzNi0wLjAwMy0xLjYzMSwwLjczNC0xLjYyOCwxLjcyNiBDMjUuNDY1LDI1LjY3NSwyNi4xODksMjYuNDMyLDI3LjExLDI2LjQzNHoiLz48cGF0aCBmaWxsPSIjZmZmIiBkPSJNNDAuNjI0LDI3LjkzNGMtMS42MzItMC4wMTctMi45NTYtMS4wNjgtMy4yNjEtMi42Yy0wLjM3LTEuODUyLDAuOTY5LTMuNjMzLDIuODYtMy44MDggYzEuMjgxLTAuMTE4LDIuMzczLDAuMj
+    U0LDMuMTU1LDEuM2MxLjQ1MSwxLjk0MSwwLjIyLDQuNzU3LTIuMTkzLDUuMDU1QzQwLjk5OCwyNy45MDUsNDAuODExLDI3LjkxNyw0MC42MjQsMjcuOTM0eiBNNDAuNjU4LDI2LjQzNGMwLjkyOSwwLjAwMiwxLjYyMy0wLjcyMywxLjYyOC0xLjcwNGMwLjAwNi0wLjk3LTAuNzI0LTEuNzQyLTEuNjQ5LTEuNzQ1Yy0wLjkzNi0wLjAwMy0xLjYzMSwwLjczNC0xLjYyOCwxLjcyNiBDMzkuMDEzLDI1LjY3NSwzOS43MzcsMjYuNDMyLDQwLjY1OCwyNi40MzR6Ii8+PHBhdGgg
+    ZmlsbD0iI2ZmZiIgZD0iTTIxLjM3NywyNy45ODdjMC0wLjA5NSwwLjAwMS0yLjU4NywwLTMuNjYzYy0wLjAwMS0wLjc1OS0wLjYwNS0xLjMyNy0xLjQxNC0xLjMzMSBjLTAuNzk0LTAuMDA1LTEuMzgzLDAuNTYtMS4zODQsMS4zMzJjLTAuMDAxLDEuMDc2LDAsMy42NzksMCwzLjY3OWwtMS43NDEsMC4wMDJsMC4wMDctNi4zNzhjMCwwLDEuMTY4LTAuMDE4LDEuNzIyLTAuMDE4IGMwLDAuMjY0LTAuMDA2LDAuODMyLTAuMDA2LDAuODMyczAuMTM4LTAuMTI4LDAuMTgxLT
+    AuMTcxYzEuMTU3LTEuMTc0LDMuMjI2LTAuOTczLDQuMDMxLDAuMzkxIGMwLjIyMywwLjM3OCwwLjMzOCwwLjc4OSwwLjM0LDEuMjIzYzAuMDA4LDEuMjY0LDAuMDAzLDQuMTA0LDAuMDAzLDQuMTA0UzIxLjk2NCwyNy45ODcsMjEuMzc3LDI3Ljk4N3oiLz48cGF0aCBmaWxsPSIjZmZmIiBkPSJNMzAuMTY0LDIxLjYwOGMwLjY0MiwwLDEuOTY0LDAuMDE1LDEuOTY0LDAuMDE1czEuNDc4LDQuMDI0LDEuNTI2LDQuMTQ5IGMwLjExNS0wLjMxMSwxLjIwOC0zLjI5LDEuNTIx
+    LTQuMTc0YzAuNjQ2LDAuMDE4LDEuMjg4LDAuMDEsMS45NywwLjAxYy0wLjAyOSwwLjA4NC0yLjU2Miw2LjM5OC0yLjU2Miw2LjM5OGwtMS44NzYtMC4wMDMgQzMxLjkwNSwyNi4wNDIsMzAuMTkxLDIxLjY5MiwzMC4xNjQsMjEuNjA4eiIvPjxwYXRoIGZpbGw9IiNmZmYiIGQ9Ik01Ljc2NywyNi4zOTNjMC4xMDQsMCwzLjg2OCwwLjAxMSwzLjg2OCwwLjAxMWwtMC4wMDIsMS41ODFMNCwyNy45ODl2LTguMDczaDEuNzcgQzUuNzcsMTkuOTE2LDUuNzY3LDI2LjI4NCw1Ljc2NywyNi4zOTN6Ii8+PC9zdmc+Cg==</data><downloads_count>0</downloads_count></logo>
+  <finalclass>Brand</finalclass>
+  <friendlyname>Lenovo</friendlyname>
+</Brand>
+<Brand alias="Brand" id="10">
+  <name>Razer</name>
+  <logo><mimetype>image/svg+xml</mimetype><filename>icons8-razer.svg</filename><data>PD94bWwgdmVyc2lvbj0iMS4wIj8+CjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2aWV3Qm94PSIwIDAgNDggNDgiIHdpZHRoPSI0OHB4IiBoZWlnaHQ9IjQ4cHgiPjxwYXRoIGZpbGw9IiM2NGRkMTciIGQ9Ik0yNiwyMGMwLjEsMCwwLjIsMCwwLjMsMGMwLjMtMC4xLDAuNS0wLjMsMC42LTAuNWMwLjEtMC4yLDAuMS0wLjUsMC4xLTA
+    uOGMtMC4yLTAuNi0xLTEuOC0yLTIuNCBjMCwwLjcsMCwxLjMsMCwxLjljMCwwLjUsMCwxLDAsMS4yYzAuMSwwLjIsMC4zLDAuNCwwLjUsMC42QzI1LjcsMjAsMjUuOCwyMCwyNiwyMCBNMjkuNCwyM2MwLjcsMCwxLjYtMC4xLDIuMy0wLjUgYy0wLjUtMC4zLTEtMC42LTEuNS0wLjljLTAuNC0wLjMtMC45LTAuNi0xLjEtMC42YzAsMC0wLjEsMC0wLjEsMGMtMC4yLDAtMC40LDAuMS0wLjYsMC4yYy0wLjIsMC4xLTAuNCwwLjQtMC40LDAuNiBjLTAuMSwwLjUsMC4zLDEuM
+    SwwLjgsMS4yQzI5LDIzLDI5LjIsMjMsMjkuNCwyMyBNMjMsMjQuOWMwLjUtMC4yLDEtMC40LDEuNS0wLjZjMC41LTAuMiwxLTAuNCwxLjItMC41YzAuMi0wLjIsMC4zLTAuNCwwLjMtMC43IGMwLTAuMy0wLjEtMC41LTAuMy0wLjdDMjUuNiwyMi4xLDI1LjMsMjIsMjUsMjJjLTAuMiwwLTAuNSwwLjEtMC43LDAuM0MyMy45LDIyLjYsMjMuMiwyMy44LDIzLDI0LjkgTTQxLjUsMSBjLTAuNywwLTEuNCwwLjUtMS41LDEuM2MwLDAsMCwwLDAsMEMzOS43LDIuMSwzOS40LDI
+    sMzksMmMtMS43LDAtMi45LDAuMi0zLjYsMC43QzM0LjUsMy4yLDM0LDQuMSwzNCw1YzAsMC4xLDAsMC4xLDAsMC4yIEMzMy42LDUuMSwzMy4xLDUsMzIuNyw1Yy0xLjMsMC0yLjQsMC43LTMuMSwyQzI5LjIsNy43LDI5LDguNCwyOSw5LjJjMCwyLjYsMi4yLDQuNiw0LjUsNi42YzIuNywyLjQsMy45LDMuOCwzLjMsNC44IGMtMC4yLDAuNC0wLjQsMC40LTAuNCwwLjRjLTAuMSwwLTAuMiwwLTAuMywwYy0wLjEsMC0wLjMsMC0wLjUtMC4xYzAtMC42LTAuMS0xLjEtMC4yL
+    TEuNmMtMC4yLTAuNi0wLjUtMS4yLTEtMS43IGMtMC40LTAuNS0xLTAuNy0xLjUtMC45Yy0wLjEsMC0wLjItMC4xLTAuNC0wLjFjLTAuMywwLTAuNywwLjItMC44LDAuNWMtMC4zLDAuNC0wLjIsMC45LDAuMiwxLjNjMC4yLDAuMiwwLjQsMC40LDAuNSwwLjYgYzAuMSwwLjIsMC4xLDAuMywwLjEsMC41Yy0wLjItMC4xLTAuNS0wLjMtMC43LTAuNGMtMC44LTAuNS0xLjQtMC45LTEuOS0xYzAtMC4xLTAuMS0wLjItMC4xLTAuM2MtMC41LTEuNS0yLjEtMy43LTQuMy00LjU
+    gYy0xLTMuNS0zLjMtNC4zLTUuMS00LjNjLTQuNiwwLTUuNCw0LjktNiw4LjVjLTAuMiwxLjQtMC43LDQtMS4zLDQuNWMwLTAuMi0wLjEtMC41LTAuMS0xQzEzLDE5LjksMTIuNywxNywxMCwxNyBjLTEuNiwwLTIuNCwxLjEtMi44LDEuN2MtMC4yLTAuMi0wLjMtMC40LTAuNC0wLjZjLTAuMy0wLjYtMS0xLjEtMS43LTEuMUM1LjEsMTYuOSw1LDE2LjcsNSwxNi41QzUsMTUuNyw0LjMsMTUsMy41LDE1IGMtMC43LDAtMS4yLDAuNC0xLjQsMS4xQzEuNCwxNi4zLDEsMTYuO
+    CwxLDE3LjVDMSwxOC4zLDEuNywxOSwyLjUsMTljMC4xLDAsMC4yLDAsMC4zLDBDMi45LDE5LjEsMywxOS4xLDMsMTkuMiBjMCwwLjIsMC4xLDAuNSwwLjIsMC43YzEsMS45LDIuNSwyLjcsMywyLjlDNi42LDIyLjksNywyMyw3LjQsMjNjMC43LDAsMS4zLTAuMiwxLjgtMC41QzkuNSwyNCwxMC4zLDI2LDEzLDI2IGM0LjEsMCw0LjktNC42LDUuNC03LjljMC42LTMuNCwxLTUuMSwyLTUuMWMwLjMsMCwwLjcsMCwxLjEsMC45Yy0wLjQsMC4yLTAuNywwLjUtMSwwLjhjLTA
+    uNSwwLjUtMC44LDEuMS0xLDEuNyBjLTAuMiwwLjYtMC4xLDEuMi0wLjEsMS43YzAuMSwwLjUsMC41LDAuOCwwLjksMC45YzAsMCwwLDAsMC4xLDBjMC41LDAsMC45LTAuMywxLTAuOGMwLjEtMC4zLDAuMi0wLjYsMC4zLTAuOCBjMC4xLTAuMSwwLjItMC4yLDAuMy0wLjNjMCwwLjMsMCwwLjYsMCwwLjljMCwwLjksMCwxLjUsMC4xLDJjLTEsMS0yLjIsMy0yLjIsNS4yYy0xLjMsMC45LTIuMiwxLjktMi43LDNjLTAuNSwxLjItMC41LDIuNSwwLjEsMy43IGMwLjgsMS45L
+    DIuNSwyLjksNC45LDIuOWMxLjgsMCwzLjgtMC41LDUuNy0xLjFjMS43LTAuNSwzLjMtMC45LDQuMy0wLjljMC4yLDAsMC40LDAsMC42LDAuMWMtMC4yLDAuMS0wLjUsMC4zLTEsMC42IGMtMS4xLDAuNi0zLjYsMi0yLjUsNC41YzAuNywxLjYsMi41LDEuOCwzLjYsMS44bDAuMSwwYzAsMCwwLDAsMCwwYy0wLjEsMC4yLTAuMiwwLjMtMC40LDAuNmMtMC40LDAuNC0wLjYsMC44LTAuNiwxLjMgYy0wLjEsMC0wLjMsMC4xLTAuNSwwLjFjLTAuOCwwLTEuNSwwLjctMS41LDE
+    uNWMwLDAuNywwLjQsMS4yLDEuMSwxLjRjMC4yLDAuNiwwLjgsMS4xLDEuNCwxLjFjMC44LDAsMS41LTAuNywxLjUtMS41bDAtMC4zIGMwLjEtMC4xLDAuMS0wLjEsMC4yLTAuMmMwLjUsMCwwLjktMC4yLDEuMi0wLjZjMS43LTEuNywxLjYtMy4zLDEuNi00LjFjMC0xLjMtMC45LTIuNC0yLTIuOWMxLjMtMC45LDIuNy0yLjUsMS42LTQuOCBjLTAuOC0xLjctMi4yLTIuNi00LjQtMi42Yy0xLjcsMC0zLjUsMC41LTUuMywxYy0xLjgsMC41LTMuNCwwLjktNC42LDAuOWMtM
+    SwwLTEuMS0wLjMtMS4yLTAuNUMyMSwzMC4xLDIxLDI5LjksMjEsMjkuOCBjMC4xLTAuMiwwLjMtMC41LDAuOC0wLjljMC40LDAuNCwwLjksMC42LDEuMywwLjhjMC40LDAuMiwwLjksMC4zLDEuNCwwLjNjMC4yLDAsMC40LDAsMC42LTAuMWMwLjYtMC4xLDEuMi0wLjQsMS42LTAuNyBjMC40LTAuMywwLjYtMC44LDAuNC0xLjJjLTAuMS0wLjQtMC41LTAuNi0wLjktMC42Yy0wLjEsMC0wLjEsMC0wLjIsMGMtMC4yLDAtMC40LDAuMS0wLjYsMC4xYy0wLjEsMC0wLjIsMC0
+    wLjIsMCBjLTAuMiwwLTAuMy0wLjEtMC40LTAuMmMwLjItMC4xLDAuNS0wLjIsMC43LTAuM2MxLTAuNCwxLjYtMC42LDItMWMwLjEtMC4xLDAuMS0wLjEsMC4yLTAuMmMwLjEsMCwwLjMsMC4xLDAuNCwwLjEgQzI4LjYsMjYsMjksMjYsMjkuNCwyNmMwLjksMCwyLjktMC4xLDQuNS0xLjRjMC44LDAuMiwxLjUsMC40LDIuMiwwLjRjMC40LDAsMC45LTAuMSwxLjMtMC4yYzEuMi0wLjMsMi4zLTEuMSwyLjktMi4zIGMyLjItMy45LTEuMy03LjEtNC4yLTkuN0MzNC45LDExL
+    jcsMzMsMTAsMzMsOS4xYzAsMCwwLDAsMC0wLjFjMC4yLDAuMSwwLjQsMC4xLDAuOCwwLjNjMC42LDAuMiwxLjUsMC42LDIuNCwwLjYgYzEuMSwwLDEuOS0wLjUsMi41LTEuNWMwLjYtMSwwLjQtMS45LDAuMS0yLjVjMC4xLDAsMC4yLDAsMC4zLDBjMC42LDAsMS4yLTAuMywxLjYtMC44QzQxLjMsNS4xLDQyLDUsNDIuNSw1QzQzLjMsNSw0NCw0LjMsNDQsMy41IGMwLTAuNy0wLjQtMS4yLTEuMS0xLjRDNDIuNywxLjQsNDIuMiwxLDQxLjUsMUw0MS41LDF6Ii8+PHBhdGg
+    gZD0iTTEzLDI1Yy0yLjYsMC0yLjgtMi41LTIuOS0zLjhjMC0wLjMtMC4xLTAuOS0wLjItMS4xYy0wLjEsMC4xLTAuMSwwLjItMC4yLDAuM2MtMC4xLDAuMS0wLjIsMC4zLTAuMywwLjUgYy0wLjYsMS0xLjksMS40LTIuOSwxYy0wLjgtMC4zLTEuOC0xLjEtMi41LTIuNGMtMC4yLTAuNSwwLTEuMSwwLjQtMS4zYzAuNS0wLjIsMS4xLDAsMS4zLDAuNGMwLjQsMC43LDEsMS4zLDEuNCwxLjQgYzAuMiwwLjEsMC40LDAsMC41LTAuMmMwLjEtMC4xLDAuMi0wLjMsMC4yLTAuN
+    GMwLjMtMC42LDAuOC0xLjQsMi0xLjRjMS44LDAsMiwxLjksMi4xLDNjMC4yLDEuOCwwLjQsMiwwLjksMiBjMS41LDAsMS45LTIuMSwyLjUtNS40YzAuNi0zLjQsMS4zLTcuNiw1LTcuNmMyLjcsMCwzLjgsMS45LDQuMiw0LjFjMi4xLDAuNCwzLjcsMi43LDQuMSw0YzAuMiwwLjgsMC4yLDEuNi0wLjIsMi4zcy0xLDEuMi0xLjcsMS41IGMtMC44LDAuMi0xLjYsMC4yLTIuMy0wLjJjLTAuNy0wLjQtMS4yLTEtMS41LTEuN0MyMywxOS42LDIzLDE5LjEsMjMsMTguMmMwLTM
+    uNy0wLjQtNi4yLTIuNi02LjJjLTEuOSwwLTIuNCwyLjQtMyw2IEMxNi45LDIxLjMsMTYuMywyNSwxMywyNXogTTI1LDE2LjNjMCwwLjcsMCwxLjMsMCwxLjljMCwwLjUsMCwxLDAsMS4yYzAuMSwwLjIsMC4zLDAuNCwwLjUsMC42YzAuMiwwLjEsMC41LDAuMSwwLjgsMC4xIGMwLjMtMC4xLDAuNS0wLjMsMC42LTAuNWMwLjEtMC4yLDAuMS0wLjUsMC4xLTAuOEMyNi44LDE4LjEsMjYsMTYuOSwyNSwxNi4zeiIvPjxwYXRoIGQ9Ik0yNCAxNmMtLjMtLjEtLjctLjEtMS4xL
+    S4xLS40IDAtLjcuMS0xLjEuMi0uMy4xLS42LjQtLjkuNy0uMy4zLS40LjctLjUgMS4xLS4xLS40LS4xLS45IDAtMS40LjEtLjUuNC0uOS43LTEuMy40LS40LjgtLjcgMS4yLS45LjUtLjIuOS0uNCAxLjUtLjVsLjEgMGMuNi0uMSAxLjEuMyAxLjIuOFMyNSAxNS45IDI0LjUgMTZDMjQuMyAxNiAyNC4xIDE2IDI0IDE2ek0zLjUgMTguMWMtLjEgMC0uMSAwLS4yIDBDMy4xIDE4IDIuOCAxOCAyLjUgMTggMi4yIDE4IDIgMTcuOCAyIDE3LjVTMi4yIDE3IDIuNSAxN2MuNSA
+    wIC44IDAgMS4yLjJDNCAxNy4zIDQuMSAxNy42IDQgMTcuOCAzLjkgMTggMy43IDE4LjEgMy41IDE4LjF6Ii8+PHBhdGggZD0iTTQuNSAxOWMtLjEgMC0uMSAwLS4yLS4xLS4xIDAtMS4zLS43LTEuMy0yLjRDMyAxNi4yIDMuMiAxNiAzLjUgMTZTNCAxNi4yIDQgMTYuNWMwIDEuMS43IDEuNS43IDEuNi4yLjEuMy40LjIuN0M0LjkgMTguOSA0LjcgMTkgNC41IDE5ek0zNCA0M2MtLjMgMC0uNS0uMS0uNy0uMy0uNC0uNC0uNC0xIDAtMS40LjctLjcuNy0xLjQuNy0xLjggM
+    C0uMi0uMi0uMy0uNC0uNC0uMiAwLS40IDAtLjctLjEtMS0uMS0yLjMtLjItMi44LTEuMi0uNy0xLjcgMS0yLjYgMi4xLTMuMiAxLjctLjkgMS45LTEuMiAxLjYtMS44LS42LTEuMy0yLjgtLjgtNi4yLjEtMy43IDEtNy44IDIuMi05LjMtMS4zLS40LTEtLjUtMi0uMS0yLjkuNS0xLjIgMS42LTIuMSAyLjgtMi44LS4zLTIuMSAxLTQuMyAyLTUuMSAxLjItMS4xIDMuMS0xIDQuMi4yIDEuMSAxLjIgMSAzLjEtLjIgNC4yLS4zLjMtLjguNS0xLjcuOS0uNi4zLTEuNS42LTI
+    uMyAxLS4xLjEtLjIuMi0uMy4yLS4xIDAtLjEuMS0uMi4xLTEgLjYtMiAxLjMtMi4zIDIuMS0uMi40LS4yLjkuMSAxLjQuOCAxLjcgMy4zIDEuMiA3IC4yIDMuNC0uOSA3LjItMiA4LjYgMSAxIDIuMy0xLjIgMy42LTIuNSA0LjMtLjMuMi0uOC40LTEgLjYuMyAwIC42LjEuOS4xLjMgMCAuNiAwIC44LjEgMS4yLjIgMi4xIDEuMiAyLjEgMi4zIDAgLjYuMSAyLTEuMyAzLjNDMzQuNSA0Mi45IDM0LjMgNDMgMzQgNDN6TTI1IDIyYy0uMiAwLS41LjEtLjcuMy0uNC40LTEuM
+    iAxLjUtMS4zIDIuNi41LS4yIDEtLjQgMS41LS42LjUtLjIgMS0uNCAxLjItLjUuNC0uMy40LTEgMC0xLjRDMjUuNSAyMi4xIDI1LjMgMjIgMjUgMjJ6Ii8+PHBhdGggZD0iTTIzLjIgMjYuMWMwIC4zLjIuNy4zIDEgLjIuMy4zLjYuNi45LjIuMy42LjQgMSAuNS40LjEuOC4xIDEuMiAwLS40LjItLjguNS0xLjIuNS0uNS4xLTEgMC0xLjUtLjItLjUtLjItLjktLjUtMS4zLS44LS40LS40LS43LS43LTEtMS4ybC0uMS0uMWMtLjMtLjUtLjEtMS4xLjQtMS40LjUtLjMgMS4
+    xLS4xIDEuNC40QzIzLjIgMjUuOCAyMy4yIDI1LjkgMjMuMiAyNi4xek0zMi41IDQ1Yy0uMyAwLS41LS4yLS41LS41bDAtLjVjMC0uMiAwLS40IDAtLjYgMC0uMy4zLS41LjUtLjUuMyAwIC41LjIuNS41IDAgLjIgMCAuMyAwIC41bDAgLjVDMzMgNDQuOCAzMi44IDQ1IDMyLjUgNDV6Ii8+PHBhdGggZD0iTTMxLjUgNDRjLS4zIDAtLjUtLjItLjUtLjVzLjItLjUuNS0uNWMxLjEgMCAxLjUtLjcgMS42LS43LjEtLjIuNC0uMy43LS4yLjIuMS4zLjQuMi43QzMzLjkgNDIuO
+    CAzMy4zIDQ0IDMxLjUgNDR6TTI5LjQgMjVjLS40IDAtLjcgMC0xLS4xLTEuNi0uMy0yLjctMS45LTIuNC0zLjUuMi0uOC42LTEuNSAxLjMtMS45LjctLjQgMS41LS42IDIuMy0uNS40LjEuOC4zIDEuNy45LjYuNCAxLjQuOCAyLjIgMS4yIDAgMCAwIDAgMCAwIC4yIDAgLjMgMCAuNS4xLjEuMS4yLjEuMy4yLjkuNCAxLjguNiAyLjQuNC40LS4xLjgtLjQgMS4xLS45IDEtMS43LS44LTMuNS0zLjUtNkMzMiAxMy4xIDMwIDExLjMgMzAgOS4yYzAtLjYuMS0xLjIuNC0xLjd
+    DMzEuMSA2LjMgMzIgNiAzMi43IDZjLjggMCAxLjYuMyAyLjMuNi4yLjEuNi4yLjguMyAwIDAgMCAwIDAgMC0uMi0uMi0uMy0uNC0uNS0uN0MzNS4xIDUuOCAzNSA1LjQgMzUgNWMwLS42LjMtMS4xLjktMS41QzM2LjYgMy4xIDM4LjEgMyAzOSAzYy42IDAgMSAuNCAxIDFzLS40IDEtMSAxYy0uOCAwLTEuNi4xLTIgLjIgMCAwIDAgMCAwIDAgLjEuMi4yLjQuMy41QzM3LjggNi4yIDM4LjMgNyAzNy44IDhjLS45IDEuNi0yLjUuOS0zLjYuNEMzMy43IDguMiAzMy4xIDggM
+    zIuNyA4Yy0uMSAwLS4zIDAtLjYuNEMzMiA4LjYgMzIgOC45IDMyIDkuMWMwIDEuMyAxLjggMi45IDMuNSA0LjQgMi43IDIuNCA1LjcgNS4yIDQgOC40LS41IDEtMS4zIDEuNi0yLjMgMS45LTEuMS4zLTIuMy4xLTMuNC0uNEMzMi42IDI0LjYgMzAuOCAyNSAyOS40IDI1ek0yOSAyMWMtLjIgMC0uNC4xLS42LjItLjIuMS0uNC40LS40LjYtLjEuNS4zIDEuMS44IDEuMi41LjEgMS45LjEgMi45LS41LS41LS4zLTEtLjYtMS41LS45LS40LS4zLS45LS42LTEuMS0uNkMyOS4
+    xIDIxIDI5LjEgMjEgMjkgMjF6Ii8+PHBhdGggZD0iTTMyLjYgMjEuN2MuMi0uMi40LS42LjYtLjkuMi0uMy4zLS43LjMtMS4xIDAtLjQgMC0uNy0uMi0xLjEtLjEtLjQtLjQtLjctLjgtMSAuNC4yLjguMyAxLjIuNy4zLjMuNi44LjggMS4zLjEuNS4yIDEgLjIgMS41IDAgLjUtLjEgMS0uMyAxLjVsMCAuMWMtLjIuNS0uOC44LTEuMy42cy0uOC0uOC0uNi0xLjNDMzIuNCAyMS45IDMyLjUgMjEuOCAzMi42IDIxLjd6TTQwLjggNC4xYy0uMiAwLS40LS4yLS41LS40IDAtL
+    jMuMS0uNS40LS42LjEgMCAuMi0uMi4yLS42QzQxIDIuMiA0MS4yIDIgNDEuNSAyUzQyIDIuMiA0MiAyLjVDNDIgMy4zIDQxLjUgNCA0MC44IDQuMSA0MC45IDQuMSA0MC45IDQuMSA0MC44IDQuMXoiLz48cGF0aCBkPSJNMzksNC41Yy0wLjIsMC0wLjQtMC4yLTAuNS0wLjRjLTAuMS0wLjMsMC4xLTAuNSwwLjQtMC42QzM5LDMuNSw0MSwzLDQyLjUsM0M0Mi44LDMsNDMsMy4yLDQzLDMuNVM0Mi44LDQsNDIuNSw0IGMtMS40LDAtMy40LDAuNS0zLjQsMC41QzM5LjEsNC41LDM5LDQuNSwzOSw0LjV6Ii8+PC9zdmc+Cg==</data><downloads_count>0</downloads_count></logo>
+  <finalclass>Brand</finalclass>
+  <friendlyname>Razer</friendlyname>
+</Brand>
+<Brand alias="Brand" id="11">
+  <name>Samsung</name>
+  <logo><mimetype>image/svg+xml</mimetype><filename>icons8-samsung.svg</filename><data>PD94bWwgdmVyc2lvbj0iMS4wIj8+CjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2aWV3Qm94PSIwIDAgNDggNDgiIHdpZHRoPSI0OHB4IiBoZWlnaHQ9IjQ4cHgiPjxwYXRoIGZpbGw9IiMwZDQ3YTEiIGQ9Ik00Ny45NywxOS44MjZjMC42NTQsMy43NDctOS41NDcsOC42NTUtMjIuNzg4LDEwLjk2Yy0xMy4yMzgsMi4zMDYtMjQuN
+    SwxLjEzNi0yNS4xNTMtMi42MTMgYy0wLjY1My0zLjc0Nyw5LjU1MS04LjY1NCwyMi43OS0xMC45NThDMzYuMDU5LDE0LjkwNyw0Ny4zMTgsMTYuMDc4LDQ3Ljk3LDE5LjgyNnoiLz48cG9seWdvbiBmaWxsPSIjZmFmYWZhIiBwb2ludHM9IjM1LjUxLDI1LjM4OCAzNS40NDIsMjEuNDkyIDM2LjY3MSwyMS40OTIgMzYuNjcxLDI2LjQwMyAzNC45MDUsMjYuNDAzIDMzLjY3OCwyMi4zNzMgMzMuNjUyLDIyLjM3MyAzMy43MiwyNi40MDMgMzIuNDk5LDI2LjQwMyAzMi40OTk
+    sMjEuNDkyIDM0LjM0MiwyMS40OTIgMzUuNDgzLDI1LjM4OCIvPjxwb2x5Z29uIGZpbGw9IiNmYWZhZmEiIHBvaW50cz0iMTMuMTc3LDIxLjk1MiAxMi40OTcsMjYuNDU1IDExLjE1NywyNi40NTUgMTIuMDc2LDIxLjQ5MiAxNC4yODQsMjEuNDkyIDE1LjIwMSwyNi40NTUgMTMuODY1LDI2LjQ1NSAxMy4yMDQsMjEuOTUyIi8+PHBvbHlnb24gZmlsbD0iI2ZhZmFmYSIgcG9pbnRzPSIxOC45NjQsMjUuMjg2IDE5LjU3NywyMS40OTIgMjEuNjAxLDIxLjQ5MiAyMS43MDgsM
+    jYuNDU1IDIwLjQ2OCwyNi40NTUgMjAuNDM1LDIxLjk5MyAyMC40MDksMjEuOTkzIDE5LjU4LDI2LjQ1NSAxOC4zMjEsMjYuNDU1IDE3LjQ5LDIxLjk5MyAxNy40NjQsMjEuOTkzIDE3LjQzMywyNi40NTUgMTYuMTksMjYuNDU1IDE2LjMsMjEuNDkyIDE4LjMyNSwyMS40OTIgMTguOTM3LDI1LjI4NiIvPjxwYXRoIGZpbGw9IiNmYWZhZmEiIGQ9Ik05LjA2NywyNS4wNTVjMC4wNDksMC4xMiwwLjAzNCwwLjI3NSwwLjAxMSwwLjM2OGMtMC4wNDIsMC4xNjUtMC4xNTQsMC4
+    zMzMtMC40ODMsMC4zMzMgYy0wLjMxMiwwLTAuNS0wLjE3OS0wLjUtMC40NXYtMC40OEg2Ljc2M0w2Ljc2MiwyNS4yMWMwLDEuMTA2LDAuODcxLDEuNDQxLDEuODA1LDEuNDQxYzAuODk4LDAsMS42MzctMC4zMDcsMS43NTQtMS4xMzQgYzAuMDYxLTAuNDI5LDAuMDE1LTAuNzA5LTAuMDA1LTAuODE2Yy0wLjIwOS0xLjAzOS0yLjA5My0xLjM0OS0yLjIzMy0xLjkzYy0wLjAyNC0wLjA5OS0wLjAxNy0wLjIwNS0wLjAwNS0wLjI2MiBjMC4wMzUtMC4xNTgsMC4xNDMtMC4zM
+    zIsMC40NTMtMC4zMzJjMC4yOSwwLDAuNDYxLDAuMTgsMC40NjEsMC40NWMwLDAuMDkxLDAsMC4zMDcsMCwwLjMwN2gxLjIzN3YtMC4zNDggYzAtMS4wODEtMC45Ny0xLjI1LTEuNjczLTEuMjVjLTAuODgzLDAtMS42MDQsMC4yOTItMS43MzYsMS4wOTljLTAuMDM2LDAuMjIzLTAuMDQxLDAuNDIyLDAuMDExLDAuNjcxIEM3LjA0OSwyNC4xMTgsOC44MTEsMjQuNDEyLDkuMDY3LDI1LjA1NXoiLz48cGF0aCBmaWxsPSIjZmFmYWZhIiBkPSJNMjUuMjA0LDI1LjA0NmMwLjA
+    0OSwwLjExOSwwLjAzMywwLjI3LDAuMDExLDAuMzYzYy0wLjA0MSwwLjE2NS0wLjE1MiwwLjMzLTAuNDc5LDAuMzMgYy0wLjMwNywwLTAuNDk0LTAuMTc5LTAuNDk0LTAuNDQ0bC0wLjAwMS0wLjQ3NmgtMS4zMThsLTAuMDAyLDAuMzc5YzAsMS4wOTUsMC44NjMsMS40MjYsMS43ODcsMS40MjYgYzAuODg4LDAsMS42Mi0wLjMwMywxLjczNi0xLjEyMmMwLjA2MS0wLjQyNiwwLjAxOC0wLjcwMi0wLjAwNC0wLjgwN2MtMC4yMDgtMS4wMjktMi4wNzMtMS4zMzYtMi4yMTEtM
+    S45MTIgYy0wLjAyNC0wLjA5OS0wLjAxNy0wLjIwMy0wLjAwNS0wLjI1N2MwLjAzNi0wLjE2LDAuMTQyLTAuMzI5LDAuNDQ5LTAuMzI5YzAuMjg4LDAsMC40NTUsMC4xNzUsMC40NTUsMC40NDQgYzAsMC4wOSwwLDAuMzA0LDAsMC4zMDRoMS4yMjh2LTAuMzQ1YzAtMS4wNy0wLjk2Mi0xLjIzNy0xLjY1OS0xLjIzN2MtMC44NzMsMC0xLjU4OCwwLjI4OC0xLjcxNywxLjA5IGMtMC4wMzYsMC4yMi0wLjA0LDAuNDE1LDAuMDEyLDAuNjYzQzIzLjIwNiwyNC4xMTgsMjQuOTU
+    xLDI0LjQxLDI1LjIwNCwyNS4wNDZ6Ii8+PHBhdGggZmlsbD0iI2ZhZmFmYSIgZD0iTTI5LjM3MiwyNS43MTNjMC4zNDQsMCwwLjQ1MS0wLjIzOCwwLjQ3NS0wLjM2YzAuMDEtMC4wNTQsMC4wMTMtMC4xMjUsMC4wMTItMC4xOVYyMS40OWgxLjI1NSB2My41NmMwLjAwMywwLjA5MS0wLjAwNiwwLjI3OS0wLjAxMSwwLjMyNWMtMC4wODgsMC45MjctMC44MjEsMS4yMjctMS43MzIsMS4yMjdjLTAuOTEzLDAtMS42NDYtMC4zMDEtMS43MzMtMS4yMjcgYy0wLjAwNC0wLjA0N
+    y0wLjAxMy0wLjIzNS0wLjAxMS0wLjMyNXYtMy41NmgxLjI1NHYzLjY3MmMwLDAuMDY0LDAuMDAyLDAuMTM3LDAuMDEyLDAuMTkgQzI4LjkyMSwyNS40NzMsMjkuMDI1LDI1LjcxMywyOS4zNzIsMjUuNzEzeiIvPjxwYXRoIGZpbGw9IiNmYWZhZmEiIGQ9Ik0zOS43MjUsMjUuNjZjMC4zNTksMCwwLjQ4NS0wLjIyNywwLjUwOC0wLjM1OWMwLjAwOS0wLjA1NywwLjAxMi0wLjEyNiwwLjAxMS0wLjE4OXYtMC43MiBoLTAuNTA5di0wLjcyNGgxLjc2VjI1Yy0wLjAwMSwwLjA
+    5My0wLjAwMywwLjE2Mi0wLjAxOCwwLjMyN2MtMC4wODIsMC45MDMtMC44NjYsMS4yMjUtMS43NDUsMS4yMjUgYy0wLjg4MSwwLTEuNjYzLTAuMzIyLTEuNzQ3LTEuMjI1Yy0wLjAxNC0wLjE2Ni0wLjAxNi0wLjIzNC0wLjAxOC0wLjMyN2wwLjAwMS0yLjA4OWMwLTAuMDg4LDAuMDExLTAuMjQ0LDAuMDIxLTAuMzI3IGMwLjExLTAuOTI4LDAuODYyLTEuMjI2LDEuNzQzLTEuMjI2YzAuODgsMCwxLjY1MSwwLjI5NywxLjc0MiwxLjIyNmMwLjAxNiwwLjE1OCwwLjAxMSwwL
+    jMyNywwLjAxMSwwLjMyN3YwLjE2NmgtMS4yNTF2LTAuMjc4IGMwLjAwMSwwLjAwMS0wLjAwMi0wLjExOC0wLjAxNi0wLjE4OWMtMC4wMjEtMC4xMS0wLjExNi0wLjM2Mi0wLjQ5NS0wLjM2MmMtMC4zNjIsMC0wLjQ2NywwLjIzOC0wLjQ5NCwwLjM2MiBjLTAuMDE1LDAuMDY1LTAuMDIxLDAuMTU0LTAuMDIxLDAuMjM0djIuMjdjLTAuMDAxLDAuMDYzLDAuMDAzLDAuMTMyLDAuMDEzLDAuMTg5QzM5LjI0MSwyNS40MzMsMzkuMzY2LDI1LjY2LDM5LjcyNSwyNS42NnoiLz48L3N2Zz4K</data><downloads_count>0</downloads_count></logo>
+  <finalclass>Brand</finalclass>
+  <friendlyname>Samsung</friendlyname>
+</Brand>
+<Brand alias="Brand" id="12">
+  <name>Sony</name>
+  <logo><mimetype>image/svg+xml</mimetype><filename>icon-sony.svg</filename><data>PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+Cjxzdmc6c3ZnIHhtbG5zOmlua3NjYXBlPSJodHRwOi8vd3d3Lmlua3NjYXBlLm9yZy9uYW1lc3BhY2VzL2lua3NjYXBlIiB4bWxuczpzb2RpcG9kaT0iaHR0cDovL3NvZGlwb2RpLnNvdXJjZWZvcmdlLm5ldC9EVEQvc29kaXBvZGktMC5kdGQiIHhtbG5zOnN2Zz0iaH
+    R0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxMjgwIDEyODAiIHZlcnNpb249IjEuMSIgaWQ9InN2ZzEiIHNvZGlwb2RpOmRvY25hbWU9Imljb24tc29ueS5zdmciIGlua3NjYXBlOnZlcnNpb249IjEuNC4zICgwZDE1Zjc1MDQyLCAyMDI1LTEyLTI1KSIgd2lkdGg9IjEyODAiIGhlaWdodD0iMTI4MCI+PHNvZGlwb2RpOm5hbWVkdmlldyBpZD0ibmFtZWR2aWV3MSIgcGFnZWNvbG9yPSIjZmZmZmZmIiBib3JkZXJjb2xvcj0iIzAwMDAwMCIgYm9y
+    ZGVyb3BhY2l0eT0iMC4yNSIgaW5rc2NhcGU6c2hvd3BhZ2VzaGFkb3c9IjIiIGlua3NjYXBlOnBhZ2VvcGFjaXR5PSIwLjAiIGlua3NjYXBlOnBhZ2VjaGVja2VyYm9hcmQ9IjAiIGlua3NjYXBlOmRlc2tjb2xvcj0iI2QxZDFkMSIgaW5rc2NhcGU6em9vbT0iMC42MzQxODYzOSIgaW5rc2NhcGU6Y3g9Ii00NjIuNzk3NjkiIGlua3NjYXBlOmN5PSIyMjUuNDg1NzYiIGlua3NjYXBlOndpbmRvdy13aWR0aD0iMjU2MCIgaW5rc2NhcGU6d2luZG93LWhlaWdodD0iMTM2MC
+    IgaW5rc2NhcGU6d2luZG93LXg9IjAiIGlua3NjYXBlOndpbmRvdy15PSIwIiBpbmtzY2FwZTp3aW5kb3ctbWF4aW1pemVkPSIxIiBpbmtzY2FwZTpjdXJyZW50LWxheWVyPSJnNCIgc2hvd2d1aWRlcz0idHJ1ZSI+PHNvZGlwb2RpOmd1aWRlIHBvc2l0aW9uPSIxNzMuMzcxMDgsNjQxLjg5MDI0IiBvcmllbnRhdGlvbj0iMCwtMSIgaWQ9Imd1aWRlMSIgaW5rc2NhcGU6bG9ja2VkPSJmYWxzZSIvPjwvc29kaXBvZGk6bmFtZWR2aWV3Pjxzdmc6ZGVmcyBpZD0iZGVmczEi
+    Lz48c3ZnOmcgaWQ9IkxheWVyXzIiPjxzdmc6ZyBpZD0iZzQiIGlua3NjYXBlOmxhYmVsPSJsb2dvIj48c3ZnOnBhdGggZD0ibSA0NTYuMDEyOSw3NTEuNzQ2ODcgYyAtNDYuNDEyNzksMCAtODkuNDIwNzksLTEzLjgyMzk5IC0xMTguMDkyNzksLTM5LjYwMzE5IGEgOTYuODk1OTg5LDk2Ljg5NTk4OSAwIDAgMSAtMzIuMTI3OTksLTczLjE5MDM5IDk4LjMyOTU4OCw5OC4zMjk1ODggMCAwIDEgMzIuMTI3OTksLTcyLjkzNDQgYyAyNi42MjQsLTI0LjE5MTk5IDczLjcyOC
+    wtMzkuNTUxOTkgMTE4LjA5Mjc5LC0zOS41NTE5OSA0OS4wNzUxOSwwIDg4LjM3MTE5LDEyLjM2NDggMTE4LjM5OTk5LDM5LjYwMzE5IGEgOTcuNDA3OTg5LDk3LjQwNzk4OSAwIDAgMSAzMS42OTI3OSw3Mi44ODMyIDEwMS41Mjk1OSwxMDEuNTI5NTkgMCAwIDEgLTMxLjY5Mjc5LDczLjE5MDM5IGMgLTI3Ljk4MDgsMjUuOTMyOCAtNzEuOTEwNCwzOS42MDMxOSAtMTE4LjM5OTk5LDM5LjYwMzE5IHYgLTI5LjY0NDc5IGMgMjQuNjAxNiwwIDQ3LjQzNjc5LC04LjQ5OTIg
+    NjMuMzg1NTksLTI0LjM3MTIgMTUuOTQ4OCwtMTUuODcyIDIzLjE5MzYsLTM1LjEyMzIgMjMuMTkzNiwtNTguODc5OTkgMCwtMjIuNjgxNiAtNy45NjE2LC00My44Nzg0IC0yMy4xOTM2LC01OC44OCAtMTUuNzQ0LC0xNS40ODc5OSAtMzkuMTE2NzksLTI0LjIxNzU5IC02My4zODU1OSwtMjQuMjE3NTkgLTI0LjI2ODgsMCAtNDcuNzQzOTksOC42NTI4IC02My40ODc5OSwyNC4yMTc1OSAtMTUuMTgwOCwxNS4wMjcyIC0yMy4wNCwzNi4zMDA4IC0yMy4wNCw1OC44OCBhID
+    gyLjM1NTE5LDgyLjM1NTE5IDAgMCAwIDIzLjA0LDU4Ljg3OTk5IGMgMTUuNzQ0LDE1LjY5MjggMzkuMDY1NTksMjQuMzcxMiA2My40ODc5OSwyNC4zNzEyIHogTSAxMTcuMTIwMTQsNTI2LjQ2NjkgYyAtMjQuODA2MzkyLDAgLTUyLjk5MTk4OSw0LjY1OTIgLTc2Ljc5OTk4NiwxNS4zNiBDIDE4LjA5OTM1NSw1NTEuNzU5NyAxLjU3NWUtNCw1NjcuNzA4NDkgMS41NzVlLTQsNTk0LjE1MzI5IGEgNTQuMjIwNzk0LDU0LjIyMDc5NCAwIDAgMCAxNC43MTk5OTg1LDM3LjI3
+    MzYgYyA2LjQyNTU5OSw1LjkzOTIgMTYuNzkzNTk5LDE2LjAyNTYgNDMuODc4Mzk2LDIxLjk2NDggMTIuMTA4Nzk4LDIuNTU5OTkgMzcuOTkwMzk1LDYuNjgxNTkgNjMuNzY5NTg4LDkuMzk1MTkgMjUuNzc5MiwyLjcxMzYgNTAuNzY0OCw1LjEyIDYxLjAwNDgsNy44NTkyIDguMTQwOCwyLjA3MzYgMjEuODM2NzksNC44ODk2IDIxLjgzNjc5LDIwLjI0OTYgMCwxNS4zNiAtMTQuNDEyNzksMTkuOTY4IC0xNi45MjE1OSwyMC45NjY0IC0yLjUwODgsMC45OTg0IC0xOS44MT
+    Q0LDguOTM0NCAtNTAuODkyOCw4LjkzNDQgYSAyMTYuNDIyMzcsMjE2LjQyMjM3IDAgMCAxIC02MC41OTUxOSwtMTAuNDE5MiBjIC0xMS41OTY3OTksLTQuMTQ3MiAtMjMuNzU2Nzk3LC05LjYgLTM1LjA5NzU5NiwtMjMuNDQ5NiBhIDQwLjI2ODc5NSw0MC4yNjg3OTUgMCAwIDEgLTcuMjk1OTk5LC0yMi4yMjA4IEggNi4yNDY1NTY3IHYgNzguODQ3OTkgSCAzNy41Mjk3NTQgdiAtMTAuNjc1MTkgYSA0LjQ1NDM5OTUsNC40NTQzOTk1IDAgMCAxIDYuNzU4NCwtMy44NCAy
+    NDYuNDI1NTcsMjQ2LjQyNTU3IDAgMCAwIDQ1Ljc3Mjc5NCwxNC43OTY3OSBjIDE2LjQzNTIwMiwzLjQzMDQgMjcuMDU5MTkyLDUuOTEzNiA0Ny40ODc5OTIsNS45MTM2IGEgMjAyLjYyMzk4LDIwMi42MjM5OCAwIDAgMCA2My42NDE2LC04Ljk4NTYgMTExLjA3ODM5LDExMS4wNzgzOSAwIDAgMCAzNy44MTExOSwtMTguNjYyMzkgNTEuODE0Mzk0LDUxLjgxNDM5NCAwIDAgMCAyMC4yNDk1OSwtNDEuNDk3NiA1OC4wNjA3OTMsNTguMDYwNzkzIDAgMCAwIC0xNi4zNTgzOS
+    wtNDAuODA2MzkgNzIuMDEyNzkyLDcyLjAxMjc5MiAwIDAgMCAtMjAuMTcyOCwtMTMuNzk4NCAxNDguNjA3OTgsMTQ4LjYwNzk4IDAgMCAwIC0yNC44ODMxOSwtOC42Nzg0IGMgLTE2LjIzMDQsLTMuOTY4IC01Mi42ODQ4LC04LjkzNDQgLTcwLjExODQsLTEwLjY3NTIgLTE4LjI3ODM5LC0xLjg5NDQgLTQ5Ljk5Njc5LC00LjUzMTIgLTYyLjY2ODc4OSwtOC40NDggLTMuODM5OTk5LC0xLjIwMzIgLTExLjY3MzU5OSwtNC45MTUyIC0xMS42NzM1OTksLTE0LjAwMzIgMCwt
+    Ni40NzY4IDMuNTg0LC0xMS45NTUyIDEwLjY0OTU5OSwtMTYuMzg0IEMgNzUuMjY0MTUsNTYwLjc3MDkgOTcuOTQ1NzQ3LDU1Ni4zOTMzIDEyMS42MDAxNCw1NTYuMzkzMyBhIDE2Ni45ODg3OCwxNjYuOTg4NzggMCAwIDEgNjYuNzEzNiwxMy4wMzAzOSA3Mi44NTc1OTEsNzIuODU3NTkxIDAgMCAxIDE1Ljg3MTk5LDkuNDcyIDQ3LjcxODM5NCw0Ny43MTgzOTQgMCAwIDEgMTUuNjQxNiwyNi4xNjMyIGggMjUuMjY3MiBWIDUzNi40MjUzIGggLTI4LjE2IHYgNy45NjE2IG
+    MgMCwyLjU2IC0yLjU2LDUuOTM5MiAtNy42OCwzLjE0ODggLTEyLjY5NzU5LC02LjYwNDggLTQ4LjM4Mzk5LC0yMC44ODk2IC05Mi4xMzQzOSwtMjEuMDY4OCB6IG0gNjE4LjIxNDMzLDEyLjU5NTIgMTM3LjYyNTU4LDEyNC4xODU1OCAtMS40MDgsLTgzLjYwOTU5IGMgLTAuMTUzNiwtMTAuOTgyNCAtMi4xNTA0LC0xNS41NjQ3OSAtMTQuMDI4OCwtMTUuNTY0NzkgaCAtMjUuODU1OTkgdiAtMjUuMDExMiBoIDExNy43NTk5OCB2IDI1LjAxMTIgaCAtMjUuMjY3MTkgYyAt
+    MTIuMDgzMiwwIC0xMi44LDMuODkxMTkgLTEzLjAwNDgsMTUuNTY0NzkgbCAyLjEyNDgsMTU5Ljc2OTU5IGggLTQwLjMyIEwgNzE0LjQxOTI3LDU5Ny45NDIwOSB2IDEwMC4zNzc1OSBjIDAuMTI4LDEwLjkzMTIgMC42NCwxNi4wNzY4IDExLjg3ODQsMTYuMDc2OCBoIDI4LjE2IHYgMjUuMDExMiBIIDYzOS4wMjcyOCB2IC0yNS4wMTEyIGggMjcuMDMzNiBjIDEwLjA4NjM5LDAgOS42NzY3OSwtOS42MjU2IDkuNjc2NzksLTE2LjY0IFYgNTgwLjU4NTI5IGMgMCwtNy42OC
+    AtMS4wNzUyLC0xNi40ODYzOSAtMTYuODk1OTksLTE2LjQ4NjM5IGggLTIxLjkxMzYgViA1MzkuMDYyMSBaIE0gMTA4My43NzYsNzE0LjM0NTI4IGEgNTUuODU5MTkzLDU1Ljg1OTE5MyAwIDAgMCA2Ljk2MzIsLTAuNDM1MiA4LjYyNzE5OSw4LjYyNzE5OSAwIDAgMCA1LjQyNzIsLTQuODEyOCAyOC4wMDYzOTcsMjguMDA2Mzk3IDAgMCAwIDAuNTM3NiwtNS40MDE2IHYgLTM5LjU1MiBjIDAsLTEuMzMxMiAwLC0xLjM1NjggLTEuNjg5NiwtMy40NTYgLTEuNjg5NiwtMi4w
+    OTkyIC03Mi4wODk2LC04MS45MTk5OSAtNzUuMjg5NiwtODUuNTAzOTkgLTMuOTkzNiwtNC4zNTIgLTExLjAwOCwtMTEuMDg0NzkgLTIxLjY4MzIsLTExLjA4NDc5IGggLTI0LjQ0Nzk2IHYgLTI1LjAzNjggaCAxMzcuOTgzOTYgdiAyNC45ODU2IGggLTE2LjY0IGMgLTMuODQsMCAtNi40LDMuNjYwNzkgLTMuMTIzMiw3LjY3OTk5IDAsMCA0Ni40Mzg0LDU1LjU1MiA0Ni44NzM2LDU2LjE0MDggMC40MzUyLDAuNTg4OCAwLjgxOTIsMC43MTY4IDEuNDA4LDAuMTc5MiAwLj
+    U4ODgsLTAuNTM3NiA0Ny41OTA0LC01NS44MDggNDcuOTQ4OCwtNTYuMzIgYSA0Ljc4NzE5OTQsNC43ODcxOTk0IDAgMCAwIC00LjA5NiwtNy42Nzk5OSBoIC0xNy4wNzUyIFYgNTM5LjA2MjEgSCAxMjgwIHYgMjUuMDM2OCBoIC0yNS4yNjcyIGMgLTkuMTY0OCwwIC0xMi44LDEuNjg5NTkgLTE5Ljc4ODgsOS40NzE5OSBsIC03Ni4xNiw4Ni44ODYzOSBhIDUuMzc1OTk5NCw1LjM3NTk5OTQgMCAwIDAgLTAuOTIxNiwzLjY4NjQgdiAzOS41MjY0IGEgMjguMTU5OTk3LDI4
+    LjE1OTk5NyAwIDAgMCAwLjU2MzIsNS40MDE2IDguNTI0Nzk5LDguNTI0Nzk5IDAgMCAwIDUuNDAxNiw0LjgxMjggNTAuNjExMTk0LDUwLjYxMTE5NCAwIDAgMCA2LjkxMiwwLjQzNTIgaCAyNS44MzA0IHYgMjUuMDM2OCBoIC0xMzcuMjY3MiB2IC0yNS4wMzY4IHoiIGlkPSJwYXRoMSIgZmlsbD0iIzAwMDAwMCIgc3R5bGU9InN0cm9rZS13aWR0aDoyLjU2Ii8+PC9zdmc6Zz48L3N2ZzpnPjwvc3ZnOnN2Zz4K</data><downloads_count>0</downloads_count></logo>
+  <finalclass>Brand</finalclass>
+  <friendlyname>Sony</friendlyname>
+</Brand>
+<Brand alias="Brand" id="13">
+  <name>Toshiba</name>
+  <logo><mimetype>image/svg+xml</mimetype><filename>logo-toshiba.svg</filename><data>PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+Cjxzdmc6c3ZnIHhtbG5zOmlua3NjYXBlPSJodHRwOi8vd3d3Lmlua3NjYXBlLm9yZy9uYW1lc3BhY2VzL2lua3NjYXBlIiB4bWxuczpzb2RpcG9kaT0iaHR0cDovL3NvZGlwb2RpLnNvdXJjZWZvcmdlLm5ldC9EVEQvc29kaXBvZGktMC5kdGQiIHhtbG5zOnN2Zz0
+    iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbDpzcGFjZT0icHJlc2VydmUiIHdpZHRoPSI4MDAiIGhlaWdodD0iODAwIiB2ZXJzaW9uPSIxLjAiIHZpZXdCb3g9IjAgMCA4MDAgODAwLjAxOTY5IiBpZD0ic3ZnMSIgc29kaXBvZGk6ZG9jbmFtZT0ibG9nby10b3NoaWJhLnN2ZyIgaW5rc2NhcGU6dmVyc2lvbj0iMS40LjMgKDBkMTVmNzUwNDIsIDIwMjUtMTItMjUpIj48c3ZnOmRlZnMgaWQ9ImRlZnMxIi8+PHNvZGlwb2RpOm5hbWVkdmlldyBpZD0ibmFtZWR2a
+    WV3MSIgcGFnZWNvbG9yPSIjZmZmZmZmIiBib3JkZXJjb2xvcj0iIzAwMDAwMCIgYm9yZGVyb3BhY2l0eT0iMC4yNSIgaW5rc2NhcGU6c2hvd3BhZ2VzaGFkb3c9IjIiIGlua3NjYXBlOnBhZ2VvcGFjaXR5PSIwLjAiIGlua3NjYXBlOnBhZ2VjaGVja2VyYm9hcmQ9IjAiIGlua3NjYXBlOmRlc2tjb2xvcj0iI2QxZDFkMSIgc2hvd2d1aWRlcz0idHJ1ZSIgaW5rc2NhcGU6em9vbT0iMS41MzgxMjUiIGlua3NjYXBlOmN4PSIzNzguNzA3ODQiIGlua3NjYXBlOmN5PSIyODg
+    uMDEzIiBpbmtzY2FwZTp3aW5kb3ctd2lkdGg9IjI1NjAiIGlua3NjYXBlOndpbmRvdy1oZWlnaHQ9IjEzNjAiIGlua3NjYXBlOndpbmRvdy14PSIwIiBpbmtzY2FwZTp3aW5kb3cteT0iMCIgaW5rc2NhcGU6d2luZG93LW1heGltaXplZD0iMSIgaW5rc2NhcGU6Y3VycmVudC1sYXllcj0ic3ZnMSI+PHNvZGlwb2RpOmd1aWRlIHBvc2l0aW9uPSIyMjcuMzE3MTYsMzk5LjM4NTQyIiBvcmllbnRhdGlvbj0iMCwtMSIgaWQ9Imd1aWRlMSIgaW5rc2NhcGU6bG9ja2VkPSJmY
+    WxzZSIvPjwvc29kaXBvZGk6bmFtZWR2aWV3PgogIDxzdmc6cGF0aCBmaWxsPSIjZTYxZTFlIiBkPSJtIDc2Ni4xMDAxNiw0NTkuNzEzNiBoIDM0LjU1IGwgLTM1LjY1LC0xMTcuNjYgLTQ5LjEsLTAuMDAyIC0zNS42NSwxMTcuNjYgaCAzNC41NiBsIDYuMywtMjEuNzggaCAzOC42NiBsIDYuMzMsMjEuNzggbSAtMzcuNTEsLTQ3Ljk0MyAxMS43NiwtNDAuNjUxIGggMC4yIGwgMTEuNzYsNDAuNjUxIHogbSAtNTU1LjQ2LDUwLjA1NSBjIDM1LjQ4LDAgNTIuNjMsLTYuMjU
+    gNTUuMDYsLTM4LjI2NSAwLjU4LC03LjYxOCAwLjY5LC0xNS40MzkgMC42OSwtMjIuNjg5IDAuMDEsLTcuMjI1IC0wLjExLC0xNS4wNTQgLTAuNjksLTIyLjY3MSAtMi40MywtMzIuMDI1IC0xOS41OCwtMzguMjY1IC01NS4wNiwtMzguMjY1IC0zNS40OCwwIC01Mi42Miw2LjI0IC01NS4wNCwzOC4yNjUgLTAuNTksNy42MTcgLTAuNzEsMTUuNDQ2IC0wLjcxLDIyLjY3MSAwLjAxLDcuMjUgMC4xMiwxNS4wNzEgMC43MSwyMi42ODkgMi40MiwzMi4wMTUgMTkuNTYsMzguMjY1IDU1LjA0LDM4LjI2NSBtIC0yMi4zMSwtNjAuOTU0IGMgMCwtNi40NjEgMC4xNiwtMTAuMjggMC4zLC0xMy4xMTQgMC45LC0xOC4xNjEgOC4wNywtMjAuMjc4IDIyLjAxLC0yMC4yNzggMTMuOTUsMCAyMS4xMiwyLjExNyAyMi4wMSwyMC4yNzggMC4xNCwyLjgzMyAwLjMxLDYuNjUyIDAuMzEsMTMuMTE0IDAsNi40ODIgLTAuMTcsMTAuMzA4IC0wLjMxLDEzLjEzNSAtMC44OSwxOC4xNjQgLTguMDYsMjAuMjg1IC0yMi4wMSwyMC4yODUgLTEzLjk0LDAgLTIxLjExLC0yLjEyMSAtMjIuMDEsLTIwLjI4NSAtMC4xNCwtMi44MjcgLTAuMywtNi42NTMgLTAuMywtMTMuMTM1IHogTSAwLjY1MDE1ODIyLDM0Mi4xMDU2IHYgMjkuMzMxIEggMzUuODIyMTU4IHYgODguMzI3IGggMzUuMTg1IHYgLTg4LjMyNyBoIDM1LjE3MzAwMiB2IC0yOS4zMzEgSCAwLjY1MDE1ODIyIE0gNTQwLjUwMDE2LDQ1OS43MTM2IHYgLTExNy42NjIgaCAtMzMuMzkgdiAxMTcuNjYyIGggMzMuMzkgbSAtMTM0LjM1LC03NC43MDMgdiAtNDIuOTU5IGggLTMzLjIgdiAxMTcuNjYyIGggMzMuMiB2IC00NS4zNzIgaCAzOC41OCB2IDQ1LjM3MiBoIDMzLjE5IHYgLTExNy42NjIgaCAtMzMuMTkgdiA0Mi45NTkgaCAtMzguNTggbSAyNDQuMTcsMTMuMjA2IGMgMTQuNzksLTMuNzgxIDE5LjEzLC0xMi42MTYgMTkuMTMsLTI1LjM4NiAwLC0yNS44NTkgLTE2LjI3LC0zMC43OCAtMzkuNCwtMzAuNzggaCAtNTkuOTUgdiAxMTcuNjYgaCA2Mi45MiBjIDI4Ljk3LDAgMzguNzEsLTEyLjQ4IDM4LjcxLC0zMS42NzUgMCwtMTMuMzgzIC0zLjA2LC0yNS4xOTEgLTIxLjQxLC0yOS44MjIgbSAtNDcuMDMsMTMuMTY5IGggMjMuMDIgYyA5LjMsMCAxMS4yNCw0LjA3NCAxMS4yNCwxMC43IDAsNi42MzIgLTMuNjQsMTAuNzE3IC0xMS4yNCwxMC43MTcgaCAtMjMuMDIgeiBtIDAsLTQyLjQyNSBoIDIzLjAyIGMgNi4wMSwwIDkuNzMsMi44NTEgOS43Myw5LjcwOCAwLDUuODc4IC0zLjY4LDkuNDk2IC05LjczLDkuNDk2IGggLTIzLjAyIHogbSAtMzU1LjA2LDUyLjE0MyBoIDMxLjY1IGMgMC4wMyw1LjcwOCAwLjc2LDkuNTIzIDMuNTMsMTEuNjMgMy4xNSwyLjM3NCA1Ljk3LDMuMTU4IDE1LjMyLDMuMTU4IDksMCAxOC44NiwwIDE4Ljg2LC0xMS4wODUgMCwtOC43NDIgLTUuNTEsLTEwLjczNyAtMTUuNjgsLTExLjI3OSAtMjUuMjIsLTEuMzM2IC0zNC4zNCwtMi4wNDkgLTQzLjczLC05LjAyNSAtNi40LC00Ljc1NyAtOS43MiwtMTQuMDE4IC05LjcyLC0yNi41NDIgMCwtMjEuMjk3IDcuNDMsLTI4Ljc2OCAxOC4xNSwtMzMuOTgxIDExLjA2LC01LjM4MSA1NC40NywtNS4zODEgNjYuMTUsMCAxNC42OSw2Ljc2OCAxNS4xMiwyMS40MiAxNS4xMiwzNS4wMTEgaCAtMzEuNTcgYyAtMC4wNiwtNi45MjkgLTEuNjIsLTguODg2IC0yLjg5LC0xMC4xNzUgLTMuMjgsLTIuOTA4IC03Ljk1LC0zLjUyMiAtMTQuNjksLTMuNTIyIC04LjE2LDAgLTE3LjYsMC4zNjggLTE3LjYsMTAuMjc3IDAsNy41NiAzLjI3LDEwLjcyIDExLjg1LDExLjI3NiAxMS43OSwwLjc1NCAzNS4wMiwxLjQ5NyA0My4zLDYuMzgzIDExLjYxLDYuODY3IDE0LjYyLDE2LjE1OSAxNC42MiwzMS4zMTkgMCwyMS45MDggLTcuODQsMjguMzM4IC0xOC43NSwzMy4xNTggLTEyLjU5LDUuNTYgLTU0LjY0LDUuNTYgLTY4LjMxLC0wLjQzIC0xNS4zLC02LjY3IC0xNS42MSwtMTkuOTY0IC0xNS42MSwtMzYuMTczIiBpZD0icGF0aDEiLz4KPC9zdmc6c3ZnPgo=</data><downloads_count>0</downloads_count></logo>
+  <finalclass>Brand</finalclass>
+  <friendlyname>Toshiba</friendlyname>
+</Brand>
 </Set>
+

datamodels/2.x/itop-config-mgmt/data/en_us.data.itop-osfamily.xml

@@ -1,48 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <Set>
-    <OSFamily alias="OSFamily" id="1">
-        <name>Arch</name>
-        <finalclass>OS Family</finalclass>
-        <friendlyname>Arch</friendlyname>
-    </OSFamily>
-    <OSFamily alias="OSFamily" id="2">
-        <name>Debian</name>
-        <finalclass>OS Family</finalclass>
-        <friendlyname>Debian</friendlyname>
-    </OSFamily>
-    <OSFamily alias="OSFamily" id="3">
-        <name>Oracle Linux</name>
-        <finalclass>OS Family</finalclass>
-        <friendlyname>Oracle Linux</friendlyname>
-    </OSFamily>
-    <OSFamily alias="OSFamily" id="4">
-        <name>Red Hat</name>
-        <finalclass>OS Family</finalclass>
-        <friendlyname>Red Hat</friendlyname>
-    </OSFamily>
-    <OSFamily alias="OSFamily" id="5">
-        <name>Ubuntu</name>
-        <finalclass>OS Family</finalclass>
-        <friendlyname>Ubuntu</friendlyname>
-    </OSFamily>
-    <OSFamily alias="OSFamily" id="6">
-        <name>Ubuntu server</name>
-        <finalclass>OS Family</finalclass>
-        <friendlyname>Ubuntu server</friendlyname>
-    </OSFamily>
-    <OSFamily alias="OSFamily" id="7">
-        <name>vCenter Server</name>
-        <finalclass>OS Family</finalclass>
-        <friendlyname>vCenter Server</friendlyname>
-    </OSFamily>
-    <OSFamily alias="OSFamily" id="8">
-        <name>Windows</name>
-        <finalclass>OS Family</finalclass>
-        <friendlyname>Windows</friendlyname>
-    </OSFamily>
-    <OSFamily alias="OSFamily" id="9">
-        <name>Windows server</name>
-        <finalclass>OS Family</finalclass>
-        <friendlyname>Windows server</friendlyname>
-    </OSFamily>
+<OSFamily alias="OSFamily" id="1">
+  <name>Arch</name>
+  <logo><mimetype>image/svg+xml</mimetype><filename>icons8-arch-linux.svg</filename><data>PD94bWwgdmVyc2lvbj0iMS4wIj8+CjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgdmlld0JveD0iMCwwLDI1NiwyNTYiIHdpZHRoPSI0OHB4IiBoZWlnaHQ9IjQ4cHgiIGZpbGwtcnVsZT0ibm9uemVybyI+PGcgZmlsbD0iIzAwODhjYyIgZmlsbC1ydWxlPSJub256ZXJvIiBzdHJva2U9Im5vbmUiIHN0cm9rZS13aWR0aD0iMSIgc3Ryb2tlLWxpbmVjYXA9ImJ1dHQiIHN0cm9rZS1saW5lam9pbj0ibWl0ZXIiIHN0cm9rZS1taXRlcmxpbWl0PSIxMCIgc3Ryb2tlLWRhc2hhcnJheT0iIiBzdHJva2UtZGFzaG9mZnNldD0iMCIgZm9udC1mYW1pbHk9Im5vbmUiIGZvbnQtd2VpZ2h0PSJub25lIiBmb250LXNpemU9Im5vbmUiIHRleHQtYW5jaG9yPSJub25lIiBzdHlsZT0ibWl4LWJsZW5kLW1vZGU6IG5vcm1hbCI+PGcgdHJhbnNmb3JtPSJzY2FsZSg1LjMzMzMzLDUuMzMzMzMpIj48cGF0aCBkPSJNMjguNDY1LDM4LjYxMWMwLjQxOSwtMS4xMDUgMC42NjQsLTIuMzY1IDAuNjY0LC0zLjcxNGMwLC00LjEzMyAtMi4yMTEsLTcuNDk0IC00LjkyOSwtNy40OTRjLTIuNzQxLDAgLTQuOTUxLDMuMzYxIC00Ljk1MSw3LjQ5NGMwLDEuMzI2IDAuMjIxLDIuNTg2IDAuNjQxLDMuNjY5Yy05LjA0MSwwLjk1MSAtMTUuNDA3LDQuNzMxIC0xNy45OTMsNi40MzJjNC4zNTUsLTYuMjc4IDguOTA5LC0xMy42MzggMTMuMjYyLC0yMi4xMDVjMS4wODMsLTIuMTAxIDIuMTAxLC00LjE3OCAzLjA1LC02LjIxMWMwLjM3NSwwLjI0MyAwLjc1MSwwLjUwOSAxLjE3MSwwLjc3NWMxLjk0NSwxLjIxNSAzLjc1OSwxLjg3OSA1LjA4NCwyLjIzM2MtMC45NzMsLTAuNzMgLTIuMDMzLC0xLjYxMyAtMy4xMTYsLTIuNjk3Yy0wLjgxNywtMC44MTcgLTEuNTQ3LC0xLjYzNyAtMi4xNjcsLTIuNDMzYzEuODM1LC00LjAyMiAzLjQyNywtNy44OTEgNC44MTksLTExLjU2YzIuMzIsNi4xNDQgNS4yMTcsMTIuODQyIDguODQxLDE5Ljg5M2MyLjM0Myw0LjUzMSA0LjczMSw4Ljc1NCA3LjExNywxMi42NDRjLTAuNjg1LC0wLjM3NSAtMS40MzcsLTAuNzMgLTIuMjMzLC0xLjAzOWMtMS4zNzEsLTAuNTMgLTIuNjUyLC0wLjg2MiAtMy43NTksLTEuMDZjMS41MDMsMC43NTEgMy4yNSwxLjc0NyA1LjA4NCwzLjA3M2MxLjE5NCwwLjg4NSAyLjI1NCwxLjc2OSAzLjE2MSwyLjYzMWMwLjAyMSwwLjAyMSAwLjAyMSwwLjAyMSAwLjA0NSwwLjA0NWMxLjI2LDIuMDU2IDIuNTY1LDMuOTU3IDMuODQ2LDUuODEzYy0yLjU0MSwtMS42ODEgLTguNzk2LC01LjM5NSAtMTcuNjM3LC02LjM4OXoiLz48L2c+PC9nPjwvc3ZnPgo=</data><downloads_count>0</downloads_count></logo>
+  <finalclass>OS Family</finalclass>
+  <friendlyname>Arch</friendlyname>
+</OSFamily>
+<OSFamily alias="OSFamily" id="2">
+  <name>Debian</name>
+  <logo><mimetype>image/svg+xml</mimetype><filename>icons8-debian.svg</filename><data>PD94bWwgdmVyc2lvbj0iMS4wIj8+CjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2aWV3Qm94PSIwIDAgNDggNDgiIHdpZHRoPSI0OHB4IiBoZWlnaHQ9IjQ4cHgiPjxwYXRoIGZpbGw9IiNFOTFFNjMiIGQ9Ik0yNi43NjMsMjQuNTQ4Yy0wLjYxNCwwLjAxLDAuMTE3LDAuMzE3LDAuOTE4LDAuNDRjMC4yMi0wLjE3MiwwLjQxOS0wLj
+    M0OCwwLjYtMC41MTVDMjcuNzgxLDI0LjU5MiwyNy4yNzQsMjQuNTk0LDI2Ljc2MywyNC41NDggTTMwLjA1NCwyMy43MjdjMC4zNjQtMC41LDAuNjMxLTEuMDU1LDAuNzIzLTEuNjI0Yy0wLjA4MiwwLjQwNS0wLjMwMywwLjc1NS0wLjUxLDEuMTI4Yy0xLjE0NiwwLjcyMS0wLjEwOC0wLjQzLDAtMC44NjVDMjkuMDM1LDIzLjkxMywzMC4wOTgsMjMuMjkzLDMwLjA1NCwyMy43MjcgTTMxLjI2OSwyMC41NjhjMC4wNzMtMS4xMDUtMC4yMTktMC43NTYtMC4zMTctMC4zMzZD
+    MzEuMDY4LDIwLjI5NCwzMS4xNTYsMjEuMDEzLDMxLjI2OSwyMC41NjggTTI0LjQzOSw1LjQ3OGMwLjMyNywwLjA1OCwwLjcwNiwwLjEwNCwwLjY1MywwLjE4M0MyNS40NDksNS41ODIsMjUuNTMxLDUuNTEsMjQuNDM5LDUuNDc4IE0yNS4wOTMsNS42NmwtMC4yMzIsMC4wNDdsMC4yMTUtMC4wMTdMMjUuMDkzLDUuNjYgTTM1LjI5NCwyMC45ODZjMC4wMzgsMC45OTEtMC4yOSwxLjQ3Mi0wLjU4NSwyLjMyMmwtMC41MjksMC4yNjZjLTAuNDM1LDAuODQxLDAuMDQxLDAuNT
+    M1LTAuMjY4LDEuMjAyYy0wLjY3OSwwLjYwMy0yLjA1NSwxLjg4My0yLjQ5NiwyLjAwNGMtMC4zMjEtMC4wMDksMC4yMTgtMC4zODIsMC4yODktMC41MjZjLTAuOTA2LDAuNjItMC43MjgsMC45MzQtMi4xMTMsMS4zMTNsLTAuMDQxLTAuMDljLTMuNDE5LDEuNjA3LTguMTY2LTEuNTc2LTguMTAzLTUuOTI4Yy0wLjAzNywwLjI3NS0wLjEwNCwwLjIwOS0wLjE4LDAuMzJjLTAuMTc1LTIuMjM3LDEuMDMzLTQuNDg2LDMuMDczLTUuNDAzYzEuOTk1LTAuOTg3LDQuMzM1LTAu
+    NTgsNS43NjMsMC43NWMtMC43ODUtMS4wMjgtMi4zNDgtMi4xMTktNC4xOTktMi4wMTdjLTEuODE0LDAuMDI5LTMuNTEsMS4xODItNC4wNzcsMi40MzRjLTAuOTI5LDAuNTg1LTEuMDM4LDIuMjU2LTEuNDQxLDIuNTYzYy0wLjU0NSw0LjAwMywxLjAyNCw1LjczMywzLjY4LDcuNzY4YzAuNDE3LDAuMjgyLDAuMTE4LDAuMzI2LDAuMTc1LDAuNTQxYy0wLjg4My0wLjQxMi0xLjY5LTEuMDM3LTIuMzU0LTEuODAxYzAuMzUzLDAuNTE3LDAuNzMzLDEuMDE3LDEuMjIzLDEuND
+    FjLTAuODMxLTAuMjc5LTEuOTQyLTIuMDEzLTIuMjY3LTIuMDg0YzEuNDM1LDIuNTY3LDUuODE4LDQuNTAyLDguMTEzLDMuNTQxYy0xLjA2MiwwLjA0LTIuNDEyLDAuMDIxLTMuNjA0LTAuNDJjLTAuNTAxLTAuMjU3LTEuMTgzLTAuNzkxLTEuMDYyLTAuODkzYzMuMTMzLDEuMTcxLDYuMzY5LDAuODg3LDkuMDc4LTEuMjg2YzAuNjg5LTAuNTM3LDEuNDQzLTEuNDQ5LDEuNjYyLTEuNDY0Yy0wLjMyNywwLjQ5MywwLjA1NywwLjIzOS0wLjE5NywwLjY3NGMwLjY4OC0xLjEw
+    OS0wLjI5OS0wLjQ0OSwwLjcxMS0xLjkxM2wwLjM3MywwLjUxMmMtMC4xMzktMC45MTcsMS4xNDMtMi4wMzMsMS4wMTItMy40ODljMC4yOTEtMC40NDUsMC4zMjYsMC40NzgsMC4wMTUsMS41MDJjMC40MzQtMS4xMzYsMC4xMTMtMS4zMTcsMC4yMjQtMi4yNTRjMC4xMjEsMC4zMTUsMC4yNzksMC42NDgsMC4zNTksMC45ODFjLTAuMjgxLTEuMDk3LDAuMjg5LTEuODQ4LDAuNDMzLTIuNDg1Yy0wLjE0Mi0wLjA2My0wLjQzNSwwLjQ4NS0wLjUwMy0wLjgxMmMwLjAxLTAuNT
+    YyLDAuMTU2LTAuMjk1LDAuMjE0LTAuNDM1Yy0wLjExMS0wLjA2NC0wLjQtMC40OTYtMC41NzctMS4zMjNjMC4xMjctMC4xOTMsMC4zNDIsMC41MDYsMC41MTYsMC41MzNjLTAuMTEyLTAuNjU1LTAuMzA0LTEuMTU5LTAuMzEzLTEuNjY1Yy0wLjUxLTEuMDYxLTAuMTgxLDAuMTQzLTAuNTkyLTAuNDU4Yy0wLjU0My0xLjY4NywwLjQ0OS0wLjM5LDAuNTE0LTEuMTU2YzAuODIsMS4xODgsMS4yODksMy4wMjksMS41MDQsMy43OTJjLTAuMTY0LTAuOTMtMC40MjgtMS44MzIt
+    MC43NTItMi43MDRjMC4yNDksMC4xMDgtMC40MDEtMS45MTEsMC4zMjQtMC41NzVjLTAuNzcyLTIuODQ4LTMuMzE0LTUuNTExLTUuNjUtNi43NmMwLjI4NiwwLjI2MiwwLjY0NiwwLjU5MSwwLjUxNywwLjY0MmMtMS4xNjMtMC42OS0wLjk1OS0wLjc0NS0xLjEyNC0xLjA0MWMtMC45NDYtMC4zODMtMS4wMSwwLjAzNC0xLjYzNiwwYy0xLjc4Ni0wLjk0My0yLjEyOS0wLjg0NS0zLjc3Mi0xLjQzN2wwLjA3OCwwLjM0OWMtMS4xODQtMC4zOTQtMS4zNzksMC4xNDYtMi42NT
+    csMC4wMDJjLTAuMDc4LTAuMDYyLDAuNDEtMC4yMTksMC44MTEtMC4yNzhjLTEuMTQzLDAuMTUtMS4wOS0wLjIyOC0yLjIwOCwwLjA0MmMwLjI3Ny0wLjE5NywwLjU2Ni0wLjMyMiwwLjg2MS0wLjQ4NmMtMC45MzIsMC4wNTktMi4yMjYsMC41NDItMS44MjUsMC4xMDNjLTEuNTIxLDAuNjc2LTQuMjIsMS42My01LjczNSwzLjA1MWwtMC4wNDctMC4zMjJjLTAuNjk0LDAuODM1LTMuMDI4LDIuNDkyLTMuMjE1LDMuNTdsLTAuMTg1LDAuMDQzYy0wLjM2MSwwLjYxMy0wLjU5
+    NSwxLjMwNS0wLjg4MSwxLjkzNWMtMC40NzQsMC44MDYtMC42OTIsMC4zMTEtMC42MjYsMC40MzZjLTAuOTI5LDEuODgzLTEuMzksMy40NjctMS43OSw0Ljc2OGMwLjI4NCwwLjQyNCwwLjAwNywyLjU1OCwwLjExMyw0LjI2NGMtMC40NjcsOC40MjksNS45MTYsMTYuNjA5LDEyLjg5MSwxOC41YzEuMDIzLDAuMzY1LDIuNTQyLDAuMzU0LDMuODM2LDAuMzljLTEuNTI1LTAuNDM4LTEuNzIyLTAuMjMyLTMuMjA5LTAuNzQ5Yy0xLjA3NC0wLjUwNi0xLjMwOC0xLjA4Mi0yLj
+    A2Ni0xLjc0bDAuMywwLjUzYy0xLjQ5LTAuNTI2LTAuODY3LTAuNjUyLTIuMDc4LTEuMDM0bDAuMzIxLTAuNDI0Yy0wLjQ4Mi0wLjAzMi0xLjI3OS0wLjgxMS0xLjQ5Ny0xLjI0MWwtMC41MjgsMC4wMjFjLTAuNjM0LTAuNzgzLTAuOTcyLTEuMzQ4LTAuOTQ4LTEuNzg1bC0wLjE3LDAuMzA1Yy0wLjE5NC0wLjMzMi0yLjMzNS0yLjkzNy0xLjIyNC0yLjMzYy0wLjIwNy0wLjE4OC0wLjQ4MS0wLjMwNy0wLjc3OS0wLjg1bDAuMjI3LTAuMjU4Yy0wLjUzNS0wLjY4Ni0wLjk4
+    My0xLjU2OC0wLjk0OS0xLjg2YzAuMjg0LDAuMzg0LDAuNDgyLDAuNDU0LDAuNjc5LDAuNTIyYy0xLjM1MS0zLjM0OS0xLjQyNi0wLjE4Ny0yLjQ0OC0zLjQwOWwwLjIxNi0wLjAxOWMtMC4xNjYtMC4yNDYtMC4yNjUtMC41MjEtMC4zOTktMC43ODVsMC4wOTQtMC45MzhjLTAuOTcyLTEuMTI1LTAuMjcyLTQuNzgxLTAuMTMyLTYuNzgzYzAuMDk3LTAuODE2LDAuODExLTEuNjg0LDEuMzU0LTMuMDQ1bC0wLjMzMi0wLjA1NWMwLjYzMi0xLjEwNCwzLjYxMi00LjQzMyw0Lj
+    k5LTQuMjZjMC42NjktMC44NDEtMC4xMzItMC4wMDItMC4yNjMtMC4yMTVjMS40NjktMS41MiwxLjkzLTEuMDczLDIuOTItMS4zNDljMS4wNjgtMC42MzMtMC45MTcsMC4yNTEtMC40MS0wLjIzOWMxLjg0OC0wLjQ3MywxLjMxLTEuMDczLDMuNzE4LTEuMzExYzAuMjU0LDAuMTQ1LTAuNTksMC4yMjMtMC44LDAuNDFjMS41MzgtMC43NTMsNC44Ny0wLjU4NCw3LjAzNCwwLjQxN2MyLjUxMSwxLjE3Myw1LjMzLDQuNjQyLDUuNDQzLDcuOTA0bDAuMTI2LDAuMDM1Yy0wLjA2
+    MywxLjI5OCwwLjE5OCwyLjc5OC0wLjI1Nyw0LjE3NUwzNS4yOTQsMjAuOTg2IE0yMC4wNzIsMjUuMzg5bC0wLjA4NiwwLjQzMWMwLjQwMywwLjU0NywwLjcyNCwxLjE0MiwxLjIzNywxLjU2N0MyMC44NTMsMjYuNjY0LDIwLjU3NywyNi4zNjQsMjAuMDcyLDI1LjM4OSBNMjEuMDIzLDI1LjM1M2MtMC4yMTMtMC4yMzctMC4zNC0wLjUxOC0wLjQ4LTAuODAyYzAuMTM1LDAuNDk1LDAuNDExLDAuOTIyLDAuNjY5LDEuMzU3TDIxLjAyMywyNS4zNTMgTTM3Ljg3NywyMS42OD
+    hsLTAuMDg4LDAuMjI2Yy0wLjE2NiwxLjE3NC0wLjUyMywyLjMzMi0xLjA2OCwzLjQxMkMzNy4zMjQsMjQuMTg5LDM3LjcxNCwyMi45NDcsMzcuODc3LDIxLjY4OCBNMjQuNTYsNS4xODVDMjQuOTc0LDUuMDMxLDI1LjU3OSw1LjEwMSwyNi4wMTksNWMtMC41NzMsMC4wNDgtMS4xNDQsMC4wNzktMS43MDYsMC4xNTFMMjQuNTYsNS4xODUgTTEwLjAwNywxMi45MjNjMC4wOTUsMC44ODItMC42NjcsMS4yMjksMC4xNjcsMC42NDRDMTAuNjIzLDEyLjU2MiwxMCwxMy4yODYsMTAuMDA3LDEyLjkyMyBNOS4wMjgsMTcuMDE2YzAuMTkxLTAuNTkyLDAuMjI2LTAuOTQzLDAuMy0xLjI4NUM4Ljc5NywxNi40MSw5LjA4NCwxNi41NTMsOS4wMjgsMTcuMDE2Ii8+PC9zdmc+Cg==</data><downloads_count>0</downloads_count></logo>
+  <finalclass>OS Family</finalclass>
+  <friendlyname>Debian</friendlyname>
+</OSFamily>
+<OSFamily alias="OSFamily" id="3">
+  <name>Oracle Linux</name>
+  <logo><mimetype>image/svg+xml</mimetype><filename>icon-oracle-linux.svg</filename><data>PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcgeG1sbnM6aW5rc2NhcGU9Imh0dHA6Ly93d3cuaW5rc2NhcGUub3JnL25hbWVzcGFjZXMvaW5rc2NhcGUiIHhtbG5zOnNvZGlwb2RpPSJodHRwOi8vc29kaXBvZGkuc291cmNlZm9yZ2UubmV0L0RURC9zb2RpcG9kaS0wLmR0ZCIgeG1sbnM9Imh0dH
+    A6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczpzdmc9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2aWV3Qm94PSIwIDAgMjMxIDIzMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ieE1pbllNaWQiIHZlcnNpb249IjEuMSIgaWQ9InN2ZzQiIHhtbDpzcGFjZT0icHJlc2VydmUiIHdpZHRoPSIyMzEiIGhlaWdodD0iMjMxIiBzb2RpcG9kaTpkb2NuYW1lPSJpY29uLW9yYWNsZS1saW51eC5zdmciIGlua3NjYXBlOnZlcnNpb249IjEuNC4zICgwZDE1Zjc1MDQyLCAy
+    MDI1LTEyLTI1KSI+PHNvZGlwb2RpOm5hbWVkdmlldyBpZD0ibmFtZWR2aWV3MSIgcGFnZWNvbG9yPSIjZmZmZmZmIiBib3JkZXJjb2xvcj0iIzAwMDAwMCIgYm9yZGVyb3BhY2l0eT0iMC4yNSIgaW5rc2NhcGU6c2hvd3BhZ2VzaGFkb3c9IjIiIGlua3NjYXBlOnBhZ2VvcGFjaXR5PSIwLjAiIGlua3NjYXBlOnBhZ2VjaGVja2VyYm9hcmQ9IjAiIGlua3NjYXBlOmRlc2tjb2xvcj0iI2QxZDFkMSIgc2hvd2d1aWRlcz0idHJ1ZSIgaW5rc2NhcGU6em9vbT0iNy41MzMyOD
+    kxIiBpbmtzY2FwZTpjeD0iMTA3LjA1ODE1IiBpbmtzY2FwZTpjeT0iOTAuNzk2OTkzIiBpbmtzY2FwZTp3aW5kb3ctd2lkdGg9IjI1NjAiIGlua3NjYXBlOndpbmRvdy1oZWlnaHQ9IjEzNjAiIGlua3NjYXBlOndpbmRvdy14PSIwIiBpbmtzY2FwZTp3aW5kb3cteT0iMCIgaW5rc2NhcGU6d2luZG93LW1heGltaXplZD0iMSIgaW5rc2NhcGU6Y3VycmVudC1sYXllcj0ic3ZnNCI+PHNvZGlwb2RpOmd1aWRlIHBvc2l0aW9uPSI0MS43NjM1ODksMTE1LjQ2OCIgb3JpZW50
+    YXRpb249IjAsLTEiIGlkPSJndWlkZTEiIGlua3NjYXBlOmxvY2tlZD0iZmFsc2UiLz48L3NvZGlwb2RpOm5hbWVkdmlldz48ZGVmcyBpZD0iZGVmczgiPjxyZWN0IHg9Ii0xMzguMjQ2NDEiIHk9IjgxLjU2NzIzOCIgd2lkdGg9IjM4Mi4zNjc0IiBoZWlnaHQ9IjI0MC4yMTE1NiIgaWQ9InJlY3Q0OTUiLz48cmVjdCB4PSItMTcuNjEyNjIzIiB5PSIxMDQuMzU4OTgiIHdpZHRoPSIxNzEuMDUyMzgiIGhlaWdodD0iMTk3LjMxNDQ0IiBpZD0icmVjdDI5MSIvPjwvZGVmcz
+    48ZyBpZD0iZzE0MDciIHRyYW5zZm9ybT0idHJhbnNsYXRlKDAuNjEzMjE1NDIsNzYuODM1NTMzKSI+PHBhdGggZD0ibSA5OS41OSwxOS41MiBoIDE1LjI0IEwgMTA2Ljc4LDYuNTIgOTEuOTgsMzAgaCAtNi43MyBsIDE4LC0yOC4xNyBhIDQuMjksNC4yOSAwIDAgMSA3LC0wLjA1IEwgMTI4LjMsMzAgaCAtNi43MyBsIC0zLjE3LC01LjI1IGggLTE1LjQyIGwgLTMuMzYsLTUuMjMgbSA2OS45Myw1LjIzIFYgMC4yOCBoIC01LjcyIHYgMjYuODggYSAyLjc2LDIuNzYgMCAw
+    IDAgMC44NSwyIDIuODksMi44OSAwIDAgMCAyLjA4LDAuODcgaCAyNiBsIDMuMzksLTUuMjUgaCAtMjYuNjMgbSAtOTQuNTQsLTQuNCBhIDEwLjA1LDEwLjA1IDAgMCAwIDAsLTIwLjEgaCAtMjUgViAzMCBoIDUuNzEgViA1LjU0IGggMTguOTQgYSA0LjgxLDQuODEgMCAwIDEgMCw5LjYyIEggNTguNTIgTCA3NS41OCwzMCBoIDguMjkgTCA3Mi40MSwyMC4zOCBoIDIuNTcgTSAxNC44NiwzMCBoIDE3LjI3IGEgMTQuODYsMTQuODYgMCAwIDAgMCwtMjkuNzEgSCAxNC44Ni
+    BhIDE0Ljg2LDE0Ljg2IDAgMSAwIDAsMjkuNzEgbSAxNi44OCwtNS4yMyBoIC0xNi41IGEgOS42Miw5LjYyIDAgMCAxIDAsLTE5LjIzIGggMTYuNSBhIDkuNjIsOS42MiAwIDEgMSAwLDE5LjIzIE0gMTQwLjIzLDMwIGggMTcuNjMgbCAzLjM0LC01LjIzIGggLTIwLjU4IGEgOS42Miw5LjYyIDAgMSAxIDAsLTE5LjIzIGggMTYuNzUgbCAzLjM4LC01LjI1IGggLTIwLjUyIGEgMTQuODYsMTQuODYgMCAxIDAgMCwyOS43MSBtIDY5Ljg3LC01LjIzIGEgOS42Miw5LjYyIDAg
+    MCAxIC05LjI2LC03IGggMjQuNDIgbCAzLjM2LC01LjI0IGggLTI3Ljc4IGEgOS42MSw5LjYxIDAgMCAxIDkuMjYsLTcgaCAxNi43NiBsIDMuMzUsLTUuMjUgaCAtMjAuNSBhIDE0Ljg2LDE0Ljg2IDAgMCAwIDAsMjkuNzEgaCAxNy42MyBsIDMuMzUsLTUuMjMgaCAtMjAuNiIgc3R5bGU9ImZpbGw6I2M3NDYzNCIgaWQ9InBhdGgyIi8+PHBhdGggaWQ9InJlY3Q3NDkiIHN0eWxlPSJmaWxsOiNjNzQ2MzQ7ZmlsbC1vcGFjaXR5OjE7c3Ryb2tlLXdpZHRoOjUuMjUxOTtzdH
+    Jva2UtbGluZWNhcDpzcXVhcmU7cGFpbnQtb3JkZXI6c3Ryb2tlIGZpbGwgbWFya2VycyIgZD0ibSAyNS4zOTE1MTcsNDcuOTMwODcxIGggNC45ODA4NjMgdiAzLjgzMDAyNSBoIC00Ljk4MDg2MyB6IG0gNjEuNTAwOCwxOC41NTcwNjEgLTcuMjQsLTEwLjI0MDAwMiBoIDQuOTYgbCA0LjY0LDcuMDgwMDAyIGggMC4yNCBsIDQuNzYsLTcuMDgwMDAyIGggNC43MiBsIC03LjI4LDEwLjE2MDAwMiA3LjY0LDEwLjg4IGggLTQuOTYgbCAtNS4wOCwtNy43MiBoIC0wLjI0IGwg
+    LTUuMTIsNy43MiBoIC00LjcyIHogbSAtMjEuNTk5OTk4LDExLjI4IHEgLTYuNjgsMCAtNi42OCwtNy4yNCBWIDU2LjI0NzkzIGggNC4xMiB2IDEzLjc2MDAwMiBxIDAsMi4zNiAxLjA0LDMuMzIgMS4wOCwwLjkyIDMuMTIsMC45MiAxLjQsMCAyLjYsLTAuNjggMS4yLC0wLjcyIDEuODgsLTIgMC43MiwtMS4yOCAwLjcyLC0yLjk2IFYgNTYuMjQ3OTMgaCA0LjEyIHYgMjEuMDQwMDAyIGggLTMuMzIgbCAtMC40LC0yLjggaCAtMC4yOCBxIC0xLjE2LDEuNiAtMi45MiwyLj
+    Q0IC0xLjc2LDAuODQgLTQsMC44NCB6IE0gMzUuODEyMzIsNTYuMjQ3OTMgaCAzLjMyMDAwMSBsIDAuNCwyLjgwMDAwMiBoIDAuMjggcSAxLjEyLC0xLjYwMDAwMiAyLjg4LC0yLjQ0MDAwMiAxLjgsLTAuODQgNC4wNCwtMC44NCA2LjY4LDAgNi42OCw3LjI0MDAwMiB2IDE0LjI4IGggLTQuMTIgdiAtMTMuNzYgcSAwLC0yLjM2IC0xLjA4LC0zLjI4IC0xLjA0LC0wLjk2IC0zLjA4LC0wLjk2IC0xLjQsMCAtMi42LDAuNzIgLTEuMiwwLjY4IC0xLjkyLDEuOTYgLTAuNjgsMS4yOCAtMC42OCwyLjk2IHYgMTIuMzYgSCAzNS44MTIzMiBaIE0gMy42MTIzOSw0Ny45MzA4NzEgaCA0LjQ0IHYgMjUuNTE3MDYxIGggMTQuMjggdiAzLjg0IGggLTE4LjcyIHogTSAyNi4yNTY3NjgsNTkuNDYzOTUgViA3Ny4yODc5MzIgSCAzMC4zNzIzOCBWIDU2LjI3NTQ2NCBoIC02LjM4NzYxMiB2IDEuODI1NjgxIHoiLz48L2c+PC9zdmc+Cg==</data><downloads_count>0</downloads_count></logo>
+  <finalclass>OS Family</finalclass>
+  <friendlyname>Oracle Linux</friendlyname>
+</OSFamily>
+<OSFamily alias="OSFamily" id="4">
+  <name>Red Hat</name>
+  <logo><mimetype>image/svg+xml</mimetype><filename>icons8-red-hat.svg</filename><data>PD94bWwgdmVyc2lvbj0iMS4wIj8+CjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2aWV3Qm94PSIwIDAgNDggNDgiIHdpZHRoPSI0OHB4IiBoZWlnaHQ9IjQ4cHgiPjxwYXRoIGZpbGw9IiMzNzQ3NEYiIGQ9Ik0yNy44MTMsMzQuODg4Yy0wLjMxOSwwLjM1My0wLjc1NSwwLjM3OC0xLjI4NCwwLjA3NWMtMC40OTctMC4yODItMS4yN
+    zYtMC4yODItMS41MS0wLjAwMSBjLTAuMjY5LDAuMzIzLTAuMDc1LDAuNjgxLDAuMzY3LDAuNjgxYzAuMjA3LDAsMC42MDQsMC4xMzcsMC44NzQsMC4zMDNjMC4yNzEsMC4xNjcsMC42NTMsMC4zMDMsMC44NDcsMC4zMDMgYzAuNDc1LDAuMDAyLDEuMjM0LTAuNzgyLDEuMjM0LTEuMjczQzI4LjM0MiwzNC41MDYsMjguMTgyLDM0LjQ4LDI3LjgxMywzNC44ODh6IE00MywyNS45NzFjMCwzLjIyMS0wLjUzNSw1LjYwMi0xLjg4Nyw4LjM4NiBjLTAuOTgsMi4wMjItMC44NDY
+    sMS45Mi0yLjI3MiwxLjc0Yy0xLjI5My0wLjE2My0yLjk4OS0wLjAyNi00LjA3NSwwLjMzMWMtMC40ODQsMC4xNi0wLjYxNywwLjI4My0wLjY4MSwwLjY0MyBjLTAuMDY1LDAuMzc5LTAuMjA2LDAuNDkzLTAuOTc5LDAuNzkzYy0wLjY1MiwwLjI1My0wLjk3NywxLjAzMy0xLjY4NiwxLjcyOGMtMC41NDMsMC41My0xLjEyMSwxLjAzLTEuMjg4LDEuMTEzIEMyOS43NDIsNDAuODk0LDI5LDQxLjA2OSwyOSw0MC45NzRjMC0wLjA3MSwwLjk4Ni0yLjI1MSwyLjM1Ny00LjIxO
+    GMwLjQ5LTAuNzA0LDAuNjYxLTEuMTA0LDAuNzA5LTEuNjYxIGMwLjAzNi0wLjQwNSwwLjIxMS0xLjIyOSwwLjM4OS0xLjgzYzAuMTc5LTAuNjAzLDAuMjg5LTEuMTMsMC4yNDYtMS4xNzNzLTAuMzcsMC4wMjUtMC43MjYsMC4xNDggYy0wLjc3OSwwLjI3NS0xLjI5MywwLjI4Ni0yLjE3NywwLjA1MWMtMC41NjMtMC4xNTEtMC43NzEtMC4xMzktMS4zNDQsMC4wOGMtMC42MzksMC4yNDYtMC43MTksMC4yNDYtMS4zMTMsMC4wMDYgYy0wLjU5NS0wLjIzNy0wLjcyNS0wLjI
+    zNy0yLjE0NiwwLjAxNGMtMi42NTUsMC40NjYtMy41MTMsMC4yMDYtNS4yODQtMS42MDljLTEuMDk4LTEuMTI1LTEuNTA4LTEuMzcyLTEuNzE3LTEuMDMgYy0wLjA1MSwwLjA4My0wLjI1MywwLjE1MS0wLjQ0NiwwLjE1MWMtMC4yNTgsMC0wLjQ4NC0wLjIwMy0wLjg0MS0wLjc2Yy0wLjI2Ny0wLjQxNS0wLjY3Ny0wLjg5My0wLjkwOS0xLjA1OCBjLTEuMjc0LTAuOTA2LTIuNzE1LTAuMjUtMi43MTUsMS4yNGMwLDAuNjE0LDEuMjI4LDIuNDY1LDEuODQ3LDIuNzg2YzAuO
+    DE4LDAuNDIzLDAuMzU3LDEuMDU3LTAuNjcxLDAuOTE5IGMtMC41MzItMC4wNzItMC43NjctMC4yMzEtMS40ODItMS4wMDNjLTAuNzY0LTAuODI2LTAuOTA3LTAuOTE2LTEuNDQzLTAuOTE0Yy0wLjMyOCwwLjAwMi0wLjg3NSwwLjEzMS0xLjIxNSwwLjI4NCBjLTAuODc3LDAuMzk5LTIuMDIyLDAuNjItMy4yMjEsMC42Mkg1Ljg2NUw1LjYzLDMxLjE0NkM1LjA5MywyOS4xNzEsNSwyOC40LDUsMjUuOTcxYzAtMS44NTcsMC4wNzEtMi44MjEsMC4yNzktMy43NzkgYzEuMTI
+    0LTUuMTcyLDMuOTg0LTkuMzUzLDguMzIzLTEyLjE2OWMyLjEyOC0xLjM4Miw0LjA4NC0yLjE5Miw2LjU3OS0yLjcyOWMxLjc4My0wLjM4Myw1Ljc3Ni0wLjM5NCw3LjUxLTAuMDIxIGM1LjkwMiwxLjI3MywxMC43OTQsNC45OTYsMTMuMzM5LDEwLjE2QzQyLjQ1NywyMC4zMjUsNDMsMjIuNjc3LDQzLDI1Ljk3MXoiLz48cGF0aCBmaWxsPSIjRkYzRDAwIiBkPSJNMzguMDgyLDIyLjMxMmMtMC43MTEtMC41MzktMi41MjktMS4zMjctMy4wNjMtMS4zMjdjLTAuMTQ2LDAtM
+    C40LDAuMjczLTAuNTk4LDAuNjQzIGMtMC4yOTcsMC41NTktMS4xMzEsMS4zMjItMS40NDQsMS4zMjJjLTAuMDU4LDAsMC4xMDEtMC4zODQsMC4zNS0wLjg1MmMwLjExLTAuMjA1LDAuMjA0LTAuNDIzLDAuMjgtMC42MzEgYzAuMTA5LTAuMzAzLDAuMTc4LTAuNTg0LDAuMTc4LTAuNzc2YzAtMC45NTgtMC42NzYtMy4xMTctMS40OTctNS4wNDljLTAuNDM1LTEuMDI0LTAuOTExLTEuOTg1LTEuMzUxLTIuNjY5IGMtMC4yMTUtMC4zMzUtMC4zOTMtMC41ODktMC41NTktMC4
+    3OTJjLTAuMjktMC4zNTEtMC41NTktMC41NTQtMC45NzUtMC43NzljLTAuMjgzLTAuMTUyLTAuNTgtMC4yNy0wLjg5MS0wLjM1NiBjLTAuMDA2LDAtMC4wMTItMC4wMDMtMC4wMTYtMC4wMDNjLTAuMDczLTAuMDIxLTAuMTQ1LTAuMDM5LTAuMjE5LTAuMDU1Yy0wLjAxMi0wLjAwMy0wLjAyMy0wLjAwNS0wLjAzNS0wLjAwOSBjLTAuMDctMC4wMTQtMC4xMzktMC4wMjYtMC4yMTItMC4wMzljLTAuMDE1LTAuMDAzLTAuMDI4LTAuMDAzLTAuMDQ0LTAuMDA2Yy0wLjA3Mi0wL
+    jAxMi0wLjE0Mi0wLjAyMS0wLjIxNS0wLjAzIGMtMC4wMTItMC4wMDEtMC4wMjUtMC4wMDEtMC4wMzctMC4wMDNjLTAuMTYtMC4wMTYtMC4zMjUtMC4wMjctMC40OTUtMC4wMjdjLTAuMDE3LDAtMC4wMzYsMC0wLjA1MywwIGMtMC4xMiwwLTAuMjM5LDAuMDA2LTAuMzYyLDAuMDE0Yy0wLjAzOSwwLjAwMS0wLjA3NiwwLjAwNC0wLjExNCwwLjAwNWMtMC4xMzIsMC4wMTEtMC4yNjcsMC4wMjQtMC40MDIsMC4wNDIgYy0wLjA0OCwwLjAwNi0wLjA5NSwwLjAxMy0wLjE0NCw
+    wLjAxOWMtMC4xMzQsMC4wMTktMC4yNywwLjA0MS0wLjQwOCwwLjA2OGMtMC4wNTUsMC4wMS0wLjExMiwwLjAyNC0wLjE3LDAuMDM2IGMtMC4xMDYsMC4wMjItMC4yMTgsMC4wNDgtMC4zMjksMC4wNzVjLTAuMDQzLDAuMDEtMC4wODMsMC4wMTctMC4xMjYsMC4wMjdjLTEuMDYzLDAuMjcyLTEuNTU4LDAuMzE5LTIuNTY2LDAuMjQ1IGMtNC4xMTctMC4yOTctMy45NTEtMC4zLTQuNjMsMC4wNDdjLTAuMzY4LDAuMTg4LTAuNjI4LDAuMzktMC44NDgsMC43M2MtMC4yOTgsM
+    C40NjItMC41MiwxLjE3Mi0wLjgyOSwyLjQ1MSBjLTAuNTgyLDIuNDAzLTAuNTk1LDMuMTQ2LTAuMDY4LDMuNzczYzAuNTM2LDAuNjM5LDIuMjY1LDEuNDMxLDMuOTksMS44MjdjMi4wNjMsMC40NzQsMy40NjksMC44OTIsMy44NTksMS4xNDkgYzAuMDk3LDAuMDYzLDAuMjA1LDAuMTc4LDAuMzAxLDAuMzEzYzAuMDkxLDAuMTI1LDAuMTcsMC4yNjYsMC4yMTgsMC4zOTRjMC40MzQsMS4xNTcsMC42NjcsMS42MjcsMC45MzEsMS44NjQgYzAuMDY1LDAuMDYsMC4xMjUsMC4
+    xMzEsMC4xNzQsMC4xOTdjMC4wNjYsMC4wOTIsMC4xMDcsMC4xODMsMC4xMDcsMC4yMzljMCwxLjA5Ny03LjgwMy0xLjMzMy05LjgxNC0zLjA1NCBjLTAuNTM4LTAuNDYyLTAuODM3LTAuODQ2LTAuOTY1LTEuMjg4Yy0wLjA3Ny0wLjI3NC0wLjA4Ny0wLjU3MS0wLjA0Ni0wLjkyMmwwLjAyNC0wLjIxMWwwLjA2My0wLjUzNGgtMC4wMDF2LTAuMDAybC0xLjk5OCwwLjA2NiBjLTEuNjg4LDAuMDU2LTIuMTA5LDAuMTE4LTIuNzE1LDAuNDEyYy0yLjA4NiwxLjAwNS0xLjk4N
+    SwyLjY5LDAuMjg4LDQuODVjMS42MzQsMS41NTQsNC4xMTMsMy4wODUsNi44NTMsNC4zMzQgYzIuODI4LDEuMjkzLDUuOTM2LDIuMjgzLDguNjgxLDIuNjg2YzEuMTg4LDAuMTc1LDIuNzEyLDAuMjM3LDQuMTEzLDAuMTkzYzAuNzkxLTAuMDI0LDEuNTQzLTAuMDg0LDIuMTctMC4xOCBjMy4zNjUtMC41MTMsNS42OTUtMS44ODYsNi42NjgtMy45MzRjMC4xMDUtMC4yMjIsMC4xODktMC40MzgsMC4yNTgtMC42NTJDMzkuODE4LDI0LjY1NCwzOS4zNzcsMjMuMjk3LDM4LjA
+    4MiwyMi4zMTJ6IE0yMi4xMjIsMTYuMDE1Yy0xLjQzOCwwLjE1OS0yLjE0MSwwLjM1NS0yLjQwMywwLjY3MWMtMC4xMDEsMC4xMjEtMC4yMDQsMC4xODgtMC4zMjcsMC4xOTdjLTAuMjQ5LDAuMDE3LTAuNTctMC4yMTUtMS4wODktMC43NDIgYy0wLjM2MS0wLjM3MS0wLjU2Ny0wLjYzNy0wLjY2Ny0wLjg2N2MtMC4wNS0wLjExNS0wLjA3My0wLjIyNi0wLjA3My0wLjMzMmMwLTAuMDYxLDAuMDA0LTAuMTIsMC4wMS0wLjE3OCBjMC4wMDEtMC4wMDgsMC4wMDMtMC4wMTYsM
+    C4wMDMtMC4wMjNjMC4wMDctMC4wNDcsMC4wMTYtMC4wOTMsMC4wMjgtMC4xMzljMC4wMDEtMC4wMDksMC4wMDMtMC4wMTUsMC4wMDUtMC4wMjMgYzAuMDE0LTAuMDQ4LDAuMDI5LTAuMDk0LDAuMDQ5LTAuMTM3YzAuMDAzLTAuMDA3LDAuMDA1LTAuMDEzLDAuMDEtMC4wMTljMC4wMTctMC4wMzIsMC4wMzItMC4wNjMsMC4wNTEtMC4wOTMgYzAuMDA3LTAuMDEzLDAuMDE1LTAuMDI0LDAuMDIzLTAuMDM1YzAuMDE0LTAuMDI0LDAuMDMyLTAuMDQ2LDAuMDUtMC4wNjdjMC4
+    wMDctMC4wMDksMC4wMTUtMC4wMTcsMC4wMjMtMC4wMjcgYzAuMDI1LTAuMDI0LDAuMDUxLTAuMDQ3LDAuMDc3LTAuMDY1YzAuMDEyLTAuMDA3LDAuMDIzLTAuMDE1LDAuMDM2LTAuMDJjMC4wMTktMC4wMTQsMC4wMzgtMC4wMjEsMC4wNTgtMC4wMyBjMC4wMTItMC4wMDYsMC4wMjUtMC4wMTEsMC4wMzctMC4wMTVjMC4wMjktMC4wMDgsMC4wNTctMC4wMTYsMC4wODgtMC4wMTljMC4wMDMsMCwwLjAwNi0wLjAwMSwwLjAxLTAuMDAxIGMwLjAzMi0wLjAwMywwLjA2NC0wL
+    jAwMiwwLjA5NywwLjAwM2MwLjAwNywwLjAwMSwwLjAxNSwwLjAwMywwLjAyMywwLjAwNGMwLjAyNiwwLjAwNiwwLjA1MywwLjAxMiwwLjA3OSwwLjAyMSBjMC4wMDcsMC4wMDMsMC4wMTQsMC4wMDYsMC4wMjEsMC4wMDljMC4wMzEsMC4wMTQsMC4wNjIsMC4wMzEsMC4wOTEsMC4wNTFjMC4wMDIsMC4wMDIsMC4wMDQsMC4wMDMsMC4wMDcsMC4wMDYgYzAuMDM2LDAuMDIzLDAuMDcxLDAuMDUsMC4xMDQsMC4wODNjMC42NjgsMC42NTMsMC45LDAuNzE0LDIuMzk0LDAuNjE
+    1YzAuNTQ2LTAuMDM3LDEuMDEyLTAuMDM4LDEuMzk0LTAuMDA3IGMwLjcwOSwwLjA2LDEuMTMxLDAuMjMsMS4yNCwwLjUxNWMwLjAzOCwwLjA5OSwwLjA1LDAuMTgsMC4wMjUsMC4yNUMyMy41MjIsMTUuODA5LDIzLjEyMiwxNS45MDQsMjIuMTIyLDE2LjAxNXogTTI5LjAwMSwxMy4zOCBjLTAuMDEsMC4wMDctMC4wMTksMC4wMTMtMC4wMzEsMC4wMTljMCwwLjAwMS0wLjAwMywwLjAwMy0wLjAwNiwwLjAwNGMtMC41MTEsMC4yNjktMS4zMjUsMC40MjktMi4xNzEsMC4zN
+    TggYy0wLjM0NC0wLjAyNy0wLjUyNi0wLjA4Ny0wLjU0My0wLjE2NGMtMC4wMTItMC4wNTIsMC4wNTUtMC4xMTEsMC4xOTctMC4xNzFjMC4wNy0wLjAzLDAuMTUzLTAuMDYxLDAuMjU2LTAuMDg5IGMwLjU4NC0wLjE2OSwwLjkxLTAuNjA4LDAuNTk0LTAuODA1Yy0wLjMzNy0wLjIxMi0xLjQ5Mi0wLjM0NS0yLjAwNC0wLjIzMWMtMC4yMTcsMC4wNDktMC4zNDIsMC4wNTEtMC4zNzQsMC4wMTMgYy0wLjAwMS0wLjAwMS0wLjAwNC0wLjAwMy0wLjAwNS0wLjAwNmMtMC4wMDk
+    tMC4wMTUtMC4wMDQtMC4wMzUsMC4wMTEtMC4wNjJjMC4wMTItMC4wMTYsMC4wMjYtMC4wMzEsMC4wNDctMC4wNDggYzAsMCwwLjAwMSwwLDAuMDAyLDBjMC4wMTktMC4wMTgsMC4wNDUtMC4wMzIsMC4wNzItMC4wNDZjMC4wMDItMC4wMDMsMC4wMDYtMC4wMDMsMC4wMS0wLjAwNmMwLjAyNy0wLjAxNCwwLjA1Ny0wLjAyNywwLjA5Mi0wLjA0MSBjMC4wMDUtMC4wMDIsMC4wMDgtMC4wMDMsMC4wMTEtMC4wMDVjMC4wMzctMC4wMTQsMC4wNzctMC4wMjgsMC4xMjEtMC4wN
+    DJjMC4wMDEsMCwwLjAwMy0wLjAwMiwwLjAwNS0wLjAwMiBjMC4yNzYtMC4wOSwwLjY4Mi0wLjE2NCwxLjEtMC4yMTNjMC4wMDgtMC4wMDMsMC4wMTQtMC4wMDMsMC4wMjEtMC4wMDNjMC4wNjEtMC4wMDksMC4xMjMtMC4wMTQsMC4xODYtMC4wMiBjMC4wMDktMC4wMDIsMC4wMTktMC4wMDIsMC4wMjctMC4wMDNjMC4wNjEtMC4wMDQsMC4xMTktMC4wMDksMC4xOC0wLjAxM2MwLjAwOSwwLDAuMDE5LTAuMDAyLDAuMDI3LTAuMDAyIGMwLjA2NS0wLjAwMywwLjEzMS0wLjAwNywwLjE5My0wLjAwOWMwLjAwNCwwLDAuMDA2LDAsMC4wMDYsMGMwLjIwNi0wLjAwOCwwLjQtMC4wMDIsMC41NzEsMC4wMTIgYzAuOTQ4LDAuMDg2LDEuNzE2LDAuNDIxLDEuODY4LDAuODEzYzAuMDE1LDAuMDQsMC4wMjQsMC4wOCwwLjAyNywwLjEyM0MyOS41MSwxMi45NzksMjkuMzIsMTMuMjAxLDI5LjAwMSwxMy4zOHoiLz48L3N2Zz4K</data><downloads_count>0</downloads_count></logo>
+  <finalclass>OS Family</finalclass>
+  <friendlyname>Red Hat</friendlyname>
+</OSFamily>
+<OSFamily alias="OSFamily" id="5">
+  <name>Ubuntu</name>
+  <logo><mimetype>image/svg+xml</mimetype><filename>icons8-ubuntu.svg</filename><data>PD94bWwgdmVyc2lvbj0iMS4wIj8+CjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2aWV3Qm94PSIwIDAgNDggNDgiIHdpZHRoPSI0OHB4IiBoZWlnaHQ9IjQ4cHgiPjxwYXRoIGZpbGw9IiNmZmYiIGQ9Ik00MCwyNGMwLDguOC03LjIsMTYtMTYsMTZTOCwzMi44LDgsMjRTMTUuMiw4LDI0LDhTNDAsMTUuMiw0MCwyNHoiLz48cGF0aC
+    BmaWxsPSIjZTY0YTE5IiBkPSJNMzAgMjRjMCAzLjMtMi43IDYtNiA2LTMuMyAwLTYtMi43LTYtNnMyLjctNiA2LTZDMjcuMyAxOCAzMCAyMC43IDMwIDI0ek0xMiAyMS41YzEuNCAwIDIuNSAxLjEgMi41IDIuNXMtMS4xIDIuNS0yLjUgMi41UzkuNSAyNS40IDkuNSAyNCAxMC42IDIxLjUgMTIgMjEuNU0xMiAyMC41Yy0xLjkgMC0zLjUgMS42LTMuNSAzLjVzMS42IDMuNSAzLjUgMy41IDMuNS0xLjYgMy41LTMuNVMxMy45IDIwLjUgMTIgMjAuNXpNMzAgMzEuNWMxLjQg
+    MCAyLjUgMS4xIDIuNSAyLjVzLTEuMSAyLjUtMi41IDIuNS0yLjUtMS4xLTIuNS0yLjVTMjguNiAzMS41IDMwIDMxLjVNMzAgMzAuNWMtMS45IDAtMy41IDEuNi0zLjUgMy41czEuNiAzLjUgMy41IDMuNSAzLjUtMS42IDMuNS0zLjVTMzEuOSAzMC41IDMwIDMwLjV6Ii8+PHBhdGggZmlsbD0iI2U2NGExOSIgZD0iTTI0LDRDMTMsNCw0LDEzLDQsMjRzOSwyMCwyMCwyMHMyMC05LDIwLTIwUzM1LDQsMjQsNHogTTMyLjUsMzRjMCwxLjQtMS4xLDIuNS0yLjUsMi41IHMtMi
+    41LTEuMS0yLjUtMi41YzAtMC4yLDAtMC41LDAuMS0wLjdDMjYuNSwzMy44LDI1LjMsMzQsMjQsMzRjLTUuMSwwLTkuMi0zLjgtOS45LTguN2MtMC40LDAuNy0xLjIsMS4yLTIuMSwxLjIgYy0xLjQsMC0yLjUtMS4xLTIuNS0yLjVzMS4xLTIuNSwyLjUtMi41YzAuOSwwLDEuNywwLjUsMi4xLDEuMmMwLjctNC45LDQuOC04LjcsOS45LTguN2MxLjMsMCwyLjUsMC4yLDMuNiwwLjcgYy0wLjEtMC4yLTAuMS0wLjQtMC4xLTAuN2MwLTEuNCwxLjEtMi41LDIuNS0yLjVzMi41
+    LDEuMSwyLjUsMi41YzAsMS4yLTAuOCwyLjItMiwyLjRDMzIuNywxOC4zLDM0LDIxLDM0LDI0cy0xLjMsNS43LTMuNSw3LjYgQzMxLjcsMzEuOCwzMi41LDMyLjgsMzIuNSwzNHoiLz48cGF0aCBmaWxsPSIjZTY0YTE5IiBkPSJNMzAgMTEuNWMxLjQgMCAyLjUgMS4xIDIuNSAyLjUgMCAxLjQtMS4xIDIuNS0yLjUgMi41cy0yLjUtMS4xLTIuNS0yLjVDMjcuNSAxMi42IDI4LjYgMTEuNSAzMCAxMS41TTMwIDEwLjVjLTEuOSAwLTMuNSAxLjYtMy41IDMuNXMxLjYgMy41ID
+    MuNSAzLjUgMy41LTEuNiAzLjUtMy41UzMxLjkgMTAuNSAzMCAxMC41ek0yNCAyNGMtMi42LTQuMS01LjItOC4xLTcuOC0xMi4yIi8+PHBhdGggZmlsbD0iI2U2NGExOSIgZD0iTTE5LjEgMTAuN0gyMS4xVjI1LjFIMTkuMXoiIHRyYW5zZm9ybT0icm90YXRlKC0zMi40NjcgMjAuMTI3IDE3LjkxMSkiLz48cGF0aCBmaWxsPSIjZTY0YTE5IiBkPSJNMjQgMjNIMzguNFYyNUgyNHoiLz48Zz48cGF0aCBmaWxsPSIjZTY0YTE5IiBkPSJNMjQsMjRjLTIuNyw0LTUuMyw4LTgsMTIiLz48cGF0aCBmaWxsPSIjZTY0YTE5IiBkPSJNMTIuOCAyOUgyNy4yMDAwMDAwMDAwMDAwMDNWMzFIMTIuOHoiIHRyYW5zZm9ybT0icm90YXRlKC01Ni4zMTIgMTkuOTk4IDMwLjAwNikiLz48L2c+PC9zdmc+Cg==</data><downloads_count>0</downloads_count></logo>
+  <finalclass>OS Family</finalclass>
+  <friendlyname>Ubuntu</friendlyname>
+</OSFamily>
+<OSFamily alias="OSFamily" id="6">
+  <name>Ubuntu server</name>
+  <logo><mimetype>image/svg+xml</mimetype><filename>icons8-ubuntu.svg</filename><data>PD94bWwgdmVyc2lvbj0iMS4wIj8+CjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2aWV3Qm94PSIwIDAgNDggNDgiIHdpZHRoPSI0OHB4IiBoZWlnaHQ9IjQ4cHgiPjxwYXRoIGZpbGw9IiNmZmYiIGQ9Ik00MCwyNGMwLDguOC03LjIsMTYtMTYsMTZTOCwzMi44LDgsMjRTMTUuMiw4LDI0LDhTNDAsMTUuMiw0MCwyNHoiLz48cGF0aC
+    BmaWxsPSIjZTY0YTE5IiBkPSJNMzAgMjRjMCAzLjMtMi43IDYtNiA2LTMuMyAwLTYtMi43LTYtNnMyLjctNiA2LTZDMjcuMyAxOCAzMCAyMC43IDMwIDI0ek0xMiAyMS41YzEuNCAwIDIuNSAxLjEgMi41IDIuNXMtMS4xIDIuNS0yLjUgMi41UzkuNSAyNS40IDkuNSAyNCAxMC42IDIxLjUgMTIgMjEuNU0xMiAyMC41Yy0xLjkgMC0zLjUgMS42LTMuNSAzLjVzMS42IDMuNSAzLjUgMy41IDMuNS0xLjYgMy41LTMuNVMxMy45IDIwLjUgMTIgMjAuNXpNMzAgMzEuNWMxLjQg
+    MCAyLjUgMS4xIDIuNSAyLjVzLTEuMSAyLjUtMi41IDIuNS0yLjUtMS4xLTIuNS0yLjVTMjguNiAzMS41IDMwIDMxLjVNMzAgMzAuNWMtMS45IDAtMy41IDEuNi0zLjUgMy41czEuNiAzLjUgMy41IDMuNSAzLjUtMS42IDMuNS0zLjVTMzEuOSAzMC41IDMwIDMwLjV6Ii8+PHBhdGggZmlsbD0iI2U2NGExOSIgZD0iTTI0LDRDMTMsNCw0LDEzLDQsMjRzOSwyMCwyMCwyMHMyMC05LDIwLTIwUzM1LDQsMjQsNHogTTMyLjUsMzRjMCwxLjQtMS4xLDIuNS0yLjUsMi41IHMtMi
+    41LTEuMS0yLjUtMi41YzAtMC4yLDAtMC41LDAuMS0wLjdDMjYuNSwzMy44LDI1LjMsMzQsMjQsMzRjLTUuMSwwLTkuMi0zLjgtOS45LTguN2MtMC40LDAuNy0xLjIsMS4yLTIuMSwxLjIgYy0xLjQsMC0yLjUtMS4xLTIuNS0yLjVzMS4xLTIuNSwyLjUtMi41YzAuOSwwLDEuNywwLjUsMi4xLDEuMmMwLjctNC45LDQuOC04LjcsOS45LTguN2MxLjMsMCwyLjUsMC4yLDMuNiwwLjcgYy0wLjEtMC4yLTAuMS0wLjQtMC4xLTAuN2MwLTEuNCwxLjEtMi41LDIuNS0yLjVzMi41
+    LDEuMSwyLjUsMi41YzAsMS4yLTAuOCwyLjItMiwyLjRDMzIuNywxOC4zLDM0LDIxLDM0LDI0cy0xLjMsNS43LTMuNSw3LjYgQzMxLjcsMzEuOCwzMi41LDMyLjgsMzIuNSwzNHoiLz48cGF0aCBmaWxsPSIjZTY0YTE5IiBkPSJNMzAgMTEuNWMxLjQgMCAyLjUgMS4xIDIuNSAyLjUgMCAxLjQtMS4xIDIuNS0yLjUgMi41cy0yLjUtMS4xLTIuNS0yLjVDMjcuNSAxMi42IDI4LjYgMTEuNSAzMCAxMS41TTMwIDEwLjVjLTEuOSAwLTMuNSAxLjYtMy41IDMuNXMxLjYgMy41ID
+    MuNSAzLjUgMy41LTEuNiAzLjUtMy41UzMxLjkgMTAuNSAzMCAxMC41ek0yNCAyNGMtMi42LTQuMS01LjItOC4xLTcuOC0xMi4yIi8+PHBhdGggZmlsbD0iI2U2NGExOSIgZD0iTTE5LjEgMTAuN0gyMS4xVjI1LjFIMTkuMXoiIHRyYW5zZm9ybT0icm90YXRlKC0zMi40NjcgMjAuMTI3IDE3LjkxMSkiLz48cGF0aCBmaWxsPSIjZTY0YTE5IiBkPSJNMjQgMjNIMzguNFYyNUgyNHoiLz48Zz48cGF0aCBmaWxsPSIjZTY0YTE5IiBkPSJNMjQsMjRjLTIuNyw0LTUuMyw4LTgsMTIiLz48cGF0aCBmaWxsPSIjZTY0YTE5IiBkPSJNMTIuOCAyOUgyNy4yMDAwMDAwMDAwMDAwMDNWMzFIMTIuOHoiIHRyYW5zZm9ybT0icm90YXRlKC01Ni4zMTIgMTkuOTk4IDMwLjAwNikiLz48L2c+PC9zdmc+Cg==</data><downloads_count>0</downloads_count></logo>
+  <finalclass>OS Family</finalclass>
+  <friendlyname>Ubuntu server</friendlyname>
+</OSFamily>
+<OSFamily alias="OSFamily" id="7">
+  <name>vCenter Server</name>
+  <logo><mimetype>image/svg+xml</mimetype><filename>icons8-vmware.svg</filename><data>PD94bWwgdmVyc2lvbj0iMS4wIj8+CjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2aWV3Qm94PSIwIDAgNTAgNTAiIHdpZHRoPSI1MHB4IiBoZWlnaHQ9IjUwcHgiPjxwYXRoIGQ9Ik0gNDIuNDE0MDYzIDE1IEMgMzguODI0MjE5IDE1IDM2LjU3NDIxOSAxNy41IDM2LjU3NDIxOSAxNy41IEMgMzUuMzc4OTA2IDE1Ljk0MTQwNiAzMy43MzA0NjkgMTUuMDAzOTA2IDMwLjk0MTQwNiAxNS4wMDM5MDYgQyAyNy45OTYwOTQgMTUuMDAzOTA2IDI2LjA0Mjk2OSAxNy41IDI2LjA0Mjk2OSAxNy41IEMgMjQuODQ3NjU2IDE1Ljk0MTQwNiAyMi42ODc1IDE1IDIxIDE1IEMgMTguMzkwNjI1IDE1IDE2LjMyMDMxMyAxNi4xNTIzNDQgMTUuMDU0Njg4IDE5LjA1ODU5NCBMIDEwLjgyMDMxMyAyOC4zMjAzMTMgTCA2LjAzMTI1IDE2LjU1ODU5NCBDIDUuNDI1NzgxIDE1LjIyNjU2MyAzLjkzMzU5NCAxNC42MjUgMi41NDI5NjkgMTUuMjQ2MDk0IEMgMS4xNDg0MzggMTUuODcxMDk0IDAuNjM2NzE5IDE3LjQyNTc4MSAxLjI2NTYyNSAxOC43NTc4MTMgTCA3LjExMzI4MSAzMS45NDUzMTMgQyA4LjAzMTI1IDMzLjk0OTIxOSA5LjAwMzkwNiAzNSAxMC44MjAzMTMgMzUgQyAxMi43NjU2MjUgMzUgMTMuNjA5Mzc1IDMzLjg1NTQ2OSAxNC41MzEyNSAzMS45NDUzMTMgQyAxNC41MzEyNSAzMS45NDUzMTMgMTguNTExNzE5IDIzLjA2MjUgMTkgMjIgQyAxOS40ODgyODEgMjAuOTM3NSAyMC4zMDA3ODEgMjAgMjEuNSAyMCBDIDIyLjg3NSAyMCAyNCAyMS4xMjUgMjQgMjIuNSBMIDI0IDMyLjM3NSBDIDI0IDMzLjgyMDMxMyAyNS4wODU5MzggMzUgMjYuNTIzNDM4IDM1IEMgMjcuOTU3MDMxIDM1IDI5IDMzLjgyMDMxMyAyOSAzMi4zNzUgTCAyOSAyMi41IEMgMjkgMjEuMTI1IDMwLjEyNSAyMCAzMS41IDIwIEMgMzIuODc1IDIwIDM0IDIxLjEyNSAzNCAyMi41IEwgMzQgMzIuNSBDIDM0IDMzLjg3NSAzNS4xMjUgMzUgMzYuNSAzNSBDIDM3Ljg3NSAzNSAzOSAzMy44NzUgMzkgMzIuNSBMIDM5IDIyLjUgQyAzOSAyMS4xMjUgNDAuMTI1IDIwIDQxLjUgMjAgQyA0Mi44NzUgMjAgNDQgMjEuMTI1IDQ0IDIyLjUgTCA0NCAzMi41IEMgNDQgMzMuODc1IDQ1LjEyNSAzNSA0Ni41IDM1IEMgNDcuODc1IDM1IDQ5IDMzLjg3NSA0OSAzMi41IEwgNDkgMjEuMzU1NDY5IEMgNDkgMTcuNjE3MTg4IDQ2LjAxMTcxOSAxNSA0Mi40MTQwNjMgMTUgWiIvPjwvc3ZnPgo=</data><downloads_count>0</downloads_count></logo>
+  <finalclass>OS Family</finalclass>
+  <friendlyname>vCenter Server</friendlyname>
+</OSFamily>
+<OSFamily alias="OSFamily" id="8">
+  <name>Windows</name>
+  <logo><mimetype>image/svg+xml</mimetype><filename>icons8-windows.svg</filename><data>PD94bWwgdmVyc2lvbj0iMS4wIj8+CjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2aWV3Qm94PSIwIDAgNDggNDgiIHdpZHRoPSI0OHB4IiBoZWlnaHQ9IjQ4cHgiPjxwYXRoIGZpbGw9IiMxOTc2ZDIiIGQ9Ik02LDZoMTd2MTdINlY2eiIvPjxwYXRoIGZpbGw9IiMxOTc2ZDIiIGQ9Ik0yNS4wNDIsMjIuOTU4VjZINDJ2MTYuOTU4SDI1LjA0MnoiLz48cGF0aCBmaWxsPSIjMTk3NmQyIiBkPSJNNiwyNWgxN3YxN0g2VjI1eiIvPjxwYXRoIGZpbGw9IiMxOTc2ZDIiIGQ9Ik0yNSw0MlYyNWgxN3YxN0gyNXoiLz48L3N2Zz4K</data><downloads_count>0</downloads_count></logo>
+  <finalclass>OS Family</finalclass>
+  <friendlyname>Windows</friendlyname>
+</OSFamily>
+<OSFamily alias="OSFamily" id="9">
+  <name>Windows server</name>
+  <logo><mimetype>image/svg+xml</mimetype><filename>icons8-windows-server.svg</filename><data>PD94bWwgdmVyc2lvbj0iMS4wIj8+CjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2aWV3Qm94PSIwIDAgNDggNDgiIHdpZHRoPSI0OHB4IiBoZWlnaHQ9IjQ4cHgiPjxwYXRoIGZpbGw9IiMwMGIwZmYiIGQ9Ik0yMCAyNS4wMjZMNS4wMTEgMjUgNS4wMTIgMzcuNzQ0IDIwIDM5LjgxOHpNMjIgMjUuMDNMMjIgNDAuMDk1IDQyLjk5NSA0MyA0MyAyNS4wNjZ6TTIwIDguMjU2TDUgMTAuMzggNS4wMTQgMjMgMjAgMjN6TTIyIDcuOTczTDIyIDIzIDQyLjk5NSAyMyA0Mi45OTUgNXoiLz48L3N2Zz4K</data><downloads_count>0</downloads_count></logo>
+  <finalclass>OS Family</finalclass>
+  <friendlyname>Windows server</friendlyname>
+</OSFamily>
 </Set>
 
+

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

@@ -323,18 +323,38 @@
             <value id="production">
               <code>production</code>
               <rank>30</rank>
+              <style>
+                <main_color>$ibo-lifecycle-active-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-active-state-secondary-color</complementary_color>
+                <decoration_classes/>
+              </style>
             </value>
             <value id="implementation">
               <code>implementation</code>
               <rank>20</rank>
+              <style>
+                <main_color>$ibo-lifecycle-inactive-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-inactive-state-secondary-color</complementary_color>
+                <decoration_classes/>
+              </style>
             </value>
             <value id="stock">
               <code>stock</code>
               <rank>10</rank>
+              <style>
+                <main_color>$ibo-lifecycle-neutral-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-neutral-state-secondary-color</complementary_color>
+                <decoration_classes/>
+              </style>
             </value>
             <value id="obsolete">
               <code>obsolete</code>
               <rank>40</rank>
+              <style>
+                <main_color>$ibo-lifecycle-frozen-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-frozen-state-secondary-color</complementary_color>
+                <decoration_classes/>
+              </style>
             </value>
           </values>
           <sql>status</sql>
@@ -4441,6 +4461,9 @@
             <attribute id="name"/>
           </attributes>
         </naming>
+        <fields_semantic>
+          <image_attribute>logo</image_attribute>
+        </fields_semantic>
         <style>
           <icon/>
         </style>
@@ -4450,7 +4473,15 @@
           </attributes>
         </reconciliation>
       </properties>
-      <fields/>
+      <fields>
+        <field id="logo" xsi:type="AttributeImage">
+          <display_max_width>96</display_max_width>
+          <display_max_height>96</display_max_height>
+          <storage_max_width>128</storage_max_width>
+          <storage_max_height>128</storage_max_height>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+      </fields>
       <methods/>
       <presentation>
         <details>
@@ -4458,6 +4489,9 @@
             <item id="name">
               <rank>10</rank>
             </item>
+            <item id="logo">
+              <rank>20</rank>
+            </item>
           </items>
         </details>
         <search>
@@ -4472,6 +4506,9 @@
             <item id="name">
               <rank>10</rank>
             </item>
+            <item id="logo">
+              <rank>20</rank>
+            </item>
           </items>
         </list>
       </presentation>
@@ -4554,6 +4591,9 @@
             <item id="name">
               <rank>10</rank>
             </item>
+            <item id="logo">
+              <rank>20</rank>
+            </item>
           </items>
         </list>
         <summary>
@@ -6897,14 +6937,29 @@
             <value id="production">
               <code>production</code>
               <rank>20</rank>
+              <style>
+                <main_color>$ibo-lifecycle-active-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-active-state-secondary-color</complementary_color>
+                <decoration_classes/>
+              </style>
             </value>
             <value id="implementation">
               <code>implementation</code>
               <rank>10</rank>
+              <style>
+                <main_color>$ibo-lifecycle-inactive-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-inactive-state-secondary-color</complementary_color>
+                <decoration_classes/>
+              </style>
             </value>
             <value id="obsolete">
               <code>obsolete</code>
               <rank>30</rank>
+              <style>
+                <main_color>$ibo-lifecycle-frozen-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-frozen-state-secondary-color</complementary_color>
+                <decoration_classes/>
+              </style>
             </value>
           </values>
           <sql>status</sql>

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

@@ -1104,7 +1104,7 @@ Dict::Add('EN US', 'English', 'English', [
 //
 
 Dict::Add('EN US', 'English', 'English', [
-	'Class:Model' => 'Model',
+	'Class:Model' => 'Device Model',
 	'Class:Model+' => '',
 	'Class:Model/ComplementaryName' => '%1$s - %2$s',
 	'Class:Model/Attribute:brand_id' => 'Brand',

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

@@ -1240,7 +1240,7 @@ Dict::Add('FR FR', 'French', 'Français', [
 //
 
 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:Model' => 'Modèle',
+	'Class:Model' => 'Modèle de matériel',
 	'Class:Model+' => '',
 	'Class:Model/ComplementaryName' => '%1$s - %2$s',
 	'Class:Model/Attribute:brand_id' => 'Marque',

datamodels/2.x/itop-config/src/Controller/ConfigEditorController.php

@@ -28,6 +28,7 @@ class ConfigEditorController extends Controller
 	public function __construct()
 	{
 		parent::__construct(MODULESROOT.static::MODULE_NAME.'/templates', static::MODULE_NAME);
+		$this->SetDebugAllowed(false);
 	}
 
 	public function OperationEdit(): void

datamodels/2.x/itop-container-mgmt/data/en_us.data.itop-container-image-type.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Set>
+  <ContainerImageType alias="ContainerImageType" id="1">
+  <name>Docker Hardened Image</name>
+  </ContainerImageType>
+  <ContainerImageType alias="ContainerImageType" id="2">
+  <name>Docker Official Image</name>
+  </ContainerImageType>
+  <ContainerImageType alias="ContainerImageType" id="3">
+  <name>Verified Publisher</name>
+  </ContainerImageType>
+</Set>

datamodels/2.x/itop-container-mgmt/data/en_us.data.itop-container-type.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Set>
+    <ContainerType alias="ContainerType" id="1">
+        <name>AWS - Elastic Container Service</name>
+    </ContainerType>
+    <ContainerType alias="ContainerType" id="2">
+        <name>AWS - Elastic Kubernetes Service</name>
+    </ContainerType>
+    <ContainerType alias="ContainerType" id="3">
+        <name>Azure Kubernetes Service</name>
+    </ContainerType>
+    <ContainerType alias="ContainerType" id="4">
+        <name>Docker Swarm</name>
+    </ContainerType>
+    <ContainerType alias="ContainerType" id="5">
+        <name>Google Kubernetes Engine</name>
+    </ContainerType>
+    <ContainerType alias="ContainerType" id="6">
+        <name>Kubernetes</name>
+    </ContainerType>
+    <ContainerType alias="ContainerType" id="7">
+        <name>Nomad</name>
+    </ContainerType>
+  <ContainerType alias="ContainerType" id="8">
+    <name>OpenShift</name>
+  </ContainerType>
+</Set>

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

@@ -0,0 +1,156 @@
+<?php
+
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2013 XXXXX
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+//
+// Fieldsets for Container classes
+//
+
+Dict::Add('EN US', 'English', 'English', [
+	'Container:baseinfo' => 'General',
+	'Container:moreinfo' => 'Container specifics',
+	'Container:otherinfo' => 'Dates and description',
+]);
+
+//
+// Class Container Image
+//
+
+Dict::Add('EN US', 'English', 'English', [
+	'Class:ContainerImage/Name' => '%1$s %2$s',
+	'Class:ContainerImage/ComplementaryName' => '%1$s - %2$s',
+	'Class:ContainerImage' => 'Container Image',
+	'Class:ContainerImage+' => 'The image of a software ready to be launched as a container',
+	'Class:ContainerImage/Attribute:name' => 'Name',
+	'Class:ContainerImage/Attribute:name+' => '',
+	'Class:ContainerImage/Attribute:version' => 'Version',
+	'Class:ContainerImage/Attribute:version+' => '',
+	'Class:ContainerImage/Attribute:description' => 'Description',
+	'Class:ContainerImage/Attribute:description+' => '',
+	'Class:ContainerImage/Attribute:publisher' => 'Publisher',
+	'Class:ContainerImage/Attribute:publisher+' => 'Publisher of the image. Eg. php, nginx, ...',
+	'Class:ContainerImage/Attribute:image' => 'Image',
+	'Class:ContainerImage/Attribute:image+' => 'Detailed information to retrieve the image on the appropriate hosting platform',
+	'Class:ContainerImage/Attribute:type_id' => 'Type',
+	'Class:ContainerImage/Attribute:type_id+' => 'Type d\image',
+	'Class:ContainerImage/Attribute:software_id' => 'Software',
+	'Class:ContainerImage/Attribute:software_id+' => '',
+	'Class:ContainerImage/Attribute:containerapplications_list' => 'Containerized Applications',
+	'Class:ContainerImage/Attribute:containerapplications_list+' => 'Applications to which this image contributes',
+]);
+
+//
+// Class Container Application
+//
+
+Dict::Add('EN US', 'English', 'English', [
+	'Class:ContainerApplication/Name' => '%1$s',
+	'Class:ContainerApplication/ComplementaryName' => '%1$s',
+	'Class:ContainerApplication' => 'Containerized Application',
+	'Class:ContainerApplication+' => 'An application deployed on a Container Platform',
+	'Class:ContainerApplication/Attribute:descriptor' => 'Deployment file',
+	'Class:ContainerApplication/Attribute:descriptor+' => 'File describing how to deploy the application on the container platform (e.g., Docker Compose, Helm Chart, etc.)',
+	'Class:ContainerApplication/Attribute:containervirtualhost_id' => 'Container Host',
+	'Class:ContainerApplication/Attribute:containervirtualhost_id+' => 'Container Platform on which the application is running',
+	'Class:ContainerApplication/Attribute:containertype_id' => 'Container type',
+	'Class:ContainerApplication/Attribute:containertype_id+' => 'Technology used for containerization',
+	'Class:ContainerApplication/Attribute:containerimages_list' => 'Container images',
+	'Class:ContainerApplication/Attribute:containerimages_list+' => 'Software images used to build the containerized application',
+
+]);
+
+//
+// Class: lnkContainerApplicationToImage
+//
+
+Dict::Add('EN US', 'English', 'English', [
+	'Class:lnkContainerApplicationToImage' => 'Link Container Application / Image',
+	'Class:lnkContainerApplicationToImage+' => '',
+	'Class:lnkContainerApplicationToImage/Name' => '%1$s / %2$s',
+	'Class:lnkContainerApplicationToImage/Name+' => '',
+	'Class:lnkContainerApplicationToImage/Attribute:containerapplication_id' => 'Containerized Application',
+	'Class:lnkContainerApplicationToImage/Attribute:containerapplication_id+' => 'Application which uses this image',
+	'Class:lnkContainerApplicationToImage/Attribute:containerimage_id' => 'Container Image',
+	'Class:lnkContainerApplicationToImage/Attribute:containerimage_id+' => 'Software image used to build the containerized application',
+]);
+
+//
+// Class Container Virtual Host
+//
+
+Dict::Add('EN US', 'English', 'English', [
+	'Class:ContainerVirtualHost/Name' => '%1$s',
+	'Class:ContainerVirtualHost/ComplementaryName' => '',
+	'Class:ContainerVirtualHost' => 'Container Platform',
+	'Class:ContainerVirtualHost+' => 'Platform on which applications run as containers',
+	'Class:ContainerVirtualHost/Attribute:containertype_id' => 'Container Type',
+	'Class:ContainerVirtualHost/Attribute:containertype_id+' => 'Technology used to deliver containerization',
+	'Class:ContainerVirtualHost/Attribute:status' => 'Status',
+	'Class:ContainerVirtualHost/Attribute:status+' => 'Status of the container platform',
+	'Class:ContainerVirtualHost/Attribute:containerapplications_list' => 'Applications',
+	'Class:ContainerVirtualHost/Attribute:containerapplications_list+' => 'Applications running on this container environment',
+]);
+
+//
+// Class Container Host
+//
+
+Dict::Add('EN US', 'English', 'English', [
+	'Class:ContainerHost/Name' => '%1$s',
+	'Class:ContainerHost/ComplementaryName' => '%1$s-%2$s',
+	'Class:ContainerHost' => 'Container Host',
+	'Class:ContainerHost+' => 'Host dedicated to containers. It is the basic element of a Container Platform',
+	'Class:ContainerHost/Attribute:containercluster_id' => 'Container Cluster',
+	'Class:ContainerHost/Attribute:containercluster_id+' => '',
+	'Class:ContainerHost/Attribute:role' => 'Role',
+	'Class:ContainerHost/Attribute:role+' => 'Role of the host within its cluster: Master or Worker. Standalone when not part of a cluster.',
+	'Class:ContainerHost/Attribute:system_id' => 'System',
+	'Class:ContainerHost/Attribute:system_id+' => 'The system can be a Server, a Virtual Machine, a Cloud, ...',
+	'Class:ContainerHost/Attribute:role/Value:master' => 'Master',
+	'Class:ContainerHost/Attribute:role/Value:worker' => 'Worker',
+	'Class:ContainerHost/Attribute:role/Value:standalone' => 'Standalone',
+]);
+
+//
+// Class Container Cluster
+//
+
+Dict::Add('EN US', 'English', 'English', [
+	'Class:ContainerCluster/Name' => '%1$s',
+	'Class:ContainerCluster/ComplementaryName' => '',
+	'Class:ContainerCluster' => 'Container Cluster',
+	'Class:ContainerCluster+' => 'A Container Platform made of a cluster of Container Hosts',
+	'Class:ContainerCluster/Attribute:redundancy' => 'Configuration of the redundancy',
+	'Class:ContainerCluster/Attribute:redundancy/disabled' => 'The cluster is up if all its hosts are up',
+	'Class:ContainerCluster/Attribute:redundancy/count' => 'The cluster is up if at least %1$s hosts are up',
+	'Class:ContainerCluster/Attribute:redundancy/percent' => 'The cluster is up if at least %1$s %% of the hosts are up',
+	'Class:ContainerCluster/Attribute:containerhosts_list' => 'Container Hosts',
+	'Class:ContainerCluster/Attribute:containerhosts_list+' => 'Hosts part of this cluster',
+]);
+
+//
+// Class Container Type
+//
+
+Dict::Add('EN US', 'English', 'English', [
+	'Class:ContainerType/Name' => '%1$s',
+	'Class:ContainerType/ComplementaryName' => '',
+	'Class:ContainerType' => 'Container Type',
+	'Class:ContainerType+' => 'Technology used to deliver containerization',
+]);
+
+//
+// Class Container Type
+//
+
+Dict::Add('EN US', 'English', 'English', [
+	'Class:ContainerImageType/Name' => '%1$s',
+	'Class:ContainerImageType/ComplementaryName' => '',
+	'Class:ContainerImageType' => 'Container Image Type',
+	'Class:ContainerImageType+' => 'Typology of container images',
+]);

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

@@ -0,0 +1,157 @@
+<?php
+
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2013 XXXXX
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+//
+// Fieldsets for Container classes
+//
+
+Dict::Add('FR FR', 'French', 'Français', [
+	'Container:baseinfo' => 'Informations générales',
+	'Container:moreinfo' => 'Spécificités de la conteneurisation',
+	'Container:otherinfo' => 'Dates et description',
+]);
+
+//
+// Class Container Image
+//
+
+Dict::Add('FR FR', 'French', 'Français', [
+	'Class:ContainerImage/Name' => '%1$s %2$s',
+	'Class:ContainerImage/ComplementaryName' => '%1$s - %2$s',
+	'Class:ContainerImage' => 'Image pour Conteneur',
+	'Class:ContainerImage+' => 'L\'image d\'un logiciel, constituant d\'une Application Conteneurisée',
+	'Class:ContainerImage/Attribute:name' => 'Nom',
+	'Class:ContainerImage/Attribute:name+' => '',
+	'Class:ContainerImage/Attribute:version' => 'Version',
+	'Class:ContainerImage/Attribute:version+' => '',
+	'Class:ContainerImage/Attribute:description' => 'Description',
+	'Class:ContainerImage/Attribute:description+' => '',
+	'Class:ContainerImage/Attribute:publisher' => 'Editeur',
+	'Class:ContainerImage/Attribute:publisher+' => 'Fournisseur de l\image',
+	'Class:ContainerImage/Attribute:image' => 'Image',
+	'Class:ContainerImage/Attribute:image+' => 'Détail permettant de récupérer l\'image sur la plateforme d\'hébergement appropriée',
+	'Class:ContainerImage/Attribute:type_id' => 'Type',
+	'Class:ContainerImage/Attribute:type_id+' => 'Type d\image',
+	'Class:ContainerImage/Attribute:software_id' => 'Logiciel',
+	'Class:ContainerImage/Attribute:software_id+' => '',
+	'Class:ContainerImage/Attribute:containerapplications_list' => 'Applications conteneurisées',
+	'Class:ContainerImage/Attribute:containerapplications_list+' => 'Les applications qui utilisent cette image',
+]);
+
+//
+// Class Container Application
+//
+
+Dict::Add('FR FR', 'French', 'Français', [
+	'Class:ContainerApplication/Name' => '%1$s',
+	'Class:ContainerApplication/ComplementaryName' => '%1$s',
+	'Class:ContainerApplication' => 'Application Conteneurisée',
+	'Class:ContainerApplication+' => 'Une application déployée sur une Plateforme de Conteneurisation',
+	'Class:ContainerApplication/Attribute:descriptor' => 'Fichier de déploiement',
+	'Class:ContainerApplication/Attribute:descriptor+' => 'Fichier décrivant la manière de déployer l\'application sur la plateforme de conteneurisation (par exemple, Docker Compose, Helm Chart, etc.)',
+	'Class:ContainerApplication/Attribute:containervirtualhost_id' => 'Hôte',
+	'Class:ContainerApplication/Attribute:containervirtualhost_id+' => 'Plateforme de conteneurisation sur laquelle cette application est déployée',
+	'Class:ContainerApplication/Attribute:containertype_id' => 'Type de conteneur',
+	'Class:ContainerApplication/Attribute:containertype_id+' => 'Typologie de plateforme de conteneurisation',
+	'Class:ContainerApplication/Attribute:containerimages_list' => 'Images',
+	'Class:ContainerApplication/Attribute:containerimages_list+' => 'Images des conteneurs constitutifs de cette application',
+]);
+
+//
+// Class: lnkContainerApplicationToImage
+//
+
+Dict::Add('FR FR', 'French', 'Français', [
+	'Class:lnkContainerApplicationToImage' => 'Lien Application / Image pour Conteneur',
+	'Class:lnkContainerApplicationToImage+' => '',
+	'Class:lnkContainerApplicationToImage/Name' => '%1$s / %2$s',
+	'Class:lnkContainerApplicationToImage/Name+' => '',
+	'Class:lnkContainerApplicationToImage/Attribute:containerapplication_id' => 'Application conteneurisée',
+	'Class:lnkContainerApplicationToImage/Attribute:containerapplication_id+' => 'Application qui utilise cette image',
+	'Class:lnkContainerApplicationToImage/Attribute:containerimage_id' => 'Image pour conteneur',
+	'Class:lnkContainerApplicationToImage/Attribute:containerimage_id+' => 'Une image qui contribue à l\'application',
+]);
+
+//
+// Class Container Virtual Host
+//
+
+Dict::Add('FR FR', 'French', 'Français', [
+	'Class:ContainerVirtualHost/Name' => '%1$s',
+	'Class:ContainerVirtualHost/ComplementaryName' => '',
+	'Class:ContainerVirtualHost' => 'Plateforme de Conteneurisation',
+	'Class:ContainerVirtualHost+' => 'Plateforme sur laquelle des applications s\'exécutent dans des conteneurs',
+	'Class:ContainerVirtualHost/Attribute:containertype_id' => 'Type de plateforme',
+	'Class:ContainerVirtualHost/Attribute:containertype_id+' => 'Technologie de conteneurisation utilisée',
+	'Class:ContainerVirtualHost/Attribute:status' => 'État',
+	'Class:ContainerVirtualHost/Attribute:status+' => 'État de la plateforme de conteneurisation',
+	'Class:ContainerVirtualHost/Attribute:containerapplications_list' => 'Applications',
+	'Class:ContainerVirtualHost/Attribute:containerapplications_list+' => 'Applications qui sont déployées sur cette plateforme',
+	'ContainerVirtualHost:baseinfo' => 'Informations générales',
+	'ContainerVirtualHost:moreinfo' => 'Spécificités de la conteneurisation',
+]);
+
+//
+// Class Container Host
+//
+
+Dict::Add('FR FR', 'French', 'Français', [
+	'Class:ContainerHost/Name' => '%1$s',
+	'Class:ContainerHost/ComplementaryName' => '%1$s-%2$s',
+	'Class:ContainerHost' => 'Hôte pour Conteneurs',
+	'Class:ContainerHost+' => 'Logiciel hôte dédié à l\'exécution de conteneurs. C\'est l\'élément de base d\'une Plateforme de Conteneurisation',
+	'Class:ContainerHost/Attribute:containercluster_id' => 'Grappe pour conteneurs',
+	'Class:ContainerHost/Attribute:containercluster_id+' => 'Grappe d\'hôtes pour conteneurs',
+	'Class:ContainerHost/Attribute:role' => 'Rôle',
+	'Class:ContainerHost/Attribute:role+' => 'Rôle de cet hôte au sein de la grappe : Maître ou Esclave. Autonome en l\'absence de grappe',
+	'Class:ContainerHost/Attribute:role/Value:master' => 'Maître',
+	'Class:ContainerHost/Attribute:role/Value:worker' => 'Esclave',
+	'Class:ContainerHost/Attribute:role/Value:standalone' => 'Autonome',
+	'Class:ContainerHost/Attribute:system_id' => 'Système',
+	'Class:ContainerHost/Attribute:system_id+' => 'Le système sur lequel cet hôte tourne. Cela peut être un Serveur, une Machine Virtuelle ou un Nuage',
+]);
+
+//
+// Class Container Cluster
+//
+
+Dict::Add('FR FR', 'French', 'Français', [
+	'Class:ContainerCluster/Name' => '%1$s',
+	'Class:ContainerCluster/ComplementaryName' => '',
+	'Class:ContainerCluster' => 'Grappe pour Conteneurs',
+	'Class:ContainerCluster+' => 'Plateforme de Conteneurisation constitué d\'une grappe d\'Hôtes pour Conteneurs',
+	'Class:ContainerCluster/Attribute:redundancy' => 'Configuration de la redondance',
+	'Class:ContainerCluster/Attribute:redundancy/disabled' => 'La grappe est opérationnelle si tous les hôtes qui la composent sont opérationnels',
+	'Class:ContainerCluster/Attribute:redundancy/count' => 'Nombre minimal d\'hôtes pour que la grappe soit opérationnelle : %1$s',
+	'Class:ContainerCluster/Attribute:redundancy/percent' => 'Pourcentage minimal d\'hôtes pour que la grappe soit opérationnelle : %1$s %%',
+	'Class:ContainerCluster/Attribute:containerhosts_list' => 'Hôtes pour conteneurs',
+	'Class:ContainerCluster/Attribute:containerhosts_list+' => 'Hôtes composant cette grappe',
+]);
+
+//
+// Class Container Type
+//
+
+Dict::Add('FR FR', 'French', 'Français', [
+	'Class:ContainerType/Name' => '%1$s',
+	'Class:ContainerType/ComplementaryName' => '',
+	'Class:ContainerType' => 'Type de conteneurisation',
+	'Class:ContainerType+' => 'Technologie de conteneurisation',
+]);
+
+//
+// Class Container Image Type
+//
+
+Dict::Add('FR FR', 'French', 'Français', [
+	'Class:ContainerImageType/Name' => '%1$s',
+	'Class:ContainerImageType/ComplementaryName' => '',
+	'Class:ContainerImageType' => 'Type d\'image',
+	'Class:ContainerImageType+' => 'Typologie d\'images pour container',
+]);

datamodels/2.x/itop-container-mgmt/images/icons8-application-container.svg

@@ -0,0 +1,346 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="0 0 48 48"
+   width="48px"
+   height="48px"
+   version="1.1"
+   id="svg17"
+   sodipodi:docname="icons8-desktop-container-alt(2).svg"
+   inkscape:version="1.4.2 (ebf0e940d0, 2025-05-08)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs17">
+    <linearGradient
+       id="z~0a6SjB_MRO4U5XcH~qfa"
+       x1="24"
+       x2="24"
+       y1="4.4889998"
+       y2="45.143002"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.50425665,0,0,0.52649101,23.048596,23.922275)">
+      <stop
+         offset="0"
+         stop-color="#21ad64"
+         id="stop1-3" />
+      <stop
+         offset="1"
+         stop-color="#088242"
+         id="stop2-6" />
+    </linearGradient>
+    <linearGradient
+       x1="24"
+       y1="4.4889998"
+       x2="24"
+       y2="45.143002"
+       gradientUnits="userSpaceOnUse"
+       id="color-1">
+      <stop
+         offset="0"
+         stop-color="#f44f5a"
+         id="stop1-7" />
+      <stop
+         offset="1"
+         stop-color="#e52030"
+         id="stop2-5" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="namedview17"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="8"
+     inkscape:cx="-14"
+     inkscape:cy="22"
+     inkscape:window-width="2560"
+     inkscape:window-height="1360"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg17"
+     showguides="true">
+    <sodipodi:guide
+       position="8.6248555,32.468683"
+       orientation="1,0"
+       id="guide17"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="18.623701,39.409067"
+       orientation="0,-1"
+       id="guide18"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="14.939875,32.189707"
+       orientation="0,-1"
+       id="guide19"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="-48.5,14.5625"
+       orientation="1,0"
+       id="guide20"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="10.092844,11.552042"
+       orientation="0,-1"
+       id="guide21"
+       inkscape:locked="false" />
+  </sodipodi:namedview>
+  <radialGradient
+     id="JbJPDQpzlQgFl0pQhERgYa"
+     cx="232.47"
+     cy="544.051"
+     r="86.245"
+     gradientTransform="matrix(0.7455679,0,0,-0.93789676,-130.40909,581.4208)"
+     gradientUnits="userSpaceOnUse">
+    <stop
+       offset=".323"
+       stop-color="#23d9d6"
+       id="stop1" />
+    <stop
+       offset=".427"
+       stop-color="#23d4d7"
+       id="stop2" />
+    <stop
+       offset=".542"
+       stop-color="#21c7dc"
+       id="stop3" />
+    <stop
+       offset=".664"
+       stop-color="#1fb0e2"
+       id="stop4" />
+    <stop
+       offset=".789"
+       stop-color="#1c91ec"
+       id="stop5" />
+    <stop
+       offset=".917"
+       stop-color="#1969f8"
+       id="stop6" />
+    <stop
+       offset=".944"
+       stop-color="#1860fb"
+       id="stop7" />
+  </radialGradient>
+  <path
+     fill="url(#JbJPDQpzlQgFl0pQhERgYa)"
+     d="M 7.7397454,6 H 35.575672 c 0.96121,0 1.739746,0.7785361 1.739746,1.7397454 V 35.575672 c 0,0.96121 -0.778536,1.739746 -1.739746,1.739746 H 7.7397454 C 6.7785361,37.315418 6,36.536882 6,35.575672 V 7.7397454 C 6,6.7785361 6.7785361,6 7.7397454,6 Z"
+     id="path7"
+     style="fill:url(#JbJPDQpzlQgFl0pQhERgYa);stroke-width:0.869873" />
+  <path
+     fill="#184f85"
+     d="M 37.315418,35.575672 V 32.096181 H 6 v 3.479491 c 0,0.96121 0.7785361,1.739746 1.7397454,1.739746 H 35.575672 c 0.96121,0 1.739746,-0.778536 1.739746,-1.739746 z"
+     id="path8"
+     style="stroke-width:0.869873" />
+  <path
+     d="m 8.1746818,36.445545 c -0.7193848,0 -1.3048091,-0.585424 -1.3048091,-1.304809 v -0.869873 c 0,-0.719385 0.5854243,-1.304809 1.3048091,-1.304809 h 0.8698727 c 0.7193847,0 1.3048095,0.585424 1.3048095,1.304809 v 0.869873 c 0,0.719385 -0.5854248,1.304809 -1.3048095,1.304809 z"
+     opacity="0.05"
+     id="path9"
+     style="display:inline;stroke-width:0.869873" />
+  <path
+     d="m 8.1746818,36.010609 c -0.4792999,0 -0.8698727,-0.390573 -0.8698727,-0.869873 v -0.869873 c 0,-0.4793 0.3905728,-0.869873 0.8698727,-0.869873 h 0.8698727 c 0.4792999,0 0.8698727,0.390573 0.8698727,0.869873 v 0.869873 c 0,0.4793 -0.3905728,0.869873 -0.8698727,0.869873 z"
+     opacity="0.07"
+     id="path10"
+     style="stroke-width:0.869873" />
+  <path
+     fill="#ffffff"
+     d="M 9.0445545,35.575672 H 8.1746818 c -0.2400849,0 -0.4349364,-0.194851 -0.4349364,-0.434936 v -0.869873 c 0,-0.240085 0.1948515,-0.434936 0.4349364,-0.434936 h 0.8698727 c 0.2400849,0 0.4349363,0.194851 0.4349363,0.434936 v 0.869873 c 0,0.240085 -0.1948514,0.434936 -0.4349363,0.434936 z"
+     id="path11"
+     style="stroke-width:0.869873" />
+  <path
+     d="m 12.442916,36.457287 c -0.719385,0 -1.304809,-0.585424 -1.304809,-1.304809 v -0.869873 c 0,-0.719385 0.585424,-1.304809 1.304809,-1.304809 h 0.869873 c 0.719384,0 1.304809,0.585424 1.304809,1.304809 v 0.869873 c 0,0.719385 -0.585425,1.304809 -1.304809,1.304809 z"
+     opacity="0.05"
+     id="path9-5"
+     style="display:inline;stroke-width:0.869873" />
+  <path
+     d="m 12.442916,36.022351 c -0.4793,0 -0.869873,-0.390573 -0.869873,-0.869873 v -0.869873 c 0,-0.4793 0.390573,-0.869873 0.869873,-0.869873 h 0.869873 c 0.4793,0 0.869873,0.390573 0.869873,0.869873 v 0.869873 c 0,0.4793 -0.390573,0.869873 -0.869873,0.869873 z"
+     opacity="0.07"
+     id="path10-9"
+     style="stroke-width:0.869873" />
+  <path
+     fill="#ffffff"
+     d="m 13.312789,35.587414 h -0.869873 c -0.240085,0 -0.434936,-0.194851 -0.434936,-0.434936 v -0.869873 c 0,-0.240085 0.194851,-0.434936 0.434936,-0.434936 h 0.869873 c 0.240085,0 0.434936,0.194851 0.434936,0.434936 v 0.869873 c 0,0.240085 -0.194851,0.434936 -0.434936,0.434936 z"
+     id="path11-2"
+     style="stroke-width:0.869873" />
+  <path
+     d="m 16.812935,36.440821 c -0.719385,0 -1.304809,-0.585424 -1.304809,-1.304809 v -0.869873 c 0,-0.719385 0.585424,-1.304809 1.304809,-1.304809 h 0.869873 c 0.719384,0 1.304809,0.585424 1.304809,1.304809 v 0.869873 c 0,0.719385 -0.585425,1.304809 -1.304809,1.304809 z"
+     opacity="0.05"
+     id="path9-8"
+     style="display:inline;stroke-width:0.869873" />
+  <path
+     d="m 16.812935,36.005885 c -0.4793,0 -0.869873,-0.390573 -0.869873,-0.869873 v -0.869873 c 0,-0.4793 0.390573,-0.869873 0.869873,-0.869873 h 0.869873 c 0.4793,0 0.869872,0.390573 0.869872,0.869873 v 0.869873 c 0,0.4793 -0.390572,0.869873 -0.869872,0.869873 z"
+     opacity="0.07"
+     id="path10-97"
+     style="stroke-width:0.869873" />
+  <path
+     fill="#ffffff"
+     d="m 17.682808,35.570948 h -0.869873 c -0.240085,0 -0.434936,-0.194851 -0.434936,-0.434936 v -0.869873 c 0,-0.240085 0.194851,-0.434936 0.434936,-0.434936 h 0.869873 c 0.240085,0 0.434936,0.194851 0.434936,0.434936 v 0.869873 c 0,0.240085 -0.194851,0.434936 -0.434936,0.434936 z"
+     id="path11-3"
+     style="stroke-width:0.869873" />
+  <path
+     d="m 21.172333,36.463025 c -0.719385,0 -1.304809,-0.585424 -1.304809,-1.304809 v -0.869873 c 0,-0.719385 0.585424,-1.304809 1.304809,-1.304809 h 0.869872 c 0.719385,0 1.30481,0.585424 1.30481,1.304809 v 0.869873 c 0,0.719385 -0.585425,1.304809 -1.30481,1.304809 z"
+     opacity="0.05"
+     id="path9-1"
+     style="display:inline;stroke-width:0.869873" />
+  <path
+     d="m 21.172333,36.028089 c -0.4793,0 -0.869873,-0.390573 -0.869873,-0.869873 v -0.869873 c 0,-0.4793 0.390573,-0.869873 0.869873,-0.869873 h 0.869872 c 0.4793,0 0.869873,0.390573 0.869873,0.869873 v 0.869873 c 0,0.4793 -0.390573,0.869873 -0.869873,0.869873 z"
+     opacity="0.07"
+     id="path10-2"
+     style="stroke-width:0.869873" />
+  <path
+     fill="#ffffff"
+     d="m 22.042205,35.593152 h -0.869872 c -0.240085,0 -0.434937,-0.194851 -0.434937,-0.434936 v -0.869873 c 0,-0.240085 0.194852,-0.434936 0.434937,-0.434936 h 0.869872 c 0.240085,0 0.434937,0.194851 0.434937,0.434936 v 0.869873 c 0,0.240085 -0.194852,0.434936 -0.434937,0.434936 z"
+     id="path11-9"
+     style="stroke-width:0.869873" />
+  <path
+     d="m 9.9144272,13.828854 c -0.7193847,0 -1.3048091,-0.585424 -1.3048091,-1.304809 V 9.9144272 c 0,-0.7193847 0.5854244,-1.3048091 1.3048091,-1.3048091 h 2.6096178 c 0.719385,0 1.304809,0.5854244 1.304809,1.3048091 v 2.6096178 c 0,0.719385 -0.585424,1.304809 -1.304809,1.304809 z"
+     opacity="0.05"
+     id="path12"
+     style="stroke-width:0.869873" />
+  <path
+     d="m 9.9144272,13.393918 c -0.4792999,0 -0.8698727,-0.390573 -0.8698727,-0.869873 V 9.9144272 c 0,-0.4792999 0.3905728,-0.8698727 0.8698727,-0.8698727 h 2.6096178 c 0.4793,0 0.869873,0.3905728 0.869873,0.8698727 v 2.6096178 c 0,0.4793 -0.390573,0.869873 -0.869873,0.869873 z"
+     opacity="0.07"
+     id="path13"
+     style="stroke-width:0.869873" />
+  <path
+     fill="#ffffff"
+     d="M 12.524045,12.958982 H 9.9144272 c -0.2400849,0 -0.4349364,-0.194852 -0.4349364,-0.434937 V 9.9144272 c 0,-0.2400849 0.1948515,-0.4349364 0.4349364,-0.4349364 h 2.6096178 c 0.240085,0 0.434937,0.1948515 0.434937,0.4349364 v 2.6096178 c 0,0.240085 -0.194852,0.434937 -0.434937,0.434937 z"
+     id="path14"
+     style="stroke-width:0.869873" />
+  <path
+     d="m 9.925223,21.049076 c -0.719385,0 -1.304809,-0.585424 -1.304809,-1.304809 v -2.609618 c 0,-0.719385 0.585424,-1.304809 1.304809,-1.304809 h 2.609618 c 0.719385,0 1.304809,0.585424 1.304809,1.304809 v 2.609618 c 0,0.719385 -0.585424,1.304809 -1.304809,1.304809 z"
+     opacity="0.05"
+     id="path12-7"
+     style="stroke-width:0.869873" />
+  <path
+     d="m 9.925223,20.61414 c -0.4793,0 -0.869873,-0.390573 -0.869873,-0.869873 v -2.609618 c 0,-0.4793 0.390573,-0.869873 0.869873,-0.869873 h 2.609618 c 0.4793,0 0.869873,0.390573 0.869873,0.869873 v 2.609618 c 0,0.4793 -0.390573,0.869873 -0.869873,0.869873 z"
+     opacity="0.07"
+     id="path13-0"
+     style="stroke-width:0.869873" />
+  <path
+     fill="#ffffff"
+     d="M 12.534841,20.179204 H 9.925223 c -0.240085,0 -0.434936,-0.194852 -0.434936,-0.434937 v -2.609618 c 0,-0.240085 0.194851,-0.434936 0.434936,-0.434936 h 2.609618 c 0.240085,0 0.434937,0.194851 0.434937,0.434936 v 2.609618 c 0,0.240085 -0.194852,0.434937 -0.434937,0.434937 z"
+     id="path14-9"
+     style="stroke-width:0.869873" />
+  <g
+     id="g17">
+    <path
+       d="m 9.9239547,28.13042 c -0.719385,0 -1.304809,-0.585424 -1.304809,-1.304809 v -2.609618 c 0,-0.719384 0.585424,-1.304809 1.304809,-1.304809 h 2.6096183 c 0.719385,0 1.304809,0.585425 1.304809,1.304809 v 2.609618 c 0,0.719385 -0.585424,1.304809 -1.304809,1.304809 z"
+       opacity="0.05"
+       id="path12-6"
+       style="stroke-width:0.869873" />
+    <path
+       d="m 9.9239547,27.695484 c -0.4793,0 -0.869873,-0.390573 -0.869873,-0.869873 v -2.609618 c 0,-0.4793 0.390573,-0.869873 0.869873,-0.869873 h 2.6096183 c 0.4793,0 0.869873,0.390573 0.869873,0.869873 v 2.609618 c 0,0.4793 -0.390573,0.869873 -0.869873,0.869873 z"
+       opacity="0.07"
+       id="path13-06"
+       style="stroke-width:0.869873" />
+    <path
+       fill="#ffffff"
+       d="M 12.533573,27.260548 H 9.9239547 c -0.240085,0 -0.434936,-0.194852 -0.434936,-0.434937 v -2.609618 c 0,-0.240085 0.194851,-0.434936 0.434936,-0.434936 h 2.6096183 c 0.240085,0 0.434937,0.194851 0.434937,0.434936 v 2.609618 c 0,0.240085 -0.194852,0.434937 -0.434937,0.434937 z"
+       id="path14-2"
+       style="stroke-width:0.869873" />
+  </g>
+  <g
+     id="g18"
+     transform="translate(1.8119612,-8.374796)">
+    <path
+       d="M 15.304809,22.219236 C 14.585424,22.219236 14,21.633812 14,20.914427 V 18.304809 C 14,17.585424 14.585424,17 15.304809,17 h 2.609618 c 0.719385,0 1.304809,0.585424 1.304809,1.304809 v 2.609618 c 0,0.719385 -0.585424,1.304809 -1.304809,1.304809 z"
+       opacity="0.05"
+       id="path12-1"
+       style="stroke-width:0.869873" />
+    <path
+       d="m 15.304809,21.7843 c -0.4793,0 -0.869873,-0.390573 -0.869873,-0.869873 v -2.609618 c 0,-0.4793 0.390573,-0.869873 0.869873,-0.869873 h 2.609618 c 0.4793,0 0.869873,0.390573 0.869873,0.869873 v 2.609618 c 0,0.4793 -0.390573,0.869873 -0.869873,0.869873 z"
+       opacity="0.07"
+       id="path13-8"
+       style="stroke-width:0.869873" />
+    <path
+       fill="#ffffff"
+       d="m 17.914427,21.349364 h -2.609618 c -0.240085,0 -0.434936,-0.194852 -0.434936,-0.434937 v -2.609618 c 0,-0.240085 0.194851,-0.434936 0.434936,-0.434936 h 2.609618 c 0.240085,0 0.434937,0.194851 0.434937,0.434936 v 2.609618 c 0,0.240085 -0.194852,0.434937 -0.434937,0.434937 z"
+       id="path14-7"
+       style="stroke-width:0.869873" />
+  </g>
+  <path
+     d="m 17.084265,21.042459 c -0.719384,0 -1.304809,-0.585424 -1.304809,-1.304809 v -2.609618 c 0,-0.719385 0.585425,-1.304809 1.304809,-1.304809 h 2.609618 c 0.719385,0 1.304809,0.585424 1.304809,1.304809 v 2.609618 c 0,0.719385 -0.585424,1.304809 -1.304809,1.304809 z"
+     opacity="0.05"
+     id="path12-2"
+     style="stroke-width:0.869873" />
+  <path
+     d="m 17.084265,20.607523 c -0.4793,0 -0.869873,-0.390573 -0.869873,-0.869873 v -2.609618 c 0,-0.4793 0.390573,-0.869873 0.869873,-0.869873 h 2.609618 c 0.4793,0 0.869873,0.390573 0.869873,0.869873 v 2.609618 c 0,0.4793 -0.390573,0.869873 -0.869873,0.869873 z"
+     opacity="0.07"
+     id="path13-02"
+     style="stroke-width:0.869873" />
+  <path
+     fill="#ffffff"
+     d="m 19.693883,20.172587 h -2.609618 c -0.240085,0 -0.434936,-0.194852 -0.434936,-0.434937 v -2.609618 c 0,-0.240085 0.194851,-0.434936 0.434936,-0.434936 h 2.609618 c 0.240085,0 0.434937,0.194851 0.434937,0.434936 v 2.609618 c 0,0.240085 -0.194852,0.434937 -0.434937,0.434937 z"
+     id="path14-3"
+     style="stroke-width:0.869873" />
+  <g
+     fill="none"
+     fill-rule="nonzero"
+     stroke="none"
+     stroke-width="1"
+     stroke-linecap="butt"
+     stroke-linejoin="miter"
+     stroke-miterlimit="10"
+     stroke-dasharray="none"
+     stroke-dashoffset="0"
+     font-family="none"
+     font-weight="none"
+     font-size="none"
+     text-anchor="none"
+     style="display:inline;mix-blend-mode:normal"
+     id="g9"
+     transform="matrix(0.09476897,0,0,0.09902703,23.025816,23.874812)">
+    <g
+       transform="scale(5.33333)"
+       id="g8">
+      <path
+         d="m 1,12 h 46 v 25 c 0,0.552 -0.448,1 -1,1 H 2 C 1.448,38 1,37.552 1,37 Z"
+         fill="#b41530"
+         id="path2-3" />
+      <path
+         d="m 44,10 c -0.552,0 -1,0.448 -1,1 v 1 H 5 V 11 C 5,10.448 4.552,10 4,10 H 2 c -0.552,0 -1,0.448 -1,1 v 26 c 0,0.552 0.448,1 1,1 h 44 c 0.552,0 1,-0.448 1,-1 V 12 11 c 0,-0.552 -0.448,-1 -1,-1 z m -31,4 h 2 V 36 H 13 Z M 11,36 H 9 V 14 h 2 z m 6,-22 h 2 v 22 h -2 z m 4,0 h 2 v 22 h -2 z m 4,0 h 2 v 22 h -2 z m 4,0 h 2 v 22 h -2 z m 4,0 h 2 v 22 h -2 z m 4,0 h 2 V 36 H 37 Z M 5,14 H 7 V 36 H 5 Z M 43,36 H 41 V 14 h 2 z"
+         fill="url(#color-1)"
+         id="path3-5"
+         style="fill:url(#color-1)" />
+      <path
+         d="m 13.5,36 h 4 c 0.276,0 0.5,0.224 0.5,0.5 v 1 c 0,0.276 -0.224,0.5 -0.5,0.5 h -4 C 13.224,38 13,37.776 13,37.5 v -1 C 13,36.224 13.224,36 13.5,36 Z"
+         fill="#a3102a"
+         id="path4-6" />
+      <path
+         d="m 30.5,36 h 4 c 0.276,0 0.5,0.224 0.5,0.5 v 1 c 0,0.276 -0.224,0.5 -0.5,0.5 h -4 C 30.224,38 30,37.776 30,37.5 v -1 C 30,36.224 30.224,36 30.5,36 Z"
+         fill="#a3102a"
+         id="path5" />
+      <circle
+         cx="45"
+         cy="12"
+         r="1"
+         fill="#a3102a"
+         id="circle5-2" />
+      <circle
+         cx="45"
+         cy="36"
+         r="1"
+         fill="#a3102a"
+         id="circle6-9" />
+      <circle
+         cx="3"
+         cy="12"
+         r="1"
+         fill="#a3102a"
+         id="circle7-1" />
+      <circle
+         cx="3"
+         cy="36"
+         r="1"
+         fill="#a3102a"
+         id="circle8" />
+    </g>
+  </g>
+</svg>

datamodels/2.x/itop-container-mgmt/images/icons8-cloud.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 48 48" width="48px" height="48px"><linearGradient id="IW_Sf1PHIv01Y0HkR8iXLa" x1="33.5" x2="33.5" y1="21.279" y2="14.16" gradientTransform="matrix(1 0 0 -1 0 47.89)" gradientUnits="userSpaceOnUse"><stop offset=".168" stop-color="#c9cdcf"/><stop offset=".423" stop-color="#dcdee0"/><stop offset=".477" stop-color="#e1e2e4"/><stop offset=".859" stop-color="#e4e4e6"/></linearGradient><path fill="url(#IW_Sf1PHIv01Y0HkR8iXLa)" d="M37,38c-0.132,0-0.266-0.025-0.394-0.081l-4.575-1.961C30.189,35.169,29,33.365,29,31.362V25	c0-0.553,0.447-1,1-1s1,0.447,1,1v6.362c0,1.201,0.714,2.284,1.818,2.758l4.575,1.961c0.508,0.218,0.743,0.806,0.525,1.313	C37.757,37.773,37.388,38,37,38z"/><linearGradient id="IW_Sf1PHIv01Y0HkR8iXLb" x1="-533.666" x2="-536.399" y1="13.398" y2="8.258" gradientTransform="rotate(180 -249 23.945)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#33bef0"/><stop offset="1" stop-color="#0a85d9"/></linearGradient><circle cx="37" cy="37" r="3" fill="url(#IW_Sf1PHIv01Y0HkR8iXLb)"/><linearGradient id="IW_Sf1PHIv01Y0HkR8iXLc" x1="14.5" x2="14.5" y1="21.279" y2="14.16" gradientTransform="matrix(1 0 0 -1 0 47.89)" gradientUnits="userSpaceOnUse"><stop offset=".194" stop-color="#c9cdcf"/><stop offset=".503" stop-color="#e1e2e4"/><stop offset=".859" stop-color="#e4e4e6"/></linearGradient><path fill="url(#IW_Sf1PHIv01Y0HkR8iXLc)" d="M11,38c-0.388,0-0.757-0.227-0.919-0.606c-0.218-0.507,0.018-1.095,0.525-1.313l4.575-1.961	C16.286,33.646,17,32.563,17,31.362V25c0-0.553,0.447-1,1-1s1,0.447,1,1v6.362c0,2.003-1.189,3.807-3.031,4.596l-4.575,1.961	C11.266,37.975,11.132,38,11,38z"/><linearGradient id="IW_Sf1PHIv01Y0HkR8iXLd" x1="24" x2="24" y1="21.279" y2="14.16" gradientTransform="matrix(1 0 0 -1 0 47.89)" gradientUnits="userSpaceOnUse"><stop offset=".149" stop-color="#c9cdcf"/><stop offset=".318" stop-color="#d2d5d7"/><stop offset=".494" stop-color="#e1e2e4"/><stop offset=".859" stop-color="#e4e4e6"/></linearGradient><path fill="url(#IW_Sf1PHIv01Y0HkR8iXLd)" d="M24,41c-0.553,0-1-0.447-1-1V24c0-0.553,0.447-1,1-1s1,0.447,1,1v16	C25,40.553,24.553,41,24,41z"/><linearGradient id="IW_Sf1PHIv01Y0HkR8iXLe" x1="16.832" x2="30.197" y1="42.119" y2="16.983" gradientTransform="matrix(1 0 0 -1 0 47.89)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#2aa4f4"/><stop offset="1" stop-color="#007ad9"/></linearGradient><path fill="url(#IW_Sf1PHIv01Y0HkR8iXLe)" d="M34.183,9.034C31.992,5.422,28.034,3,23.5,3c-6.087,0-11.152,4.353-12.266,10.115	C7.696,13.718,5,16.79,5,20.5c0,4.142,3.358,7.5,7.5,7.5c0.007,0,0.014-0.001,0.021-0.001V28H33.5c5.247,0,9.5-4.253,9.5-9.5	C43,13.484,39.11,9.386,34.183,9.034z"/><linearGradient id="IW_Sf1PHIv01Y0HkR8iXLf" x1="22.666" x2="25.399" y1="9.398" y2="4.258" gradientTransform="matrix(1 0 0 -1 0 47.89)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#33bef0"/><stop offset="1" stop-color="#0a85d9"/></linearGradient><circle cx="24" cy="41" r="3" fill="url(#IW_Sf1PHIv01Y0HkR8iXLf)"/><linearGradient id="IW_Sf1PHIv01Y0HkR8iXLg" x1="9.666" x2="12.399" y1="13.398" y2="8.258" gradientTransform="matrix(1 0 0 -1 0 47.89)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#33bef0"/><stop offset="1" stop-color="#0a85d9"/></linearGradient><circle cx="11" cy="37" r="3" fill="url(#IW_Sf1PHIv01Y0HkR8iXLg)"/></svg>

datamodels/2.x/itop-container-mgmt/images/icons8-cluster-container.svg

@@ -0,0 +1,524 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="0 0 240 240"
+   width="240px"
+   height="240px"
+   version="1.1"
+   id="svg48"
+   sodipodi:docname="icons8-farm-container(2).svg"
+   inkscape:version="1.4.2 (ebf0e940d0, 2025-05-08)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview50"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="4.0187236"
+     inkscape:cx="89.456264"
+     inkscape:cy="163.73358"
+     inkscape:window-width="2560"
+     inkscape:window-height="1360"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg48"
+     inkscape:showpageshadow="2"
+     inkscape:deskcolor="#d1d1d1" />
+  <defs
+     id="defs27">
+    <linearGradient
+       id="linear0"
+       gradientUnits="userSpaceOnUse"
+       x1="37.685921"
+       y1="19.14217"
+       x2="130.956497"
+       y2="148.210251"
+       gradientTransform="scale(1.395349)">
+      <stop
+         offset="0"
+         style="stop-color:rgb(16.470589%,64.313728%,95.686275%);stop-opacity:1;"
+         id="stop2" />
+      <stop
+         offset="1"
+         style="stop-color:rgb(0%,47.843137%,85.09804%);stop-opacity:1;"
+         id="stop4" />
+    </linearGradient>
+    <radialGradient
+       id="radial0"
+       gradientUnits="userSpaceOnUse"
+       cx="86"
+       cy="132.583328"
+       fx="86"
+       fy="132.583328"
+       r="10.75"
+       gradientTransform="scale(4.999995)">
+      <stop
+         offset="0.582"
+         style="stop-color:rgb(0%,0%,0%);stop-opacity:0.2;"
+         id="stop7" />
+      <stop
+         offset="1"
+         style="stop-color:rgb(0%,0%,0%);stop-opacity:0;"
+         id="stop9" />
+    </radialGradient>
+    <linearGradient
+       id="linear1"
+       gradientUnits="userSpaceOnUse"
+       x1="50.166672"
+       y1="39.416672"
+       x2="121.833328"
+       y2="39.416672"
+       gradientTransform="scale(1.395349)">
+      <stop
+         offset="0"
+         style="stop-color:rgb(11.372549%,34.901962%,70.19608%);stop-opacity:1;"
+         id="stop12" />
+      <stop
+         offset="1"
+         style="stop-color:rgb(9.803922%,35.686275%,73.725492%);stop-opacity:1;"
+         id="stop14" />
+    </linearGradient>
+    <linearGradient
+       id="linear2"
+       gradientUnits="userSpaceOnUse"
+       x1="50.166672"
+       y1="68.083328"
+       x2="121.833328"
+       y2="68.083328"
+       gradientTransform="scale(1.395349)">
+      <stop
+         offset="0"
+         style="stop-color:rgb(11.372549%,34.901962%,70.19608%);stop-opacity:1;"
+         id="stop17" />
+      <stop
+         offset="1"
+         style="stop-color:rgb(9.803922%,35.686275%,73.725492%);stop-opacity:1;"
+         id="stop19" />
+    </linearGradient>
+    <linearGradient
+       id="linear3"
+       gradientUnits="userSpaceOnUse"
+       x1="50.166672"
+       y1="96.75"
+       x2="121.833328"
+       y2="96.75"
+       gradientTransform="scale(1.395349)">
+      <stop
+         offset="0"
+         style="stop-color:rgb(11.372549%,34.901962%,70.19608%);stop-opacity:1;"
+         id="stop22" />
+      <stop
+         offset="1"
+         style="stop-color:rgb(9.803922%,35.686275%,73.725492%);stop-opacity:1;"
+         id="stop24" />
+    </linearGradient>
+    <linearGradient
+       id="linear0-3"
+       gradientUnits="userSpaceOnUse"
+       x1="37.685921"
+       y1="19.14217"
+       x2="130.9565"
+       y2="148.21025"
+       gradientTransform="scale(1.395349)">
+      <stop
+         offset="0"
+         style="stop-color:rgb(69.803923%,16.470589%,95.686275%);stop-opacity:1;"
+         id="stop2-6" />
+      <stop
+         offset="1"
+         style="stop-color:rgb(52.549022%,0%,85.09804%);stop-opacity:1;"
+         id="stop4-7" />
+    </linearGradient>
+    <radialGradient
+       id="radial0-5"
+       gradientUnits="userSpaceOnUse"
+       cx="86"
+       cy="132.58333"
+       fx="86"
+       fy="132.58333"
+       r="10.75"
+       gradientTransform="scale(4.999995)">
+      <stop
+         offset="0.582"
+         style="stop-color:rgb(0%,0%,0%);stop-opacity:0.2;"
+         id="stop7-3" />
+      <stop
+         offset="1"
+         style="stop-color:rgb(0%,0%,0%);stop-opacity:0;"
+         id="stop9-5" />
+    </radialGradient>
+    <linearGradient
+       id="linear1-6"
+       gradientUnits="userSpaceOnUse"
+       x1="50.166672"
+       y1="39.416672"
+       x2="121.83333"
+       y2="39.416672"
+       gradientTransform="scale(1.395349)">
+      <stop
+         offset="0"
+         style="stop-color:rgb(46.27451%,8.627451%,56.078434%);stop-opacity:1;"
+         id="stop12-2" />
+      <stop
+         offset="1"
+         style="stop-color:rgb(44.313726%,5.490196%,62.352943%);stop-opacity:1;"
+         id="stop14-9" />
+    </linearGradient>
+    <linearGradient
+       id="linear2-1"
+       gradientUnits="userSpaceOnUse"
+       x1="50.166672"
+       y1="68.083328"
+       x2="121.83333"
+       y2="68.083328"
+       gradientTransform="scale(1.395349)">
+      <stop
+         offset="0"
+         style="stop-color:rgb(46.27451%,8.627451%,56.078434%);stop-opacity:1;"
+         id="stop17-2" />
+      <stop
+         offset="1"
+         style="stop-color:rgb(44.313726%,5.490196%,62.352943%);stop-opacity:1;"
+         id="stop19-7" />
+    </linearGradient>
+    <linearGradient
+       id="linear3-0"
+       gradientUnits="userSpaceOnUse"
+       x1="50.166672"
+       y1="96.75"
+       x2="121.83333"
+       y2="96.75"
+       gradientTransform="scale(1.395349)">
+      <stop
+         offset="0"
+         style="stop-color:rgb(46.27451%,8.627451%,56.078434%);stop-opacity:1;"
+         id="stop22-9" />
+      <stop
+         offset="1"
+         style="stop-color:rgb(44.313726%,5.490196%,62.352943%);stop-opacity:1;"
+         id="stop24-3" />
+    </linearGradient>
+    <radialGradient
+       id="radial0-2"
+       gradientUnits="userSpaceOnUse"
+       cx="86"
+       cy="132.58333"
+       fx="86"
+       fy="132.58333"
+       r="10.75"
+       gradientTransform="scale(4.999995)">
+      <stop
+         offset="0.582"
+         style="stop-color:rgb(0%,0%,0%);stop-opacity:0.2;"
+         id="stop7-37" />
+      <stop
+         offset="1"
+         style="stop-color:rgb(0%,0%,0%);stop-opacity:0;"
+         id="stop9-59" />
+    </radialGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linear0"
+       id="linearGradient251"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="scale(1.395349)"
+       x1="37.685921"
+       y1="19.14217"
+       x2="130.956497"
+       y2="148.210251" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linear1"
+       id="linearGradient253"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="scale(1.395349)"
+       x1="50.166672"
+       y1="39.416672"
+       x2="121.833328"
+       y2="39.416672" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linear2"
+       id="linearGradient255"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="scale(1.395349)"
+       x1="50.166672"
+       y1="68.083328"
+       x2="121.833328"
+       y2="68.083328" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linear3"
+       id="linearGradient257"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="scale(1.395349)"
+       x1="50.166672"
+       y1="96.75"
+       x2="121.833328"
+       y2="96.75" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linear0"
+       id="linearGradient269"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="scale(1.395349)"
+       x1="37.685921"
+       y1="19.14217"
+       x2="130.956497"
+       y2="148.210251" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linear1"
+       id="linearGradient271"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="scale(1.395349)"
+       x1="50.166672"
+       y1="39.416672"
+       x2="121.833328"
+       y2="39.416672" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linear2"
+       id="linearGradient273"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="scale(1.395349)"
+       x1="50.166672"
+       y1="68.083328"
+       x2="121.833328"
+       y2="68.083328" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linear3"
+       id="linearGradient275"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="scale(1.395349)"
+       x1="50.166672"
+       y1="96.75"
+       x2="121.833328"
+       y2="96.75" />
+    <linearGradient
+       x1="24"
+       y1="4.4889998"
+       x2="24"
+       y2="45.143002"
+       gradientUnits="userSpaceOnUse"
+       id="color-1">
+      <stop
+         offset="0"
+         stop-color="#f44f5a"
+         id="stop1-7" />
+      <stop
+         offset="1"
+         stop-color="#e52030"
+         id="stop2-5" />
+    </linearGradient>
+    <linearGradient
+       id="z~0a6SjB_MRO4U5XcH~qfa-3"
+       x1="24"
+       x2="24"
+       y1="4.4889998"
+       y2="45.143002"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-38,-2)">
+      <stop
+         offset="0"
+         stop-color="#21ad64"
+         id="stop1-1" />
+      <stop
+         offset="1"
+         stop-color="#088242"
+         id="stop2-9" />
+    </linearGradient>
+  </defs>
+  <g
+     id="surface37962620"
+     transform="matrix(0.70082968,0,0,0.70082968,-9.1125191,8.1014159)">
+    <path
+       style="fill:url(#linearGradient269);fill-rule:nonzero;stroke:none"
+       d="M 180,20 H 60 c -5.523438,0 -10,4.476562 -10,10 v 180 c 0,5.52344 4.476562,10 10,10 h 120 c 5.52344,0 10,-4.47656 10,-10 V 30 c 0,-5.523438 -4.47656,-10 -10,-10 z m 0,0"
+       id="path29" />
+    <path
+       style="fill:url(#radial0);fill-rule:nonzero;stroke:none"
+       d="m 135,185 c 0,8.28516 -6.71484,15 -15,15 -8.28516,0 -15,-6.71484 -15,-15 0,-8.28516 6.71484,-15 15,-15 8.28516,0 15,6.71484 15,15 z m 0,0"
+       id="path31" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 130,185 c 0,5.52344 -4.47656,10 -10,10 -5.52344,0 -10,-4.47656 -10,-10 0,-5.52344 4.47656,-10 10,-10 5.52344,0 10,4.47656 10,10 z m 0,0"
+       id="path33" />
+    <path
+       style="fill:url(#linearGradient271);fill-rule:nonzero;stroke:none"
+       d="m 167.5,70 h -95 C 71.121094,70 70,68.878906 70,67.5 v -25 C 70,41.121094 71.121094,40 72.5,40 h 95 c 1.37891,0 2.5,1.121094 2.5,2.5 v 25 c 0,1.378906 -1.12109,2.5 -2.5,2.5 z m 0,0"
+       id="path35" />
+    <path
+       style="fill:#4fe6ff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 160,55 c 0,2.761719 -2.23828,5 -5,5 -2.76172,0 -5,-2.238281 -5,-5 0,-2.761719 2.23828,-5 5,-5 2.76172,0 5,2.238281 5,5 z m 0,0"
+       id="path37" />
+    <path
+       style="fill:url(#linearGradient273);fill-rule:nonzero;stroke:none"
+       d="m 167.5,110 h -95 c -1.378906,0 -2.5,-1.12109 -2.5,-2.5 v -25 C 70,81.121094 71.121094,80 72.5,80 h 95 c 1.37891,0 2.5,1.121094 2.5,2.5 v 25 c 0,1.37891 -1.12109,2.5 -2.5,2.5 z m 0,0"
+       id="path39" />
+    <path
+       style="fill:#4fe6ff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 160,95 c 0,2.761719 -2.23828,5 -5,5 -2.76172,0 -5,-2.238281 -5,-5 0,-2.761719 2.23828,-5 5,-5 2.76172,0 5,2.238281 5,5 z m 0,0"
+       id="path41" />
+    <path
+       style="fill:url(#linearGradient275);fill-rule:nonzero;stroke:none"
+       d="m 167.5,150 h -95 c -1.378906,0 -2.5,-1.12109 -2.5,-2.5 v -25 c 0,-1.37891 1.121094,-2.5 2.5,-2.5 h 95 c 1.37891,0 2.5,1.12109 2.5,2.5 v 25 c 0,1.37891 -1.12109,2.5 -2.5,2.5 z m 0,0"
+       id="path43" />
+    <path
+       style="fill:#4fe6ff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 160,135 c 0,2.76172 -2.23828,5 -5,5 -2.76172,0 -5,-2.23828 -5,-5 0,-2.76172 2.23828,-5 5,-5 2.76172,0 5,2.23828 5,5 z m 0,0"
+       id="path45" />
+  </g>
+  <g
+     id="surface39050914"
+     transform="matrix(0.70448581,0,0,0.70448581,24.194376,16.874754)">
+    <path
+       style="fill:url(#linear0-3);fill-rule:nonzero;stroke:none"
+       d="M 180,20 H 60 c -5.523438,0 -10,4.476562 -10,10 v 180 c 0,5.52344 4.476562,10 10,10 h 120 c 5.52344,0 10,-4.47656 10,-10 V 30 c 0,-5.523438 -4.47656,-10 -10,-10 z m 0,0"
+       id="path29-6" />
+    <path
+       style="fill:url(#radial0-5);fill-rule:nonzero;stroke:none"
+       d="m 135,185 c 0,8.28516 -6.71484,15 -15,15 -8.28516,0 -15,-6.71484 -15,-15 0,-8.28516 6.71484,-15 15,-15 8.28516,0 15,6.71484 15,15 z m 0,0"
+       id="path31-0" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 130,185 c 0,5.52344 -4.47656,10 -10,10 -5.52344,0 -10,-4.47656 -10,-10 0,-5.52344 4.47656,-10 10,-10 5.52344,0 10,4.47656 10,10 z m 0,0"
+       id="path33-6" />
+    <path
+       style="fill:url(#linear1-6);fill-rule:nonzero;stroke:none"
+       d="m 167.5,70 h -95 C 71.121094,70 70,68.878906 70,67.5 v -25 C 70,41.121094 71.121094,40 72.5,40 h 95 c 1.37891,0 2.5,1.121094 2.5,2.5 v 25 c 0,1.378906 -1.12109,2.5 -2.5,2.5 z m 0,0"
+       id="path35-2" />
+    <path
+       style="fill:#f530ff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 160,55 c 0,2.761719 -2.23828,5 -5,5 -2.76172,0 -5,-2.238281 -5,-5 0,-2.761719 2.23828,-5 5,-5 2.76172,0 5,2.238281 5,5 z m 0,0"
+       id="path37-6" />
+    <path
+       style="fill:url(#linear2-1);fill-rule:nonzero;stroke:none"
+       d="m 167.5,110 h -95 c -1.378906,0 -2.5,-1.12109 -2.5,-2.5 v -25 C 70,81.121094 71.121094,80 72.5,80 h 95 c 1.37891,0 2.5,1.121094 2.5,2.5 v 25 c 0,1.37891 -1.12109,2.5 -2.5,2.5 z m 0,0"
+       id="path39-1" />
+    <path
+       style="fill:#f530ff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 160,95 c 0,2.761719 -2.23828,5 -5,5 -2.76172,0 -5,-2.238281 -5,-5 0,-2.761719 2.23828,-5 5,-5 2.76172,0 5,2.238281 5,5 z m 0,0"
+       id="path41-8" />
+    <path
+       style="fill:url(#linear3-0);fill-rule:nonzero;stroke:none"
+       d="m 167.5,150 h -95 c -1.378906,0 -2.5,-1.12109 -2.5,-2.5 v -25 c 0,-1.37891 1.121094,-2.5 2.5,-2.5 h 95 c 1.37891,0 2.5,1.12109 2.5,2.5 v 25 c 0,1.37891 -1.12109,2.5 -2.5,2.5 z m 0,0"
+       id="path43-7" />
+    <path
+       style="fill:#f530ff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 160,135 c 0,2.76172 -2.23828,5 -5,5 -2.76172,0 -5,-2.23828 -5,-5 0,-2.76172 2.23828,-5 5,-5 2.76172,0 5,2.23828 5,5 z m 0,0"
+       id="path45-9" />
+  </g>
+  <g
+     id="surface37962620-2"
+     transform="matrix(0.70082968,0,0,0.70082968,64.946318,26.356156)">
+    <path
+       style="fill:url(#linearGradient251);fill-rule:nonzero;stroke:none"
+       d="M 180,20 H 60 c -5.523438,0 -10,4.476562 -10,10 v 180 c 0,5.52344 4.476562,10 10,10 h 120 c 5.52344,0 10,-4.47656 10,-10 V 30 c 0,-5.523438 -4.47656,-10 -10,-10 z m 0,0"
+       id="path29-9" />
+    <path
+       style="fill:url(#radial0-2);fill-rule:nonzero;stroke:none"
+       d="m 135,185 c 0,8.28516 -6.71484,15 -15,15 -8.28516,0 -15,-6.71484 -15,-15 0,-8.28516 6.71484,-15 15,-15 8.28516,0 15,6.71484 15,15 z m 0,0"
+       id="path31-3" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 130,185 c 0,5.52344 -4.47656,10 -10,10 -5.52344,0 -10,-4.47656 -10,-10 0,-5.52344 4.47656,-10 10,-10 5.52344,0 10,4.47656 10,10 z m 0,0"
+       id="path33-1" />
+    <path
+       style="fill:url(#linearGradient253);fill-rule:nonzero;stroke:none"
+       d="m 167.5,70 h -95 C 71.121094,70 70,68.878906 70,67.5 v -25 C 70,41.121094 71.121094,40 72.5,40 h 95 c 1.37891,0 2.5,1.121094 2.5,2.5 v 25 c 0,1.378906 -1.12109,2.5 -2.5,2.5 z m 0,0"
+       id="path35-9" />
+    <path
+       style="fill:#4fe6ff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 160,55 c 0,2.761719 -2.23828,5 -5,5 -2.76172,0 -5,-2.238281 -5,-5 0,-2.761719 2.23828,-5 5,-5 2.76172,0 5,2.238281 5,5 z m 0,0"
+       id="path37-4" />
+    <path
+       style="fill:url(#linearGradient255);fill-rule:nonzero;stroke:none"
+       d="m 167.5,110 h -95 c -1.378906,0 -2.5,-1.12109 -2.5,-2.5 v -25 C 70,81.121094 71.121094,80 72.5,80 h 95 c 1.37891,0 2.5,1.121094 2.5,2.5 v 25 c 0,1.37891 -1.12109,2.5 -2.5,2.5 z m 0,0"
+       id="path39-7" />
+    <path
+       style="fill:#4fe6ff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 160,95 c 0,2.761719 -2.23828,5 -5,5 -2.76172,0 -5,-2.238281 -5,-5 0,-2.761719 2.23828,-5 5,-5 2.76172,0 5,2.238281 5,5 z m 0,0"
+       id="path41-84" />
+    <path
+       style="fill:url(#linearGradient257);fill-rule:nonzero;stroke:none"
+       d="m 167.5,150 h -95 c -1.378906,0 -2.5,-1.12109 -2.5,-2.5 v -25 c 0,-1.37891 1.121094,-2.5 2.5,-2.5 h 95 c 1.37891,0 2.5,1.12109 2.5,2.5 v 25 c 0,1.37891 -1.12109,2.5 -2.5,2.5 z m 0,0"
+       id="path43-5" />
+    <path
+       style="fill:#4fe6ff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 160,135 c 0,2.76172 -2.23828,5 -5,5 -2.76172,0 -5,-2.23828 -5,-5 0,-2.76172 2.23828,-5 5,-5 2.76172,0 5,2.23828 5,5 z m 0,0"
+       id="path45-0" />
+  </g>
+  <g
+     fill="none"
+     fill-rule="nonzero"
+     stroke="none"
+     stroke-width="1"
+     stroke-linecap="butt"
+     stroke-linejoin="miter"
+     stroke-miterlimit="10"
+     stroke-dasharray="none"
+     stroke-dashoffset="0"
+     font-family="none"
+     font-weight="none"
+     font-size="none"
+     text-anchor="none"
+     style="display:inline;mix-blend-mode:normal"
+     id="g9"
+     transform="matrix(0.52119415,0,0,0.5446121,102.47174,115.50098)">
+    <g
+       transform="scale(5.33333)"
+       id="g8">
+      <path
+         d="m 1,12 h 46 v 25 c 0,0.552 -0.448,1 -1,1 H 2 C 1.448,38 1,37.552 1,37 Z"
+         fill="#b41530"
+         id="path2-3" />
+      <path
+         d="m 44,10 c -0.552,0 -1,0.448 -1,1 v 1 H 5 V 11 C 5,10.448 4.552,10 4,10 H 2 c -0.552,0 -1,0.448 -1,1 v 26 c 0,0.552 0.448,1 1,1 h 44 c 0.552,0 1,-0.448 1,-1 V 12 11 c 0,-0.552 -0.448,-1 -1,-1 z m -31,4 h 2 V 36 H 13 Z M 11,36 H 9 V 14 h 2 z m 6,-22 h 2 v 22 h -2 z m 4,0 h 2 v 22 h -2 z m 4,0 h 2 v 22 h -2 z m 4,0 h 2 v 22 h -2 z m 4,0 h 2 v 22 h -2 z m 4,0 h 2 V 36 H 37 Z M 5,14 H 7 V 36 H 5 Z M 43,36 H 41 V 14 h 2 z"
+         fill="url(#color-1)"
+         id="path3-5"
+         style="fill:url(#color-1)" />
+      <path
+         d="m 13.5,36 h 4 c 0.276,0 0.5,0.224 0.5,0.5 v 1 c 0,0.276 -0.224,0.5 -0.5,0.5 h -4 C 13.224,38 13,37.776 13,37.5 v -1 C 13,36.224 13.224,36 13.5,36 Z"
+         fill="#a3102a"
+         id="path4-6" />
+      <path
+         d="m 30.5,36 h 4 c 0.276,0 0.5,0.224 0.5,0.5 v 1 c 0,0.276 -0.224,0.5 -0.5,0.5 h -4 C 30.224,38 30,37.776 30,37.5 v -1 C 30,36.224 30.224,36 30.5,36 Z"
+         fill="#a3102a"
+         id="path5" />
+      <circle
+         cx="45"
+         cy="12"
+         r="1"
+         fill="#a3102a"
+         id="circle5-2" />
+      <circle
+         cx="45"
+         cy="36"
+         r="1"
+         fill="#a3102a"
+         id="circle6-9" />
+      <circle
+         cx="3"
+         cy="12"
+         r="1"
+         fill="#a3102a"
+         id="circle7-1" />
+      <circle
+         cx="3"
+         cy="36"
+         r="1"
+         fill="#a3102a"
+         id="circle8" />
+    </g>
+  </g>
+</svg>

datamodels/2.x/itop-container-mgmt/images/icons8-host-container.svg

@@ -0,0 +1,275 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="0 0 48 48"
+   width="240px"
+   height="240px"
+   version="1.1"
+   id="svg1633"
+   sodipodi:docname="icons8-server-container(2).svg"
+   inkscape:version="1.4.2 (ebf0e940d0, 2025-05-08)"
+   inkscape:export-filename="icons8-hypervisor.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1637">
+    <linearGradient
+       x1="24"
+       y1="4.4889998"
+       x2="24"
+       y2="45.143002"
+       gradientUnits="userSpaceOnUse"
+       id="color-1">
+      <stop
+         offset="0"
+         stop-color="#f44f5a"
+         id="stop1-7" />
+      <stop
+         offset="1"
+         stop-color="#e52030"
+         id="stop2-5" />
+    </linearGradient>
+    <linearGradient
+       id="z~0a6SjB_MRO4U5XcH~qfa-3"
+       x1="24"
+       x2="24"
+       y1="4.4889998"
+       y2="45.143002"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-38,-2)">
+      <stop
+         offset="0"
+         stop-color="#21ad64"
+         id="stop1-1" />
+      <stop
+         offset="1"
+         stop-color="#088242"
+         id="stop2-9" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="namedview1635"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="2.8416667"
+     inkscape:cx="124.04692"
+     inkscape:cy="133.72434"
+     inkscape:window-width="2560"
+     inkscape:window-height="1360"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg1633"
+     inkscape:showpageshadow="2"
+     inkscape:deskcolor="#d1d1d1" />
+  <linearGradient
+     id="H5zWGZDzzYRltSZyl6Krha"
+     x1="10.517"
+     x2="36.546"
+     y1="5.342"
+     y2="41.361"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(0.79016159,0,0,0.79016159,4.2796009,2.6739179)">
+    <stop
+       offset="0"
+       stop-color="#2aa4f4"
+       id="stop1590" />
+    <stop
+       offset="1"
+       stop-color="#007ad9"
+       id="stop1592" />
+  </linearGradient>
+  <path
+     fill="url(#H5zWGZDzzYRltSZyl6Krha)"
+     d="M 32.725418,5.8345643 H 13.76154 c -0.873128,0 -1.580323,0.7071946 -1.580323,1.5803232 V 35.860705 c 0,0.873128 0.707195,1.580323 1.580323,1.580323 h 18.963878 c 0.873129,0 1.580324,-0.707195 1.580324,-1.580323 V 7.4148875 c 0,-0.8731286 -0.707195,-1.5803232 -1.580324,-1.5803232 z"
+     id="path1595"
+     style="fill:url(#H5zWGZDzzYRltSZyl6Krha);stroke-width:0.790162" />
+  <radialGradient
+     id="H5zWGZDzzYRltSZyl6Krhb"
+     cx="24"
+     cy="37"
+     r="3"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(0.79016159,0,0,0.79016159,4.2796009,2.6739179)">
+    <stop
+       offset=".582"
+       stop-opacity=".2"
+       id="stop1597" />
+    <stop
+       offset="1"
+       stop-opacity="0"
+       id="stop1599" />
+  </radialGradient>
+  <circle
+     cx="23.243479"
+     cy="31.909897"
+     r="2.3704848"
+     fill="url(#H5zWGZDzzYRltSZyl6Krhb)"
+     id="circle1602"
+     style="fill:url(#H5zWGZDzzYRltSZyl6Krhb);stroke-width:0.790162" />
+  <circle
+     cx="23.243479"
+     cy="31.909897"
+     r="1.5803232"
+     fill="#ffffff"
+     id="circle1604"
+     style="stroke-width:0.790162" />
+  <linearGradient
+     id="H5zWGZDzzYRltSZyl6Krhc"
+     x1="14"
+     x2="34"
+     y1="11"
+     y2="11"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(0.79016159,0,0,0.79016159,4.2796009,2.6739179)">
+    <stop
+       offset="0"
+       stop-color="#1d59b3"
+       id="stop1606" />
+    <stop
+       offset="1"
+       stop-color="#195bbc"
+       id="stop1608" />
+  </linearGradient>
+  <path
+     fill="url(#H5zWGZDzzYRltSZyl6Krhc)"
+     d="m 30.750014,13.73618 h -15.01307 c -0.218084,0 -0.395081,-0.176996 -0.395081,-0.395081 V 9.3902915 c 0,-0.2180846 0.176997,-0.3950808 0.395081,-0.3950808 h 15.01307 c 0.218085,0 0.395081,0.1769962 0.395081,0.3950808 v 3.9508075 c 0,0.218085 -0.176996,0.395081 -0.395081,0.395081 z"
+     id="path1611"
+     style="fill:url(#H5zWGZDzzYRltSZyl6Krhc);stroke-width:0.790162" />
+  <circle
+     cx="28.774611"
+     cy="11.365695"
+     r="0.79016161"
+     fill="#50e6ff"
+     id="circle1613"
+     style="stroke-width:0.790162" />
+  <linearGradient
+     id="H5zWGZDzzYRltSZyl6Krhd"
+     x1="14"
+     x2="34"
+     y1="19"
+     y2="19"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(0.79016159,0,0,0.79016159,4.2796009,2.6739179)">
+    <stop
+       offset="0"
+       stop-color="#1d59b3"
+       id="stop1615" />
+    <stop
+       offset="1"
+       stop-color="#195bbc"
+       id="stop1617" />
+  </linearGradient>
+  <path
+     fill="url(#H5zWGZDzzYRltSZyl6Krhd)"
+     d="m 30.750014,20.057473 h -15.01307 c -0.218084,0 -0.395081,-0.176997 -0.395081,-0.395081 v -3.950808 c 0,-0.218085 0.176997,-0.395081 0.395081,-0.395081 h 15.01307 c 0.218085,0 0.395081,0.176996 0.395081,0.395081 v 3.950808 c 0,0.218084 -0.176996,0.395081 -0.395081,0.395081 z"
+     id="path1620"
+     style="fill:url(#H5zWGZDzzYRltSZyl6Krhd);stroke-width:0.790162" />
+  <circle
+     cx="28.774611"
+     cy="17.686989"
+     r="0.79016161"
+     fill="#50e6ff"
+     id="circle1622"
+     style="stroke-width:0.790162" />
+  <linearGradient
+     id="H5zWGZDzzYRltSZyl6Krhe"
+     x1="14"
+     x2="34"
+     y1="27"
+     y2="27"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(0.79016159,0,0,0.79016159,4.2796009,2.6739179)">
+    <stop
+       offset="0"
+       stop-color="#1d59b3"
+       id="stop1624" />
+    <stop
+       offset="1"
+       stop-color="#195bbc"
+       id="stop1626" />
+  </linearGradient>
+  <path
+     fill="url(#H5zWGZDzzYRltSZyl6Krhe)"
+     d="m 30.750014,26.378765 h -15.01307 c -0.218084,0 -0.395081,-0.176996 -0.395081,-0.39508 v -3.950808 c 0,-0.218085 0.176997,-0.395081 0.395081,-0.395081 h 15.01307 c 0.218085,0 0.395081,0.176996 0.395081,0.395081 v 3.950808 c 0,0.218084 -0.176996,0.39508 -0.395081,0.39508 z"
+     id="path1629"
+     style="fill:url(#H5zWGZDzzYRltSZyl6Krhe);stroke-width:0.790162" />
+  <circle
+     cx="28.774611"
+     cy="24.008282"
+     r="0.79016161"
+     fill="#50e6ff"
+     id="circle1631"
+     style="stroke-width:0.790162" />
+  <g
+     fill="none"
+     fill-rule="nonzero"
+     stroke="none"
+     stroke-width="1"
+     stroke-linecap="butt"
+     stroke-linejoin="miter"
+     stroke-miterlimit="10"
+     stroke-dasharray="none"
+     stroke-dashoffset="0"
+     font-family="none"
+     font-weight="none"
+     font-size="none"
+     text-anchor="none"
+     style="display:inline;mix-blend-mode:normal"
+     id="g9"
+     transform="matrix(0.10423883,0,0,0.10892242,19.519126,22.252121)">
+    <g
+       transform="scale(5.33333)"
+       id="g8">
+      <path
+         d="m 1,12 h 46 v 25 c 0,0.552 -0.448,1 -1,1 H 2 C 1.448,38 1,37.552 1,37 Z"
+         fill="#b41530"
+         id="path2-3" />
+      <path
+         d="m 44,10 c -0.552,0 -1,0.448 -1,1 v 1 H 5 V 11 C 5,10.448 4.552,10 4,10 H 2 c -0.552,0 -1,0.448 -1,1 v 26 c 0,0.552 0.448,1 1,1 h 44 c 0.552,0 1,-0.448 1,-1 V 12 11 c 0,-0.552 -0.448,-1 -1,-1 z m -31,4 h 2 V 36 H 13 Z M 11,36 H 9 V 14 h 2 z m 6,-22 h 2 v 22 h -2 z m 4,0 h 2 v 22 h -2 z m 4,0 h 2 v 22 h -2 z m 4,0 h 2 v 22 h -2 z m 4,0 h 2 v 22 h -2 z m 4,0 h 2 V 36 H 37 Z M 5,14 H 7 V 36 H 5 Z M 43,36 H 41 V 14 h 2 z"
+         fill="url(#color-1)"
+         id="path3-5"
+         style="fill:url(#color-1)" />
+      <path
+         d="m 13.5,36 h 4 c 0.276,0 0.5,0.224 0.5,0.5 v 1 c 0,0.276 -0.224,0.5 -0.5,0.5 h -4 C 13.224,38 13,37.776 13,37.5 v -1 C 13,36.224 13.224,36 13.5,36 Z"
+         fill="#a3102a"
+         id="path4-6" />
+      <path
+         d="m 30.5,36 h 4 c 0.276,0 0.5,0.224 0.5,0.5 v 1 c 0,0.276 -0.224,0.5 -0.5,0.5 h -4 C 30.224,38 30,37.776 30,37.5 v -1 C 30,36.224 30.224,36 30.5,36 Z"
+         fill="#a3102a"
+         id="path5" />
+      <circle
+         cx="45"
+         cy="12"
+         r="1"
+         fill="#a3102a"
+         id="circle5-2" />
+      <circle
+         cx="45"
+         cy="36"
+         r="1"
+         fill="#a3102a"
+         id="circle6-9" />
+      <circle
+         cx="3"
+         cy="12"
+         r="1"
+         fill="#a3102a"
+         id="circle7-1" />
+      <circle
+         cx="3"
+         cy="36"
+         r="1"
+         fill="#a3102a"
+         id="circle8" />
+    </g>
+  </g>
+</svg>

datamodels/2.x/itop-container-mgmt/images/icons8-image-container.svg

@@ -0,0 +1,336 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="0 0 48 48"
+   width="240px"
+   height="240px"
+   version="1.1"
+   id="svg320"
+   sodipodi:docname="icons8-software-container.svg"
+   inkscape:version="1.4.2 (ebf0e940d0, 2025-05-08)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs324">
+    <linearGradient
+       id="M0KIpv9F9DO9XPHmZgcmng"
+       x1="12.496"
+       x2="15.03"
+       y1="26.719999"
+       y2="21.954"
+       gradientTransform="matrix(0.42119248,0,0,-0.42119248,25.421635,46.097652)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset="0"
+         stop-color="#737b80"
+         id="stop449" />
+      <stop
+         offset=".473"
+         stop-color="#686f74"
+         id="stop451" />
+      <stop
+         offset="1"
+         stop-color="#575c61"
+         id="stop453" />
+    </linearGradient>
+    <linearGradient
+       id="M0KIpv9F9DO9XPHmZgcmnf"
+       x1="32.495998"
+       x2="35.028999"
+       y1="26.719999"
+       y2="21.954"
+       gradientTransform="matrix(0.42119248,0,0,-0.42119248,25.421635,46.097652)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset="0"
+         stop-color="#737b80"
+         id="stop440" />
+      <stop
+         offset=".473"
+         stop-color="#686f74"
+         id="stop442" />
+      <stop
+         offset="1"
+         stop-color="#575c61"
+         id="stop444" />
+    </linearGradient>
+    <linearGradient
+       id="M0KIpv9F9DO9XPHmZgcmne"
+       x1="22.496"
+       x2="25.028999"
+       y1="26.719999"
+       y2="21.954"
+       gradientTransform="matrix(0.42119248,0,0,-0.42119248,25.421635,46.097652)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset="0"
+         stop-color="#737b80"
+         id="stop431" />
+      <stop
+         offset=".473"
+         stop-color="#686f74"
+         id="stop433" />
+      <stop
+         offset="1"
+         stop-color="#575c61"
+         id="stop435" />
+    </linearGradient>
+    <radialGradient
+       id="M0KIpv9F9DO9XPHmZgcmnd"
+       cx="14"
+       cy="23.889999"
+       r="4"
+       gradientTransform="matrix(0.42119248,0,0,-0.42119248,25.421635,46.097652)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset=".696"
+         stop-opacity=".2"
+         id="stop424" />
+      <stop
+         offset=".959"
+         stop-opacity="0"
+         id="stop426" />
+    </radialGradient>
+    <radialGradient
+       id="M0KIpv9F9DO9XPHmZgcmnc"
+       cx="24"
+       cy="23.889999"
+       r="4"
+       gradientTransform="matrix(0.42119248,0,0,-0.42119248,25.421635,46.097652)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset=".696"
+         stop-opacity=".2"
+         id="stop417" />
+      <stop
+         offset=".959"
+         stop-opacity="0"
+         id="stop419" />
+    </radialGradient>
+    <radialGradient
+       id="M0KIpv9F9DO9XPHmZgcmnb"
+       cx="34"
+       cy="23.889999"
+       r="4"
+       gradientTransform="matrix(0.42119248,0,0,-0.42119248,25.421635,46.097652)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset=".696"
+         stop-opacity=".2"
+         id="stop410" />
+      <stop
+         offset=".959"
+         stop-opacity="0"
+         id="stop412" />
+    </radialGradient>
+    <linearGradient
+       id="M0KIpv9F9DO9XPHmZgcmna"
+       x1="10.302"
+       x2="32.533001"
+       y1="49.653"
+       y2="7.8410001"
+       gradientTransform="matrix(0.42119248,0,0,-0.42119248,25.421635,46.097652)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset="0"
+         stop-color="#fcfcfc"
+         id="stop403" />
+      <stop
+         offset=".95"
+         stop-color="#c3c9cd"
+         id="stop405" />
+    </linearGradient>
+    <linearGradient
+       x1="24"
+       y1="4.4889998"
+       x2="24"
+       y2="45.143002"
+       gradientUnits="userSpaceOnUse"
+       id="color-1">
+      <stop
+         offset="0"
+         stop-color="#f44f5a"
+         id="stop1-7" />
+      <stop
+         offset="1"
+         stop-color="#e52030"
+         id="stop2-5" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="namedview322"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="1.4208334"
+     inkscape:cx="-122.81525"
+     inkscape:cy="44.340175"
+     inkscape:window-width="2560"
+     inkscape:window-height="1360"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg320"
+     inkscape:showpageshadow="2"
+     inkscape:deskcolor="#d1d1d1" />
+  <linearGradient
+     id="SVGID_1_"
+     x1="23.855"
+     x2="23.983"
+     y1="4.908"
+     y2="17.227"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(0.83754239,0,0,0.83754239,1.9089261,1.7931334)">
+    <stop
+       offset="0"
+       stop-color="#7dd8f3"
+       id="stop291" />
+    <stop
+       offset="1"
+       stop-color="#45b0d0"
+       id="stop293" />
+  </linearGradient>
+  <circle
+     cx="22.009941"
+     cy="17.622683"
+     r="12.563135"
+     fill="url(#SVGID_1_)"
+     id="circle296"
+     style="fill:url(#SVGID_1_);stroke-width:0.837541" />
+  <linearGradient
+     id="SVGID_2_"
+     x1="18.175"
+     x2="29.825"
+     y1="19.021"
+     y2="19.021"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(0.83754239,0,0,0.83754239,1.9089261,1.7931334)">
+    <stop
+       offset="0"
+       stop-color="#3079d6"
+       id="stop298" />
+    <stop
+       offset="1"
+       stop-color="#297cd2"
+       id="stop300" />
+  </linearGradient>
+  <circle
+     cx="22.009941"
+     cy="17.706436"
+     r="4.8577456"
+     fill="url(#SVGID_2_)"
+     id="circle303"
+     style="fill:url(#SVGID_2_);stroke-width:0.837541" />
+  <circle
+     cx="22.009941"
+     cy="17.706436"
+     r="1.9263473"
+     fill="#ffffff"
+     id="circle305"
+     style="stroke-width:0.837541" />
+  <path
+     d="m 9.4468073,17.622683 c 0,6.951602 5.6115347,12.563137 12.5631357,12.563137 6.951601,0 12.563135,-5.611535 12.563135,-12.563137 0,-0.251262 0,-0.502525 0,-0.753787 H 9.4468073 c 0,0.251262 0,0.502525 0,0.753787 z"
+     opacity="0.05"
+     id="path307"
+     style="stroke-width:0.837541" />
+  <path
+     d="m 9.4468073,17.622683 c 0,6.951602 5.6115347,12.563137 12.5631357,12.563137 6.951601,0 12.563135,-5.611535 12.563135,-12.563137 0,-0.08376 0,-0.167507 0,-0.335016 H 9.4468073 c 0,0.08376 0,0.167509 0,0.335016 z"
+     opacity="0.07"
+     id="path309"
+     style="stroke-width:0.837541" />
+  <linearGradient
+     id="SVGID_3_"
+     x1="16.786"
+     x2="30.174"
+     y1="-440.286"
+     y2="-472.232"
+     gradientTransform="matrix(0.83754239,0,0,-0.83754239,1.9089261,-354.99993)"
+     gradientUnits="userSpaceOnUse">
+    <stop
+       offset="0"
+       stop-color="#eba84b"
+       id="stop311" />
+    <stop
+       offset="1"
+       stop-color="#d97218"
+       id="stop313" />
+  </linearGradient>
+  <path
+     fill="url(#SVGID_3_)"
+     d="M 36.248163,38.644997 H 7.7717222 c -0.5025255,0 -0.8375424,-0.418771 -0.8375424,-0.837543 V 18.543981 c 0,-0.502525 0.3350169,-0.837544 0.8375424,-0.837544 H 36.248163 c 0.502526,0 0.837542,0.335019 0.837542,0.837544 v 19.263473 c 0,0.418772 -0.418771,0.837543 -0.837542,0.837543 z"
+     id="path316"
+     style="fill:url(#SVGID_3_);stroke-width:0.837541" />
+  <path
+     fill="#633412"
+     d="m 18.659773,21.056608 h 6.700339 c 0.502526,0 0.837542,0.335017 0.837542,0.837542 v 0 c 0,0.502525 -0.335016,0.837542 -0.837542,0.837542 h -6.700339 c -0.502525,0 -0.837541,-0.335017 -0.837541,-0.837542 v 0 c 0,-0.502525 0.335016,-0.837542 0.837541,-0.837542 z"
+     id="path318"
+     style="stroke-width:0.837541" />
+  <g
+     fill="none"
+     fill-rule="nonzero"
+     stroke="none"
+     stroke-width="1"
+     stroke-linecap="butt"
+     stroke-linejoin="miter"
+     stroke-miterlimit="10"
+     stroke-dasharray="none"
+     stroke-dashoffset="0"
+     font-family="none"
+     font-weight="none"
+     font-size="none"
+     text-anchor="none"
+     style="display:inline;mix-blend-mode:normal"
+     id="g9"
+     transform="matrix(0.10423883,0,0,0.10892242,19.968987,23.126292)">
+    <g
+       transform="scale(5.33333)"
+       id="g8">
+      <path
+         d="m 1,12 h 46 v 25 c 0,0.552 -0.448,1 -1,1 H 2 C 1.448,38 1,37.552 1,37 Z"
+         fill="#b41530"
+         id="path2-3" />
+      <path
+         d="m 44,10 c -0.552,0 -1,0.448 -1,1 v 1 H 5 V 11 C 5,10.448 4.552,10 4,10 H 2 c -0.552,0 -1,0.448 -1,1 v 26 c 0,0.552 0.448,1 1,1 h 44 c 0.552,0 1,-0.448 1,-1 V 12 11 c 0,-0.552 -0.448,-1 -1,-1 z m -31,4 h 2 V 36 H 13 Z M 11,36 H 9 V 14 h 2 z m 6,-22 h 2 v 22 h -2 z m 4,0 h 2 v 22 h -2 z m 4,0 h 2 v 22 h -2 z m 4,0 h 2 v 22 h -2 z m 4,0 h 2 v 22 h -2 z m 4,0 h 2 V 36 H 37 Z M 5,14 H 7 V 36 H 5 Z M 43,36 H 41 V 14 h 2 z"
+         fill="url(#color-1)"
+         id="path3-5"
+         style="fill:url(#color-1)" />
+      <path
+         d="m 13.5,36 h 4 c 0.276,0 0.5,0.224 0.5,0.5 v 1 c 0,0.276 -0.224,0.5 -0.5,0.5 h -4 C 13.224,38 13,37.776 13,37.5 v -1 C 13,36.224 13.224,36 13.5,36 Z"
+         fill="#a3102a"
+         id="path4-6" />
+      <path
+         d="m 30.5,36 h 4 c 0.276,0 0.5,0.224 0.5,0.5 v 1 c 0,0.276 -0.224,0.5 -0.5,0.5 h -4 C 30.224,38 30,37.776 30,37.5 v -1 C 30,36.224 30.224,36 30.5,36 Z"
+         fill="#a3102a"
+         id="path5" />
+      <circle
+         cx="45"
+         cy="12"
+         r="1"
+         fill="#a3102a"
+         id="circle5-2" />
+      <circle
+         cx="45"
+         cy="36"
+         r="1"
+         fill="#a3102a"
+         id="circle6-9" />
+      <circle
+         cx="3"
+         cy="12"
+         r="1"
+         fill="#a3102a"
+         id="circle7-1" />
+      <circle
+         cx="3"
+         cy="36"
+         r="1"
+         fill="#a3102a"
+         id="circle8" />
+    </g>
+  </g>
+</svg>

datamodels/2.x/itop-container-mgmt/module.itop-container-mgmt.php

@@ -0,0 +1,52 @@
+<?php
+
+//
+// iTop module definition file
+//
+
+SetupWebPage::AddModule(
+	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
+	'itop-container-mgmt/3.3.0',
+	[
+		// Identification
+		//
+		'label' => 'Container management',
+		'category' => 'business',
+
+		// Setup
+		//
+		'dependencies' => [
+			'itop-virtualization-mgmt/3.3.0',
+		],
+		'mandatory' => false,
+		'visible' => true,
+
+		// Components
+		//
+		'datamodel' => [
+
+		],
+		'webservice' => [
+
+		],
+		'data.struct' => [
+			// add your 'structure' definition XML files here,
+			'data/en_us.data.itop-container-type.xml',
+			'data/en_us.data.itop-container-image-type.xml',
+		],
+		'data.sample' => [
+			// add your sample data XML files here,
+		],
+
+		// Documentation
+		//
+		'doc.manual_setup' => '', // hyperlink to manual setup documentation, if any
+		'doc.more_information' => '', // hyperlink to more information, if any
+
+		// Default settings
+		//
+		'settings' => [
+			// Module specific settings go here, if any
+		],
+	]
+);

datamodels/2.x/itop-core-update/module.itop-core-update.php

@@ -30,7 +30,7 @@ SetupWebPage::AddModule(
 		// Identification
 		//
 		'label' => 'iTop Core Update',
-		'category' => 'business',
+		'category' => 'Application management',
 
 		// Setup
 		//

datamodels/2.x/itop-faq-light/dictionaries/fr.dict.itop-faq-light.php

@@ -19,7 +19,7 @@ Dict::Add('FR FR', 'French', 'Français', [
 	'Class:FAQ/Attribute:summary+' => '',
 	'Class:FAQ/Attribute:description' => 'Description',
 	'Class:FAQ/Attribute:description+' => '',
-	'Class:FAQ/Attribute:category_id' => 'Categorie',
+	'Class:FAQ/Attribute:category_id' => 'Catégorie',
 	'Class:FAQ/Attribute:category_id+' => '',
 	'Class:FAQ/Attribute:category_name' => 'Nom catégorie',
 	'Class:FAQ/Attribute:category_name+' => '',

datamodels/2.x/itop-hub-connector/hubruntimeenvironment.class.inc.php

@@ -1,6 +1,7 @@
 <?php
+
 class HubRunTimeEnvironment extends RunTimeEnvironment
-{	
+{
 	/**
 	 * Constructor
 	 * @param string $sEnvironment
@@ -9,21 +10,18 @@ class HubRunTimeEnvironment extends RunTimeEnvironment
 	public function __construct($sEnvironment = 'production', $bAutoCommit = true)
 	{
 		parent::__construct($sEnvironment, $bAutoCommit);
-		
-		if ($sEnvironment != $this->sTargetEnv)
-		{
-		    if (is_dir(APPROOT.'/env-'.$this->sTargetEnv))
-		    {
-		        SetupUtils::rrmdir(APPROOT.'/env-'.$this->sTargetEnv);
-		    }
-		    if (is_dir(APPROOT.'/data/'.$this->sTargetEnv.'-modules'))
-		    {
-		        SetupUtils::rrmdir(APPROOT.'/data/'.$this->sTargetEnv.'-modules');
-		    }
+
+		if ($sEnvironment != $this->sTargetEnv) {
+			if (is_dir(APPROOT.'/env-'.$this->sTargetEnv)) {
+				SetupUtils::rrmdir(APPROOT.'/env-'.$this->sTargetEnv);
+			}
+			if (is_dir(APPROOT.'/data/'.$this->sTargetEnv.'-modules')) {
+				SetupUtils::rrmdir(APPROOT.'/data/'.$this->sTargetEnv.'-modules');
+			}
 			SetupUtils::copydir(APPROOT.'/data/'.$sEnvironment.'-modules', APPROOT.'/data/'.$this->sTargetEnv.'-modules');
 		}
 	}
-	
+
 	/**
 	 * Update the includes for the target environment
 	 * @param Config $oConfig
@@ -32,7 +30,7 @@ class HubRunTimeEnvironment extends RunTimeEnvironment
 	{
 		$oConfig->UpdateIncludes('env-'.$this->sTargetEnv); // TargetEnv != FinalEnv
 	}
-	
+
 	/**
 	 * Move an extension (path to folder of this extension) to the target environment
 	 * @param string $sExtensionDirectory The folder of the extension
@@ -40,21 +38,23 @@ class HubRunTimeEnvironment extends RunTimeEnvironment
 	 */
 	public function MoveExtension($sExtensionDirectory)
 	{
-		if (!is_dir(APPROOT.'/data/'.$this->sTargetEnv.'-modules'))
-		{
-			if (!mkdir(APPROOT.'/data/'.$this->sTargetEnv.'-modules')) throw new Exception("ERROR: failed to create directory:'".(APPROOT.'/data/'.$this->sTargetEnv.'-modules')."'");
+		if (!is_dir(APPROOT.'/data/'.$this->sTargetEnv.'-modules')) {
+			if (!mkdir(APPROOT.'/data/'.$this->sTargetEnv.'-modules')) {
+				throw new Exception("ERROR: failed to create directory:'".(APPROOT.'/data/'.$this->sTargetEnv.'-modules')."'");
+			}
 		}
 		$sDestinationPath = APPROOT.'/data/'.$this->sTargetEnv.'-modules/';
-		
+
 		// Make sure that the destination directory of the extension does not already exist
-		if (is_dir($sDestinationPath.basename($sExtensionDirectory)))
-		{
-		    // Cleanup before moving...
-		    SetupUtils::rrmdir($sDestinationPath.basename($sExtensionDirectory));
+		if (is_dir($sDestinationPath.basename($sExtensionDirectory))) {
+			// Cleanup before moving...
+			SetupUtils::rrmdir($sDestinationPath.basename($sExtensionDirectory));
+		}
+		if (!rename($sExtensionDirectory, $sDestinationPath.basename($sExtensionDirectory))) {
+			throw new Exception("ERROR: failed move directory:'$sExtensionDirectory' to '".$sDestinationPath.basename($sExtensionDirectory)."'");
 		}
-		if (!rename($sExtensionDirectory, $sDestinationPath.basename($sExtensionDirectory))) throw new Exception("ERROR: failed move directory:'$sExtensionDirectory' to '".$sDestinationPath.basename($sExtensionDirectory)."'");
 	}
-	
+
 	/**
 	 * Move the selected extensions located in the given directory in data/<target-env>-modules
 	 * @param string $sDownloadedExtensionsDir The directory to scan
@@ -63,10 +63,8 @@ class HubRunTimeEnvironment extends RunTimeEnvironment
 	 */
 	public function MoveSelectedExtensions($sDownloadedExtensionsDir, $aSelectedExtensionDirs)
 	{
-		foreach(glob($sDownloadedExtensionsDir.'*', GLOB_ONLYDIR) as $sExtensionDir)
-		{
-			if (in_array(basename($sExtensionDir), $aSelectedExtensionDirs))
-			{
+		foreach (glob($sDownloadedExtensionsDir.'*', GLOB_ONLYDIR) as $sExtensionDir) {
+			if (in_array(basename($sExtensionDir), $aSelectedExtensionDirs)) {
 				$this->MoveExtension($sExtensionDir);
 			}
 		}

datamodels/2.x/itop-hub-connector/land.php

@@ -20,7 +20,7 @@ function DisplayStatus(WebPage $oPage)
 	if (is_dir($sPath)) {
 		$aExtraDirs[] = $sPath; // Also read the extra downloaded-modules directory
 	}
-	$oExtensionsMap = new iTopExtensionsMap('production', true, $aExtraDirs);
+	$oExtensionsMap = new iTopExtensionsMap('production', $aExtraDirs);
 	$oExtensionsMap->LoadChoicesFromDatabase(MetaModel::GetConfig());
 
 	foreach ($oExtensionsMap->GetAllExtensions() as $oExtension) {
@@ -154,7 +154,7 @@ function DoInstall(WebPage $oPage)
 	if (is_dir($sPath)) {
 		$aExtraDirs[] = $sPath; // Also read the extra downloaded-modules directory
 	}
-	$oExtensionsMap = new iTopExtensionsMap('production', true, $aExtraDirs);
+	$oExtensionsMap = new iTopExtensionsMap('production', $aExtraDirs);
 	$oExtensionsMap->LoadChoicesFromDatabase(MetaModel::GetConfig());
 
 	foreach ($oExtensionsMap->GetAllExtensions() as $oExtension) {

datamodels/2.x/itop-oauth-client/module.itop-oauth-client.php

@@ -17,6 +17,7 @@ SetupWebPage::AddModule(
 		//
 		'dependencies' => [
 			'itop-welcome-itil/3.1.0,',
+			'itop-profiles-itil/3.1.0', //SuperUser id 117
 		],
 		'mandatory' => false,
 		'visible' => true,

datamodels/2.x/itop-portal-base/module.itop-portal-base.php

@@ -28,6 +28,7 @@ SetupWebPage::AddModule(
 		'category' => 'Portal',
 	// Setup
 	'dependencies' => [
+		'itop-attachments/3.2.1', //CMDBChangeOpAttachmentRemoved
 	],
 	'mandatory' => true,
 	'visible' => false,

datamodels/2.x/itop-profiles-itil/datamodel.itop-profiles-itil.xml

@@ -238,6 +238,11 @@
               <action id="action:bulk delete">allow</action>
             </actions>
           </group>
+          <group id="Ticketing">
+            <actions>
+              <action id="stimulus:ev_close">allow</action>
+            </actions>
+          </group>
           <group id="UserRequest">
             <actions>
               <action id="stimulus:ev_approve">allow</action>

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

@@ -306,10 +306,9 @@
           <is_null_allowed>true</is_null_allowed>
         </field>
         <field id="servicesubcategory_id" xsi:type="AttributeExternalKey">
-          <filter><![CDATA[SELECT ServiceSubcategory WHERE service_id = :this->service_id AND (ISNULL(:this->request_type) OR request_type = :this->request_type) AND status != 'obsolete']]></filter>
+          <filter><![CDATA[SELECT ServiceSubcategory WHERE service_id = :this->service_id AND status != 'obsolete']]></filter>
           <dependencies>
             <attribute id="service_id"/>
-            <attribute id="request_type"/>
           </dependencies>
           <sql>servicesubcategory_id</sql>
           <target_class>ServiceSubcategory</target_class>
@@ -1334,21 +1333,23 @@
 		// Compute the priority of the ticket
 		$this->Set('priority', $this->ComputePriority());
 
-		// Compute the request_type if not already defined (by the user)
-		$sType = $this->Get('request_type');
-        if (is_null($sType) || ($sType === ''))
-		{
-			$iSvcSubcat = $this->Get('servicesubcategory_id');
-			if ($iSvcSubcat != 0)
-			{
-				$oSvcSubcat = MetaModel::GetObject(ServiceSubcategory::class, $iSvcSubcat, true, true);
-				$this->Set('request_type', $oSvcSubcat->Get('request_type'));
-			}
-		}
-
 		return parent::ComputeValues();
 	}]]></code>
         </method>
+        <method id="EvtComputeRequestType">
+          <static>false</static>
+          <access>public</access>
+          <type>EventListener</type>
+          <code><![CDATA[	public function EvtComputeRequestType(?Combodo\iTop\Service\Events\EventData $oEventData = null)
+	{
+		$iSvcSubcat = $this->Get('servicesubcategory_id');
+		if ($iSvcSubcat != 0)
+		{
+			$oSvcSubcat = MetaModel::GetObject(ServiceSubcategory::class, $iSvcSubcat, true, true);
+			$this->Set('request_type', $oSvcSubcat->Get('request_type'));
+		}
+	}]]></code>
+        </method>
         <method id="DisplayBareRelations">
           <static>false</static>
           <access>public</access>
@@ -1528,6 +1529,13 @@
 	}]]></code>
         </method>
       </methods>
+      <event_listeners>
+        <event_listener id="EVENT_DB_BEFORE_WRITE">
+          <event>EVENT_DB_BEFORE_WRITE</event>
+          <callback>EvtComputeRequestType</callback>
+          <rank>0</rank>
+        </event_listener>
+      </event_listeners>
       <presentation>
         <details>
           <items>

datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml

@@ -76,6 +76,9 @@
             <attribute id="finalclass"/>
           </attributes>
         </reconciliation>
+        <obsolescence>
+          <condition><![CDATA[status='obsolete']]></condition>
+        </obsolescence>
       </properties>
       <fields>
         <field id="name" xsi:type="AttributeString">
@@ -176,17 +179,32 @@
         <field id="status" xsi:type="AttributeEnum">
           <sort_type>rank</sort_type>
           <values>
-            <value id="production">
-              <code>production</code>
-              <rank>20</rank>
-            </value>
             <value id="implementation">
               <code>implementation</code>
               <rank>10</rank>
+              <style>
+                <main_color>$ibo-lifecycle-inactive-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-inactive-state-secondary-color</complementary_color>
+                <decoration_classes/>
+              </style>
+            </value>
+            <value id="production">
+              <code>production</code>
+              <rank>20</rank>
+              <style>
+                <main_color>$ibo-lifecycle-active-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-active-state-secondary-color</complementary_color>
+                <decoration_classes/>
+              </style>
             </value>
             <value id="obsolete">
               <code>obsolete</code>
               <rank>30</rank>
+              <style>
+                <main_color>$ibo-lifecycle-frozen-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-frozen-state-secondary-color</complementary_color>
+                <decoration_classes/>
+              </style>
             </value>
           </values>
           <sql>status</sql>
@@ -1133,6 +1151,9 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="organization_name"/>
           </attributes>
         </reconciliation>
+        <obsolescence>
+          <condition><![CDATA[status='obsolete']]></condition>
+        </obsolescence>
       </properties>
       <fields>
         <field id="name" xsi:type="AttributeString">
@@ -1184,17 +1205,32 @@ public function PrefillSearchForm(&$aContextParam)
         <field id="status" xsi:type="AttributeEnum">
           <sort_type>rank</sort_type>
           <values>
-            <value id="production">
-              <code>production</code>
-              <rank>20</rank>
-            </value>
             <value id="implementation">
               <code>implementation</code>
               <rank>10</rank>
+              <style>
+                <main_color>$ibo-lifecycle-inactive-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-inactive-state-secondary-color</complementary_color>
+                <decoration_classes/>
+              </style>
+            </value>
+            <value id="production">
+              <code>production</code>
+              <rank>20</rank>
+              <style>
+                <main_color>$ibo-lifecycle-active-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-active-state-secondary-color</complementary_color>
+                <decoration_classes/>
+              </style>
             </value>
             <value id="obsolete">
               <code>obsolete</code>
               <rank>30</rank>
+              <style>
+                <main_color>$ibo-lifecycle-frozen-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-frozen-state-secondary-color</complementary_color>
+                <decoration_classes/>
+              </style>
             </value>
           </values>
           <sql>status</sql>
@@ -1537,6 +1573,9 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="service_name"/>
           </attributes>
         </reconciliation>
+        <obsolescence>
+          <condition><![CDATA[status='obsolete']]></condition>
+        </obsolescence>
       </properties>
       <fields>
         <field id="name" xsi:type="AttributeString">
@@ -1585,17 +1624,32 @@ public function PrefillSearchForm(&$aContextParam)
         <field id="status" xsi:type="AttributeEnum">
           <sort_type>rank</sort_type>
           <values>
-            <value id="production">
-              <code>production</code>
-              <rank>20</rank>
-            </value>
             <value id="implementation">
               <code>implementation</code>
               <rank>10</rank>
+              <style>
+                <main_color>$ibo-lifecycle-inactive-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-inactive-state-secondary-color</complementary_color>
+                <decoration_classes/>
+              </style>
+            </value>
+            <value id="production">
+              <code>production</code>
+              <rank>20</rank>
+              <style>
+                <main_color>$ibo-lifecycle-active-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-active-state-secondary-color</complementary_color>
+                <decoration_classes/>
+              </style>
             </value>
             <value id="obsolete">
               <code>obsolete</code>
               <rank>30</rank>
+              <style>
+                <main_color>$ibo-lifecycle-frozen-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-frozen-state-secondary-color</complementary_color>
+                <decoration_classes/>
+              </style>
             </value>
           </values>
           <sql>status</sql>

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

@@ -243,7 +243,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', [
 	'Class:Service/Attribute:description' => 'Popis',
 	'Class:Service/Attribute:description+' => '',
 	'Class:Service/Attribute:servicefamily_id' => 'Balíček služeb',
-	'Class:Service/Attribute:servicefamily_id+' => '',
+	'Class:Service/Attribute:servicefamily_id+' => 'Required for this service to be visible on User Portal~~',
 	'Class:Service/Attribute:servicefamily_name' => 'Název rodiny služeb',
 	'Class:Service/Attribute:servicefamily_name+' => '',
 	'Class:Service/Attribute:documents_list' => 'Dokumenty',

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

@@ -242,7 +242,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', [
 	'Class:Service/Attribute:description' => 'Beskrivelse',
 	'Class:Service/Attribute:description+' => '',
 	'Class:Service/Attribute:servicefamily_id' => 'Service familie',
-	'Class:Service/Attribute:servicefamily_id+' => '',
+	'Class:Service/Attribute:servicefamily_id+' => 'Required for this service to be visible on User Portal~~',
 	'Class:Service/Attribute:servicefamily_name' => 'Ydelses familie navn',
 	'Class:Service/Attribute:servicefamily_name+' => '',
 	'Class:Service/Attribute:documents_list' => 'Dokument',
@@ -500,7 +500,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', [
 	'Class:DeliveryModel/Attribute:description' => 'Beskrivelse',
 	'Class:DeliveryModel/Attribute:description+' => '',
 	'Class:DeliveryModel/Attribute:contacts_list' => 'Kontakt',
-	'Class:DeliveryModel/Attribute:contacts_list+' => 'All the contacts (Teams and Persons) for this delivery model~~',
+	'Class:DeliveryModel/Attribute:contacts_list+' => 'There must be at least one team to enable Ticket assignment~~',
 	'Class:DeliveryModel/Attribute:customers_list' => 'Kunde',
 	'Class:DeliveryModel/Attribute:customers_list+' => 'All the customers having this delivering model~~',
 ]);

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

@@ -242,7 +242,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', [
 	'Class:Service/Attribute:description' => 'Beschreibung',
 	'Class:Service/Attribute:description+' => '',
 	'Class:Service/Attribute:servicefamily_id' => 'Service-Familie',
-	'Class:Service/Attribute:servicefamily_id+' => '',
+	'Class:Service/Attribute:servicefamily_id+' => 'Required for this service to be visible on User Portal~~',
 	'Class:Service/Attribute:servicefamily_name' => 'Service-Familien-Name',
 	'Class:Service/Attribute:servicefamily_name+' => '',
 	'Class:Service/Attribute:documents_list' => 'Dokumente',

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

@@ -268,7 +268,7 @@ Dict::Add('EN US', 'English', 'English', [
 	'Class:Service/Attribute:description' => 'Description',
 	'Class:Service/Attribute:description+' => '',
 	'Class:Service/Attribute:servicefamily_id' => 'Service Family',
-	'Class:Service/Attribute:servicefamily_id+' => '',
+	'Class:Service/Attribute:servicefamily_id+' => 'Required for this service to be visible on User Portal',
 	'Class:Service/Attribute:servicefamily_name' => 'Service Family Name',
 	'Class:Service/Attribute:servicefamily_name+' => '',
 	'Class:Service/Attribute:documents_list' => 'Documents',
@@ -526,7 +526,7 @@ Dict::Add('EN US', 'English', 'English', [
 	'Class:DeliveryModel/Attribute:description' => 'Description',
 	'Class:DeliveryModel/Attribute:description+' => '',
 	'Class:DeliveryModel/Attribute:contacts_list' => 'Contacts',
-	'Class:DeliveryModel/Attribute:contacts_list+' => 'All the contacts (Teams and Persons) for this delivery model',
+	'Class:DeliveryModel/Attribute:contacts_list+' => 'There must be at least one team to enable Ticket assignment',
 	'Class:DeliveryModel/Attribute:customers_list' => 'Customers',
 	'Class:DeliveryModel/Attribute:customers_list+' => 'All the customers having this delivering model',
 ]);

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

@@ -268,7 +268,7 @@ Dict::Add('EN GB', 'British English', 'British English', [
 	'Class:Service/Attribute:description' => 'Description',
 	'Class:Service/Attribute:description+' => '',
 	'Class:Service/Attribute:servicefamily_id' => 'Service Family',
-	'Class:Service/Attribute:servicefamily_id+' => '',
+	'Class:Service/Attribute:servicefamily_id+' => 'Required for this service to be visible on User Portal~~',
 	'Class:Service/Attribute:servicefamily_name' => 'Service Family Name',
 	'Class:Service/Attribute:servicefamily_name+' => '',
 	'Class:Service/Attribute:documents_list' => 'Documents',
@@ -526,7 +526,7 @@ Dict::Add('EN GB', 'British English', 'British English', [
 	'Class:DeliveryModel/Attribute:description' => 'Description',
 	'Class:DeliveryModel/Attribute:description+' => '',
 	'Class:DeliveryModel/Attribute:contacts_list' => 'Contacts',
-	'Class:DeliveryModel/Attribute:contacts_list+' => 'All the contacts (Teams and Persons) for this delivery model',
+	'Class:DeliveryModel/Attribute:contacts_list+' => 'There must be at least one team to enable Ticket assignment',
 	'Class:DeliveryModel/Attribute:customers_list' => 'Customers',
 	'Class:DeliveryModel/Attribute:customers_list+' => 'All the customers having this delivering model',
 ]);

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

@@ -239,7 +239,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:Service/Attribute:description' => 'Descripción',
 	'Class:Service/Attribute:description+' => 'Descripción',
 	'Class:Service/Attribute:servicefamily_id' => 'Familia de Servicios',
-	'Class:Service/Attribute:servicefamily_id+' => 'Familia de Servicios',
+	'Class:Service/Attribute:servicefamily_id+' => 'Required for this service to be visible on User Portal~~',
 	'Class:Service/Attribute:servicefamily_name' => 'Familia de Servicios',
 	'Class:Service/Attribute:servicefamily_name+' => 'Familia de Servicios',
 	'Class:Service/Attribute:documents_list' => 'Documentos',

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

@@ -247,7 +247,7 @@ Dict::Add('FR FR', 'French', 'Français', [
 	'Class:Service/Attribute:description' => 'Description',
 	'Class:Service/Attribute:description+' => '',
 	'Class:Service/Attribute:servicefamily_id' => 'Famille de service',
-	'Class:Service/Attribute:servicefamily_id+' => '',
+	'Class:Service/Attribute:servicefamily_id+' => 'Obligatoire pour que ce service soit visible dans le portal utilisateur',
 	'Class:Service/Attribute:servicefamily_name' => 'Nom Famille de service',
 	'Class:Service/Attribute:servicefamily_name+' => '',
 	'Class:Service/Attribute:documents_list' => 'Documents',
@@ -511,7 +511,7 @@ Dict::Add('FR FR', 'French', 'Français', [
 	'Class:DeliveryModel/Attribute:description' => 'Description',
 	'Class:DeliveryModel/Attribute:description+' => '',
 	'Class:DeliveryModel/Attribute:contacts_list' => 'Contacts',
-	'Class:DeliveryModel/Attribute:contacts_list+' => 'Tous les contacts (Equipe ou Personne) pour ce modèle de support',
+	'Class:DeliveryModel/Attribute:contacts_list+' => 'Il doit y avoir au moins une équipe pour permettre l\'assignation des Tickets',
 	'Class:DeliveryModel/Attribute:customers_list' => 'Clients',
 	'Class:DeliveryModel/Attribute:customers_list+' => 'Tous les clients ayant ce modèle de support',
 	'Class:DeliveryModel/Attribute:customers_list/UI:Links:Create:Button+' => 'Créer un %4$s',

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

@@ -241,7 +241,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', [
 	'Class:Service/Attribute:description' => 'Leírás',
 	'Class:Service/Attribute:description+' => '~~',
 	'Class:Service/Attribute:servicefamily_id' => 'Szolgáltatáscsalád',
-	'Class:Service/Attribute:servicefamily_id+' => '~~',
+	'Class:Service/Attribute:servicefamily_id+' => 'Required for this service to be visible on User Portal~~',
 	'Class:Service/Attribute:servicefamily_name' => 'Szolgáltatáscsalád név',
 	'Class:Service/Attribute:servicefamily_name+' => '~~',
 	'Class:Service/Attribute:documents_list' => 'Dokumentumok',

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

@@ -241,7 +241,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', [
 	'Class:Service/Attribute:description' => 'Descrizione',
 	'Class:Service/Attribute:description+' => '~~',
 	'Class:Service/Attribute:servicefamily_id' => 'Famiglia di Servizi',
-	'Class:Service/Attribute:servicefamily_id+' => '~~',
+	'Class:Service/Attribute:servicefamily_id+' => 'Required for this service to be visible on User Portal~~',
 	'Class:Service/Attribute:servicefamily_name' => 'Nome della Famiglia di Servizi',
 	'Class:Service/Attribute:servicefamily_name+' => '~~',
 	'Class:Service/Attribute:documents_list' => 'Documenti',

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

@@ -241,7 +241,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', [
 	'Class:Service/Attribute:description' => '説明',
 	'Class:Service/Attribute:description+' => '',
 	'Class:Service/Attribute:servicefamily_id' => 'サービスファミリ',
-	'Class:Service/Attribute:servicefamily_id+' => '',
+	'Class:Service/Attribute:servicefamily_id+' => 'Required for this service to be visible on User Portal~~',
 	'Class:Service/Attribute:servicefamily_name' => 'サービスファミリ名',
 	'Class:Service/Attribute:servicefamily_name+' => '',
 	'Class:Service/Attribute:documents_list' => '文書',
@@ -499,7 +499,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', [
 	'Class:DeliveryModel/Attribute:description' => '説明',
 	'Class:DeliveryModel/Attribute:description+' => '',
 	'Class:DeliveryModel/Attribute:contacts_list' => '連絡先',
-	'Class:DeliveryModel/Attribute:contacts_list+' => 'All the contacts (Teams and Persons) for this delivery model~~',
+	'Class:DeliveryModel/Attribute:contacts_list+' => 'There must be at least one team to enable Ticket assignment~~',
 	'Class:DeliveryModel/Attribute:customers_list' => '顧客',
 	'Class:DeliveryModel/Attribute:customers_list+' => 'All the customers having this delivering model~~',
 ]);

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

@@ -243,7 +243,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 	'Class:Service/Attribute:description' => 'Omschrijving',
 	'Class:Service/Attribute:description+' => '',
 	'Class:Service/Attribute:servicefamily_id' => 'Servicecategorie',
-	'Class:Service/Attribute:servicefamily_id+' => '',
+	'Class:Service/Attribute:servicefamily_id+' => 'Required for this service to be visible on User Portal~~',
 	'Class:Service/Attribute:servicefamily_name' => 'Naam servicecategorie',
 	'Class:Service/Attribute:servicefamily_name+' => '',
 	'Class:Service/Attribute:documents_list' => 'Documenten',

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

@@ -241,7 +241,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', [
 	'Class:Service/Attribute:description' => 'Opis',
 	'Class:Service/Attribute:description+' => '',
 	'Class:Service/Attribute:servicefamily_id' => 'Rodzina usług',
-	'Class:Service/Attribute:servicefamily_id+' => '',
+	'Class:Service/Attribute:servicefamily_id+' => 'Required for this service to be visible on User Portal~~',
 	'Class:Service/Attribute:servicefamily_name' => 'Nazwa rodziny usług',
 	'Class:Service/Attribute:servicefamily_name+' => '',
 	'Class:Service/Attribute:documents_list' => 'Dokumenty',