N°2677 - Add style definition for enums (Default values)

application/utils.inc.php

@@ -1480,7 +1480,7 @@ class utils
 	 */
 	public static function GetSafeId($sId)
 	{
-		return str_replace(array(':', '[', ']', '+', '-'), '_', $sId);
+		return str_replace(array(':', '[', ']', '+', '-', ' '), '_', $sId);
 	}
 	
 	/**

core/attributedef.class.inc.php

@@ -5182,9 +5182,9 @@ class AttributeEnum extends AttributeString
 	/**
 	 * @param string|null $sValue
 	 *
-	 * @return \ormStyle
+	 * @return \ormStyle|null
 	 */
-	protected function GetStyle(?string $sValue): ormStyle
+	protected function GetStyle(?string $sValue): ?ormStyle
 	{
 		if ($this->IsParam('styled_values')) {
 			$aStyles = $this->Get('styled_values');
@@ -5193,7 +5193,11 @@ class AttributeEnum extends AttributeString
 			}
 		}
 
-		return new ormStyle();
+		if ($this->IsParam('default_style')) {
+			return $this->Get('default_style');
+		}
+
+		return null;
 	}
 
 	protected function GetSQLCol($bFullSpec = false)

core/ormStyle.class.inc.php

@@ -11,6 +11,10 @@ class ormStyle
 	protected $sMainColor;
 	/** @var string */
 	protected $sComplementaryColor;
+	/** @var string CSS class with color and background-color */
+	protected $sStyleClass;
+	/** @var string CSS class with only color */
+	protected $sAltStyleClass;
 	/** @var string */
 	protected $sDecorationClasses;
 	/** @var string */
@@ -19,15 +23,19 @@ class ormStyle
 	/**
 	 * ormStyle constructor.
 	 *
+	 * @param string $sStyleClass
+	 * @param string $sAltStyleClass
 	 * @param string $sMainColor
 	 * @param string $sComplementaryColor
 	 * @param string $sDecorationClasses
 	 * @param string $sIcon
 	 */
-	public function __construct(string $sMainColor = '#2B6CB0', string $sComplementaryColor = '#FFFFFF', string $sDecorationClasses = '', string $sIcon = '')
+	public function __construct(string $sStyleClass = '', string $sAltStyleClass = '', string $sMainColor = '#2B6CB0', string $sComplementaryColor = '#FFFFFF', string $sDecorationClasses = '', string $sIcon = '')
 	{
 		$this->sMainColor = $sMainColor;
 		$this->sComplementaryColor = $sComplementaryColor;
+		$this->sStyleClass = $sStyleClass;
+		$this->sAltStyleClass = $sAltStyleClass;
 		$this->sDecorationClasses = $sDecorationClasses;
 		$this->sIcon = $sIcon;
 	}
@@ -43,9 +51,9 @@ class ormStyle
 	/**
 	 * @param string $sMainColor
 	 *
-	 * @return ormStyle
+	 * @return $this
 	 */
-	public function SetMainColor(string $sMainColor): ormStyle
+	public function SetMainColor(string $sMainColor)
 	{
 		$this->sMainColor = $sMainColor;
 		return $this;
@@ -62,14 +70,52 @@ class ormStyle
 	/**
 	 * @param string $sComplementaryColor
 	 *
-	 * @return ormStyle
+	 * @return $this
 	 */
-	public function SetComplementaryColor(string $sComplementaryColor): ormStyle
+	public function SetComplementaryColor(string $sComplementaryColor)
 	{
 		$this->sComplementaryColor = $sComplementaryColor;
 		return $this;
 	}
 
+	/**
+	 * @return string
+	 */
+	public function GetStyleClass(): string
+	{
+		return $this->sStyleClass;
+	}
+
+	/**
+	 * @param string $sStyleClass
+	 *
+	 * @return $this
+	 */
+	public function SetStyleClass(string $sStyleClass)
+	{
+		$this->sStyleClass = $sStyleClass;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function GetAltStyleClass(): string
+	{
+		return $this->sAltStyleClass;
+	}
+
+	/**
+	 * @param string $sAltStyleClass
+	 *
+	 * @return $this
+	 */
+	public function SetAltStyleClass(string $sAltStyleClass)
+	{
+		$this->sAltStyleClass = $sAltStyleClass;
+		return $this;
+	}
+
 	/**
 	 * @return string
 	 */
@@ -81,9 +127,9 @@ class ormStyle
 	/**
 	 * @param string $sDecorationClasses
 	 *
-	 * @return ormStyle
+	 * @return $this
 	 */
-	public function SetDecorationClasses(string $sDecorationClasses): ormStyle
+	public function SetDecorationClasses(string $sDecorationClasses)
 	{
 		$this->sDecorationClasses = $sDecorationClasses;
 		return $this;
@@ -100,9 +146,9 @@ class ormStyle
 	/**
 	 * @param string $sIcon
 	 *
-	 * @return ormStyle
+	 * @return $this
 	 */
-	public function SetIcon(string $sIcon): ormStyle
+	public function SetIcon(string $sIcon)
 	{
 		$this->sIcon = $sIcon;
 		return $this;

datamodels/2.x/itop-bridge-cmdb-ticket/datamodel.itop-bridge-cmdb-ticket.xml

@@ -60,27 +60,12 @@
           <values>
             <value id="manual">
               <enum_code>manual</enum_code>
-              <style>
-                <main_color>#2B6CB0</main_color>
-                <complementary_color>#FFFFFF</complementary_color>
-                <decoration_classes/>
-              </style>
             </value>
             <value id="computed">
               <enum_code>computed</enum_code>
-              <style>
-                <main_color>#2B6CB0</main_color>
-                <complementary_color>#FFFFFF</complementary_color>
-                <decoration_classes/>
-              </style>
             </value>
             <value id="not_impacted">
               <enum_code>not_impacted</enum_code>
-              <style>
-                <main_color>#2B6CB0</main_color>
-                <complementary_color>#FFFFFF</complementary_color>
-                <decoration_classes/>
-              </style>
             </value>
           </values>
           <sql>impact_code</sql>

datamodels/2.x/itop-change-mgmt-itil/datamodel.itop-change-mgmt-itil.xml

@@ -43,15 +43,15 @@
             <value id="approved">approved
               <enum_code>approved</enum_code>
               <style>
-                <main_color>#2B6CB0</main_color>
+                <main_color>#689F38</main_color>
                 <complementary_color>#FFFFFF</complementary_color>
-                <decoration_classes/>
+                <decoration_classes>fas fa-user-check</decoration_classes>
               </style>
             </value>
             <value id="assigned">assigned
               <enum_code>assigned</enum_code>
               <style>
-                <main_color>#2B6CB0</main_color>
+                <main_color>#2C5382</main_color>
                 <complementary_color>#FFFFFF</complementary_color>
                 <decoration_classes/>
               </style>
@@ -59,31 +59,21 @@
             <value id="closed">
               <enum_code>closed</enum_code>
               <style>
-                <main_color>#2B6CB0</main_color>
-                <complementary_color>#FFFFFF</complementary_color>
+                <main_color>#E1E7EC</main_color>
+                <complementary_color>#6E7A8A</complementary_color>
                 <decoration_classes/>
               </style>
             </value>
             <value id="implemented">
               <enum_code>implemented</enum_code>
-              <style>
-                <main_color>#2B6CB0</main_color>
-                <complementary_color>#FFFFFF</complementary_color>
-                <decoration_classes/>
-              </style>
             </value>
             <value id="monitored">
               <enum_code>monitored</enum_code>
-              <style>
-                <main_color>#2B6CB0</main_color>
-                <complementary_color>#FFFFFF</complementary_color>
-                <decoration_classes/>
-              </style>
             </value>
             <value id="new">
               <enum_code>new</enum_code>
               <style>
-                <main_color>#2B6CB0</main_color>
+                <main_color>#2C5382</main_color>
                 <complementary_color>#FFFFFF</complementary_color>
                 <decoration_classes/>
               </style>
@@ -91,36 +81,41 @@
             <value id="notapproved">
               <enum_code>notapproved</enum_code>
               <style>
-                <main_color>#2B6CB0</main_color>
+                <main_color>#B83280</main_color>
                 <complementary_color>#FFFFFF</complementary_color>
-                <decoration_classes/>
+                <decoration_classes>fas fa-user-times</decoration_classes>
               </style>
             </value>
             <value id="plannedscheduled">
               <enum_code>plannedscheduled</enum_code>
               <style>
-                <main_color>#2B6CB0</main_color>
+                <main_color>#F6AE55</main_color>
                 <complementary_color>#FFFFFF</complementary_color>
-                <decoration_classes/>
+                <decoration_classes>fas fa-hourglass-half</decoration_classes>
               </style>
             </value>
             <value id="rejected">
               <enum_code>rejected</enum_code>
               <style>
-                <main_color>#2B6CB0</main_color>
+                <main_color>#B83280</main_color>
                 <complementary_color>#FFFFFF</complementary_color>
-                <decoration_classes/>
+                <decoration_classes>fas fa-user-times</decoration_classes>
               </style>
             </value>
             <value id="validated">
               <enum_code>validated</enum_code>
               <style>
-                <main_color>#2B6CB0</main_color>
+                <main_color>#689F38</main_color>
                 <complementary_color>#FFFFFF</complementary_color>
-                <decoration_classes/>
+                <decoration_classes>fas fa-check</decoration_classes>
               </style>
             </value>
           </values>
+          <default_style>
+            <main_color>#2B6CB0</main_color>
+            <complementary_color>#FFFFFF</complementary_color>
+            <decoration_classes/>
+          </default_style>
           <sql>status</sql>
           <default_value>new</default_value>
           <is_null_allowed>true</is_null_allowed>
@@ -218,19 +213,9 @@
           <values>
             <value id="yes">
               <enum_code>yes</enum_code>
-              <style>
-                <main_color>#2B6CB0</main_color>
-                <complementary_color>#FFFFFF</complementary_color>
-                <decoration_classes/>
-              </style>
             </value>
             <value id="no">
               <enum_code>no</enum_code>
-              <style>
-                <main_color>#2B6CB0</main_color>
-                <complementary_color>#FFFFFF</complementary_color>
-                <decoration_classes/>
-              </style>
             </value>
           </values>
           <sql>outage</sql>
@@ -243,7 +228,9 @@
           <is_null_allowed>true</is_null_allowed>
         </field>
         <field id="parent_id" xsi:type="AttributeExternalKey">
-          <filter><![CDATA[SELECT Change WHERE id != :this->id]]></filter>
+          <filter><![CDATA[
+            SELECT Change WHERE id != :this->id
+            ]]></filter>
           <sql>parent_id</sql>
           <target_class>Change</target_class>
           <is_null_allowed>true</is_null_allowed>

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

@@ -42,7 +42,7 @@
                         <value id="new">
                             <enum_code>new</enum_code>
                             <style>
-                                <main_color>#2B6CB0</main_color>
+                                <main_color>#2C5382</main_color>
                                 <complementary_color>#FFFFFF</complementary_color>
                                 <decoration_classes/>
                             </style>
@@ -50,44 +50,44 @@
                         <value id="assigned">
                             <enum_code>assigned</enum_code>
                             <style>
-                                <main_color>#2B6CB0</main_color>
+                                <main_color>#2C5382</main_color>
                                 <complementary_color>#FFFFFF</complementary_color>
                                 <decoration_classes/>
                             </style>
                         </value>
                         <value id="planned">
                             <enum_code>planned</enum_code>
-                            <style>
-                                <main_color>#2B6CB0</main_color>
-                                <complementary_color>#FFFFFF</complementary_color>
-                                <decoration_classes/>
-                            </style>
                         </value>
                         <value id="approved">
                             <enum_code>approved</enum_code>
                             <style>
-                                <main_color>#2B6CB0</main_color>
+                                <main_color>#689F38</main_color>
                                 <complementary_color>#FFFFFF</complementary_color>
-                                <decoration_classes/>
+                                <decoration_classes>fas fa-user-check</decoration_classes>
                             </style>
                         </value>
                         <value id="closed">
                             <enum_code>closed</enum_code>
                             <style>
-                                <main_color>#2B6CB0</main_color>
-                                <complementary_color>#FFFFFF</complementary_color>
+                                <main_color>#E1E7EC</main_color>
+                                <complementary_color>#6E7A8A</complementary_color>
                                 <decoration_classes/>
                             </style>
                         </value>
                         <value id="rejected">
                             <enum_code>rejected</enum_code>
                             <style>
-                                <main_color>#2B6CB0</main_color>
+                                <main_color>#B83280</main_color>
                                 <complementary_color>#FFFFFF</complementary_color>
-                                <decoration_classes/>
+                                <decoration_classes>fas fa-user-times</decoration_classes>
                             </style>
                         </value>
                     </values>
+                    <default_style>
+                        <main_color>#2B6CB0</main_color>
+                        <complementary_color>#FFFFFF</complementary_color>
+                        <decoration_classes/>
+                    </default_style>
                     <sql>status</sql>
                     <default_value>new</default_value>
                     <is_null_allowed>true</is_null_allowed>
@@ -96,51 +96,21 @@
                     <values>
                         <value id="hardware">
                             <enum_code>hardware</enum_code>
-                            <style>
-                                <main_color>#2B6CB0</main_color>
-                                <complementary_color>#FFFFFF</complementary_color>
-                                <decoration_classes/>
-                            </style>
                         </value>
                         <value id="software">
                             <enum_code>software</enum_code>
-                            <style>
-                                <main_color>#2B6CB0</main_color>
-                                <complementary_color>#FFFFFF</complementary_color>
-                                <decoration_classes/>
-                            </style>
                         </value>
                         <value id="system">
                             <enum_code>system</enum_code>
-                            <style>
-                                <main_color>#2B6CB0</main_color>
-                                <complementary_color>#FFFFFF</complementary_color>
-                                <decoration_classes/>
-                            </style>
                         </value>
                         <value id="network">
                             <enum_code>network</enum_code>
-                            <style>
-                                <main_color>#2B6CB0</main_color>
-                                <complementary_color>#FFFFFF</complementary_color>
-                                <decoration_classes/>
-                            </style>
                         </value>
                         <value id="application">
                             <enum_code>application</enum_code>
-                            <style>
-                                <main_color>#2B6CB0</main_color>
-                                <complementary_color>#FFFFFF</complementary_color>
-                                <decoration_classes/>
-                            </style>
                         </value>
                         <value id="other">
                             <enum_code>other</enum_code>
-                            <style>
-                                <main_color>#2B6CB0</main_color>
-                                <complementary_color>#FFFFFF</complementary_color>
-                                <decoration_classes/>
-                            </style>
                         </value>
                     </values>
                     <sql>category</sql>
@@ -194,19 +164,9 @@
                     <values>
                         <value id="yes">
                             <enum_code>yes</enum_code>
-                            <style>
-                                <main_color>#2B6CB0</main_color>
-                                <complementary_color>#FFFFFF</complementary_color>
-                                <decoration_classes/>
-                            </style>
                         </value>
                         <value id="no">
                             <enum_code>no</enum_code>
-                            <style>
-                                <main_color>#2B6CB0</main_color>
-                                <complementary_color>#FFFFFF</complementary_color>
-                                <decoration_classes/>
-                            </style>
                         </value>
                     </values>
                     <sql>outage</sql>

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

@@ -50,27 +50,12 @@
 					<values>
 						<value id="high">
 							<enum_code>high</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="medium">
 							<enum_code>medium</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="low">
 							<enum_code>low</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 					</values>
 					<sql>business_criticity</sql>
@@ -321,35 +306,15 @@
 					<values>
 						<value id="production">
 							<enum_code>production</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="implementation">
 							<enum_code>implementation</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="stock">
 							<enum_code>stock</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="obsolete">
 							<enum_code>obsolete</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 					</values>
 					<sql>status</sql>
@@ -1605,7 +1570,7 @@
 						<value id="active">
 							<enum_code>active</enum_code>
 							<style>
-								<main_color>#2B6CB0</main_color>
+								<main_color>#689F38</main_color>
 								<complementary_color>#FFFFFF</complementary_color>
 								<decoration_classes/>
 							</style>
@@ -1613,8 +1578,8 @@
 						<value id="inactive">
 							<enum_code>inactive</enum_code>
 							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
+								<main_color>#E1E7EC</main_color>
+								<complementary_color>#6E7A8A</complementary_color>
 								<decoration_classes/>
 							</style>
 						</value>
@@ -1755,7 +1720,7 @@
 						<value id="active">
 							<enum_code>active</enum_code>
 							<style>
-								<main_color>#2B6CB0</main_color>
+								<main_color>#689F38</main_color>
 								<complementary_color>#FFFFFF</complementary_color>
 								<decoration_classes/>
 							</style>
@@ -1763,8 +1728,8 @@
 						<value id="inactive">
 							<enum_code>inactive</enum_code>
 							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
+								<main_color>#E1E7EC</main_color>
+								<complementary_color>#6E7A8A</complementary_color>
 								<decoration_classes/>
 							</style>
 						</value>
@@ -1921,7 +1886,7 @@
 						<value id="active">
 							<enum_code>active</enum_code>
 							<style>
-								<main_color>#2B6CB0</main_color>
+								<main_color>#689F38</main_color>
 								<complementary_color>#FFFFFF</complementary_color>
 								<decoration_classes/>
 							</style>
@@ -1929,8 +1894,8 @@
 						<value id="inactive">
 							<enum_code>inactive</enum_code>
 							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
+								<main_color>#E1E7EC</main_color>
+								<complementary_color>#6E7A8A</complementary_color>
 								<decoration_classes/>
 							</style>
 						</value>
@@ -3037,43 +3002,18 @@
 					<values>
 						<value id="Middleware">
 							<enum_code>Middleware</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="DBServer">
 							<enum_code>DBServer</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="PCSoftware">
 							<enum_code>PCSoftware</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="OtherSoftware">
 							<enum_code>OtherSoftware</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="WebServer">
 							<enum_code>WebServer</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 					</values>
 					<sql>type</sql>
@@ -3518,19 +3458,9 @@
 					<values>
 						<value id="yes">
 							<enum_code>yes</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="no">
 							<enum_code>no</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 					</values>
 					<sql>perpetual</sql>
@@ -4206,147 +4136,57 @@
 					<values>
 						<value id="NetworkDevice">
 							<enum_code>NetworkDevice</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="Server">
 							<enum_code>Server</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="SANSwitch">
 							<enum_code>SANSwitch</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="StorageSystem">
 							<enum_code>StorageSystem</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="Rack">
 							<enum_code>Rack</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="Enclosure">
 							<enum_code>Enclosure</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="PC">
 							<enum_code>PC</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="Tablet">
 							<enum_code>Tablet</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="Phone">
 							<enum_code>Phone</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="MobilePhone">
 							<enum_code>MobilePhone</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="Printer">
 							<enum_code>Printer</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="DiskArray">
 							<enum_code>DiskArray</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="NAS">
 							<enum_code>NAS</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="TapeLibrary">
 							<enum_code>TapeLibrary</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="IPPhone">
 							<enum_code>IPPhone</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="Peripheral">
 							<enum_code>Peripheral</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="PowerSource">
 							<enum_code>PowerSource</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="PDU">
 							<enum_code>PDU</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 					</values>
 					<sql>type</sql>
@@ -5879,19 +5719,9 @@
 					<values>
 						<value id="uplink">
 							<enum_code>uplink</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="downlink">
 							<enum_code>downlink</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 					</values>
 					<sql>type</sql>
@@ -6289,27 +6119,12 @@
 					<values>
 						<value id="production">
 							<enum_code>production</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="implementation">
 							<enum_code>implementation</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="obsolete">
 							<enum_code>obsolete</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 					</values>
 					<sql>status</sql>

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

@@ -839,19 +839,9 @@
           <values>
             <value id="laptop">
               <enum_code>laptop</enum_code>
-              <style>
-                <main_color>#2B6CB0</main_color>
-                <complementary_color>#FFFFFF</complementary_color>
-                <decoration_classes/>
-              </style>
             </value>
             <value id="desktop">
               <enum_code>desktop</enum_code>
-              <style>
-                <main_color>#2B6CB0</main_color>
-                <complementary_color>#FFFFFF</complementary_color>
-                <decoration_classes/>
-              </style>
             </value>
           </values>
           <sql>type</sql>

datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml

@@ -43,7 +43,7 @@
 						<value id="new">
 							<enum_code>new</enum_code>
 							<style>
-								<main_color>#2B6CB0</main_color>
+								<main_color>#2C5382</main_color>
 								<complementary_color>#FFFFFF</complementary_color>
 								<decoration_classes/>
 							</style>
@@ -51,7 +51,7 @@
 						<value id="assigned">
 							<enum_code>assigned</enum_code>
 							<style>
-								<main_color>#2B6CB0</main_color>
+								<main_color>#2C5382</main_color>
 								<complementary_color>#FFFFFF</complementary_color>
 								<decoration_classes/>
 							</style>
@@ -59,44 +59,49 @@
 						<value id="pending">
 							<enum_code>pending</enum_code>
 							<style>
-								<main_color>#2B6CB0</main_color>
+								<main_color>#F6AE55</main_color>
 								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
+								<decoration_classes>fas fa-hourglass-half</decoration_classes>
 							</style>
 						</value>
 						<value id="escalated_tto">
 							<enum_code>escalated_tto</enum_code>
 							<style>
-								<main_color>#2B6CB0</main_color>
+								<main_color>#B83280</main_color>
 								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
+								<decoration_classes>fas fa-fire</decoration_classes>
 							</style>
 						</value>
 						<value id="escalated_ttr">
 							<enum_code>escalated_ttr</enum_code>
 							<style>
-								<main_color>#2B6CB0</main_color>
+								<main_color>#B83280</main_color>
 								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
+								<decoration_classes>fas fa-fire</decoration_classes>
 							</style>
 						</value>
 						<value id="resolved">
 							<enum_code>resolved</enum_code>
 							<style>
-								<main_color>#2B6CB0</main_color>
+								<main_color>#689F38</main_color>
 								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
+								<decoration_classes>fas fa-check</decoration_classes>
 							</style>
 						</value>
 						<value id="closed">
 							<enum_code>closed</enum_code>
 							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
+								<main_color>#E1E7EC</main_color>
+								<complementary_color>#6E7A8A</complementary_color>
 								<decoration_classes/>
 							</style>
 						</value>
 					</values>
+					<default_style>
+						<main_color>#2B6CB0</main_color>
+						<complementary_color>#FFFFFF</complementary_color>
+						<decoration_classes/>
+					</default_style>
 					<sql>status</sql>
 					<default_value>new</default_value>
 					<is_null_allowed>false</is_null_allowed>
@@ -106,27 +111,12 @@
 					<values>
 						<value id="1">
 							<enum_code>1</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="2">
 							<enum_code>2</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="3">
 							<enum_code>3</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 					</values>
 					<sql>impact</sql>
@@ -138,35 +128,15 @@
 					<values>
 						<value id="1">
 							<enum_code>1</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="2">
 							<enum_code>2</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="3">
 							<enum_code>3</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="4">
 							<enum_code>4</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 					</values>
 					<dependencies>
@@ -181,35 +151,15 @@
 					<values>
 						<value id="1">
 							<enum_code>1</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="2">
 							<enum_code>2</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="3">
 							<enum_code>3</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="4">
 							<enum_code>4</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 					</values>
 					<sql>urgency</sql>
@@ -220,35 +170,15 @@
 					<values>
 						<value id="mail">
 							<enum_code>mail</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="phone">
 							<enum_code>phone</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="portal">
 							<enum_code>portal</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="monitoring">
 							<enum_code>monitoring</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 					</values>
 					<sql>origin</sql>
@@ -257,7 +187,11 @@
 					<display_style>list</display_style>
 				</field>
 				<field id="service_id" xsi:type="AttributeExternalKey">
-					<filter><![CDATA[SELECT Service AS s JOIN lnkCustomerContractToService AS l1 ON l1.service_id=s.id JOIN CustomerContract AS cc ON l1.customercontract_id=cc.id WHERE cc.org_id = :this->org_id AND s.status != 'obsolete']]></filter>
+					<filter><![CDATA[
+						SELECT Service AS s JOIN lnkCustomerContractToService AS l1
+						ON l1.service_id=s.id JOIN CustomerContract AS cc ON l1.customercontract_id=cc.id
+						WHERE cc.org_id = :this->org_id AND s.status != 'obsolete'
+						]]></filter>
 					<dependencies>
 						<attribute id="org_id"/>
 					</dependencies>
@@ -290,19 +224,9 @@
 					<values>
 						<value id="yes">
 							<enum_code>yes</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="no">
 							<enum_code>no</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 					</values>
 					<sql>escalation_flag</sql>
@@ -439,32 +363,25 @@
 					<values>
 						<value id="assistance">
 							<enum_code>assistance</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="other">
 							<enum_code>other</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
-						<value id="software patch">software patch</value>
+						<value id="software patch">
+							<enum_code>software patch</enum_code>
+						</value>
 						<value id="training">
 							<enum_code>training</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
-						<value id="hardware repair">hardware repair</value>
-						<value id="system update">system update</value>
-						<value id="bug fixed">bug fixed</value>
+						<value id="hardware repair">
+							<enum_code>hardware repair</enum_code>
+						</value>
+						<value id="system update">
+							<enum_code>system update</enum_code>
+						</value>
+						<value id="bug fixed">
+							<enum_code>bug fixed</enum_code>
+						</value>
 					</values>
 					<sql>resolution_code</sql>
 					<default_value>assistance</default_value>
@@ -536,35 +453,15 @@
 					<values>
 						<value id="1">
 							<enum_code>1</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="2">
 							<enum_code>2</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="3">
 							<enum_code>3</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="4">
 							<enum_code>4</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 					</values>
 					<sql>user_satisfaction</sql>

datamodels/2.x/itop-knownerror-light/datamodel.itop-knownerror-light.xml

@@ -81,35 +81,15 @@
           <values>
             <value id="Network">
               <enum_code>Network</enum_code>
-              <style>
-                <main_color>#2B6CB0</main_color>
-                <complementary_color>#FFFFFF</complementary_color>
-                <decoration_classes/>
-              </style>
             </value>
             <value id="Server">
               <enum_code>Server</enum_code>
-              <style>
-                <main_color>#2B6CB0</main_color>
-                <complementary_color>#FFFFFF</complementary_color>
-                <decoration_classes/>
-              </style>
             </value>
             <value id="Application">
               <enum_code>Application</enum_code>
-              <style>
-                <main_color>#2B6CB0</main_color>
-                <complementary_color>#FFFFFF</complementary_color>
-                <decoration_classes/>
-              </style>
             </value>
             <value id="Desktop">
               <enum_code>Desktop</enum_code>
-              <style>
-                <main_color>#2B6CB0</main_color>
-                <complementary_color>#FFFFFF</complementary_color>
-                <decoration_classes/>
-              </style>
             </value>
           </values>
           <sql>domain</sql>

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

@@ -42,7 +42,7 @@
                         <value id="new">
                             <enum_code>new</enum_code>
                             <style>
-                                <main_color>#2B6CB0</main_color>
+                                <main_color>#2C5382</main_color>
                                 <complementary_color>#FFFFFF</complementary_color>
                                 <decoration_classes/>
                             </style>
@@ -50,7 +50,7 @@
                         <value id="assigned">
                             <enum_code>assigned</enum_code>
                             <style>
-                                <main_color>#2B6CB0</main_color>
+                                <main_color>#2C5382</main_color>
                                 <complementary_color>#FFFFFF</complementary_color>
                                 <decoration_classes/>
                             </style>
@@ -58,20 +58,25 @@
                         <value id="resolved">
                             <enum_code>resolved</enum_code>
                             <style>
-                                <main_color>#2B6CB0</main_color>
+                                <main_color>#689F38</main_color>
                                 <complementary_color>#FFFFFF</complementary_color>
-                                <decoration_classes/>
+                                <decoration_classes>fas fa-check</decoration_classes>
                             </style>
                         </value>
                         <value id="closed">
                             <enum_code>closed</enum_code>
                             <style>
-                                <main_color>#2B6CB0</main_color>
-                                <complementary_color>#FFFFFF</complementary_color>
+                                <main_color>#E1E7EC</main_color>
+                                <complementary_color>#6E7A8A</complementary_color>
                                 <decoration_classes/>
                             </style>
                         </value>
                     </values>
+                    <default_style>
+                        <main_color>#2B6CB0</main_color>
+                        <complementary_color>#FFFFFF</complementary_color>
+                        <decoration_classes/>
+                    </default_style>
                     <sql>status</sql>
                     <default_value>new</default_value>
                     <is_null_allowed>false</is_null_allowed>
@@ -116,27 +121,12 @@
                     <values>
                         <value id="1">
                             <enum_code>1</enum_code>
-                            <style>
-                                <main_color>#2B6CB0</main_color>
-                                <complementary_color>#FFFFFF</complementary_color>
-                                <decoration_classes/>
-                            </style>
                         </value>
                         <value id="2">
                             <enum_code>2</enum_code>
-                            <style>
-                                <main_color>#2B6CB0</main_color>
-                                <complementary_color>#FFFFFF</complementary_color>
-                                <decoration_classes/>
-                            </style>
                         </value>
                         <value id="3">
                             <enum_code>3</enum_code>
-                            <style>
-                                <main_color>#2B6CB0</main_color>
-                                <complementary_color>#FFFFFF</complementary_color>
-                                <decoration_classes/>
-                            </style>
                         </value>
                     </values>
                     <sql>impact</sql>
@@ -148,35 +138,15 @@
                     <values>
                         <value id="1">
                             <enum_code>1</enum_code>
-                            <style>
-                                <main_color>#2B6CB0</main_color>
-                                <complementary_color>#FFFFFF</complementary_color>
-                                <decoration_classes/>
-                            </style>
                         </value>
                         <value id="2">
                             <enum_code>2</enum_code>
-                            <style>
-                                <main_color>#2B6CB0</main_color>
-                                <complementary_color>#FFFFFF</complementary_color>
-                                <decoration_classes/>
-                            </style>
                         </value>
                         <value id="3">
                             <enum_code>3</enum_code>
-                            <style>
-                                <main_color>#2B6CB0</main_color>
-                                <complementary_color>#FFFFFF</complementary_color>
-                                <decoration_classes/>
-                            </style>
                         </value>
                         <value id="4">
                             <enum_code>4</enum_code>
-                            <style>
-                                <main_color>#2B6CB0</main_color>
-                                <complementary_color>#FFFFFF</complementary_color>
-                                <decoration_classes/>
-                            </style>
                         </value>
                     </values>
                     <sql>urgency</sql>
@@ -188,35 +158,15 @@
                     <values>
                         <value id="1">
                             <enum_code>1</enum_code>
-                            <style>
-                                <main_color>#2B6CB0</main_color>
-                                <complementary_color>#FFFFFF</complementary_color>
-                                <decoration_classes/>
-                            </style>
                         </value>
                         <value id="2">
                             <enum_code>2</enum_code>
-                            <style>
-                                <main_color>#2B6CB0</main_color>
-                                <complementary_color>#FFFFFF</complementary_color>
-                                <decoration_classes/>
-                            </style>
                         </value>
                         <value id="3">
                             <enum_code>3</enum_code>
-                            <style>
-                                <main_color>#2B6CB0</main_color>
-                                <complementary_color>#FFFFFF</complementary_color>
-                                <decoration_classes/>
-                            </style>
                         </value>
                         <value id="4">
                             <enum_code>4</enum_code>
-                            <style>
-                                <main_color>#2B6CB0</main_color>
-                                <complementary_color>#FFFFFF</complementary_color>
-                                <decoration_classes/>
-                            </style>
                         </value>
                     </values>
                     <sql>priority</sql>

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

@@ -43,7 +43,7 @@
 						<value id="new">
 							<enum_code>new</enum_code>
 							<style>
-								<main_color>#2B6CB0</main_color>
+								<main_color>#2C5382</main_color>
 								<complementary_color>#FFFFFF</complementary_color>
 								<decoration_classes/>
 							</style>
@@ -51,31 +51,31 @@
 						<value id="waiting_for_approval">
 							<enum_code>waiting_for_approval</enum_code>
 							<style>
-								<main_color>#2B6CB0</main_color>
+								<main_color>#F6AE55</main_color>
 								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
+								<decoration_classes>fas fa-hourglass-half</decoration_classes>
 							</style>
 						</value>
 						<value id="approved">
 							<enum_code>approved</enum_code>
 							<style>
-								<main_color>#2B6CB0</main_color>
+								<main_color>#689F38</main_color>
 								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
+								<decoration_classes>fas fa-user-check</decoration_classes>
 							</style>
 						</value>
 						<value id="rejected">
 							<enum_code>rejected</enum_code>
 							<style>
-								<main_color>#2B6CB0</main_color>
+								<main_color>#B83280</main_color>
 								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
+								<decoration_classes>fas fa-user-times</decoration_classes>
 							</style>
 						</value>
 						<value id="assigned">
 							<enum_code>assigned</enum_code>
 							<style>
-								<main_color>#2B6CB0</main_color>
+								<main_color>#2C5382</main_color>
 								<complementary_color>#FFFFFF</complementary_color>
 								<decoration_classes/>
 							</style>
@@ -83,44 +83,49 @@
 						<value id="pending">
 							<enum_code>pending</enum_code>
 							<style>
-								<main_color>#2B6CB0</main_color>
+								<main_color>#F6AE55</main_color>
 								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
+								<decoration_classes>fas fa-hourglass-half</decoration_classes>
 							</style>
 						</value>
 						<value id="escalated_tto">
 							<enum_code>escalated_tto</enum_code>
 							<style>
-								<main_color>#2B6CB0</main_color>
+								<main_color>#B83280</main_color>
 								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
+								<decoration_classes>fas fa-fire</decoration_classes>
 							</style>
 						</value>
 						<value id="escalated_ttr">
 							<enum_code>escalated_ttr</enum_code>
 							<style>
-								<main_color>#2B6CB0</main_color>
+								<main_color>#B83280</main_color>
 								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
+								<decoration_classes>fas fa-fire</decoration_classes>
 							</style>
 						</value>
 						<value id="resolved">
 							<enum_code>resolved</enum_code>
 							<style>
-								<main_color>#2B6CB0</main_color>
+								<main_color>#689F38</main_color>
 								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
+								<decoration_classes>fas fa-check</decoration_classes>
 							</style>
 						</value>
 						<value id="closed">
 							<enum_code>closed</enum_code>
 							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
+								<main_color>#E1E7EC</main_color>
+								<complementary_color>#6E7A8A</complementary_color>
 								<decoration_classes/>
 							</style>
 						</value>
 					</values>
+					<default_style>
+						<main_color>#2B6CB0</main_color>
+						<complementary_color>#FFFFFF</complementary_color>
+						<decoration_classes/>
+					</default_style>
 					<sql>status</sql>
 					<default_value>new</default_value>
 					<is_null_allowed>false</is_null_allowed>
@@ -129,11 +134,6 @@
 					<values>
 						<value id="service_request">
 							<enum_code>service_request</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 					</values>
 					<sql>request_type</sql>
@@ -145,27 +145,12 @@
 					<values>
 						<value id="1">
 							<enum_code>1</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="2">
 							<enum_code>2</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="3">
 							<enum_code>3</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 					</values>
 					<sql>impact</sql>
@@ -177,35 +162,15 @@
 					<values>
 						<value id="1">
 							<enum_code>1</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="2">
 							<enum_code>2</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="3">
 							<enum_code>3</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="4">
 							<enum_code>4</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 					</values>
 					<dependencies>
@@ -220,35 +185,15 @@
 					<values>
 						<value id="1">
 							<enum_code>1</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="2">
 							<enum_code>2</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="3">
 							<enum_code>3</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="4">
 							<enum_code>4</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 					</values>
 					<sql>urgency</sql>
@@ -259,27 +204,12 @@
 					<values>
 						<value id="mail">
 							<enum_code>mail</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="phone">
 							<enum_code>phone</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="portal">
 							<enum_code>portal</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 					</values>
 					<sql>origin</sql>
@@ -287,7 +217,9 @@
 					<is_null_allowed>true</is_null_allowed>
 				</field>
 				<field id="approver_id" xsi:type="AttributeExternalKey">
-					<filter><![CDATA[SELECT Person WHERE org_id= :this->org_id]]></filter>
+					<filter><![CDATA[
+						SELECT Person WHERE org_id= :this->org_id
+						]]></filter>
 					<dependencies>
 						<attribute id="org_id"/>
 					</dependencies>
@@ -337,19 +269,9 @@
 					<values>
 						<value id="yes">
 							<enum_code>yes</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="no">
 							<enum_code>no</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 					</values>
 					<sql>escalation_flag</sql>
@@ -488,28 +410,13 @@
 					<values>
 						<value id="assistance">
 							<enum_code>assistance</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="other">
 							<enum_code>other</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="software patch">software patch</value>
 						<value id="training">
 							<enum_code>training</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="hardware repair">hardware repair</value>
 						<value id="system update">system update</value>
@@ -590,35 +497,15 @@
 					<values>
 						<value id="1">
 							<enum_code>1</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="2">
 							<enum_code>2</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="3">
 							<enum_code>3</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="4">
 							<enum_code>4</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 					</values>
 					<sql>user_satisfaction</sql>

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

@@ -129,19 +129,9 @@
                     <values>
                         <value id="incident">
                             <enum_code>incident</enum_code>
-                            <style>
-                                <main_color>#2B6CB0</main_color>
-                                <complementary_color>#FFFFFF</complementary_color>
-                                <decoration_classes/>
-                            </style>
                         </value>
                         <value id="service_request">
                             <enum_code>service_request</enum_code>
-                            <style>
-                                <main_color>#2B6CB0</main_color>
-                                <complementary_color>#FFFFFF</complementary_color>
-                                <decoration_classes/>
-                            </style>
                         </value>
                     </values>
                     <sql>request_type</sql>
@@ -153,27 +143,12 @@
                     <values>
                         <value id="1">
                             <enum_code>1</enum_code>
-                            <style>
-                                <main_color>#2B6CB0</main_color>
-                                <complementary_color>#FFFFFF</complementary_color>
-                                <decoration_classes/>
-                            </style>
                         </value>
                         <value id="2">
                             <enum_code>2</enum_code>
-                            <style>
-                                <main_color>#2B6CB0</main_color>
-                                <complementary_color>#FFFFFF</complementary_color>
-                                <decoration_classes/>
-                            </style>
                         </value>
                         <value id="3">
                             <enum_code>3</enum_code>
-                            <style>
-                                <main_color>#2B6CB0</main_color>
-                                <complementary_color>#FFFFFF</complementary_color>
-                                <decoration_classes/>
-                            </style>
                         </value>
                     </values>
                     <sql>impact</sql>
@@ -186,15 +161,15 @@
                         <value id="1">
                             <enum_code>1</enum_code>
                             <style>
-                                <main_color>#2B6CB0</main_color>
+                                <main_color>#C53030</main_color>
                                 <complementary_color>#FFFFFF</complementary_color>
-                                <decoration_classes/>
+                                <decoration_classes>fas fa-fire</decoration_classes>
                             </style>
                         </value>
                         <value id="2">
                             <enum_code>2</enum_code>
                             <style>
-                                <main_color>#2B6CB0</main_color>
+                                <main_color>#C05621</main_color>
                                 <complementary_color>#FFFFFF</complementary_color>
                                 <decoration_classes/>
                             </style>
@@ -202,7 +177,7 @@
                         <value id="3">
                             <enum_code>3</enum_code>
                             <style>
-                                <main_color>#2B6CB0</main_color>
+                                <main_color>#2B6BB0</main_color>
                                 <complementary_color>#FFFFFF</complementary_color>
                                 <decoration_classes/>
                             </style>
@@ -210,12 +185,17 @@
                         <value id="4">
                             <enum_code>4</enum_code>
                             <style>
-                                <main_color>#2B6CB0</main_color>
+                                <main_color>#6E7A8A</main_color>
                                 <complementary_color>#FFFFFF</complementary_color>
                                 <decoration_classes/>
                             </style>
                         </value>
                     </values>
+                    <default_style>
+                        <main_color>#2B6CB0</main_color>
+                        <complementary_color>#FFFFFF</complementary_color>
+                        <decoration_classes/>
+                    </default_style>
                     <dependencies>
                         <attribute id="impact"/>
                         <attribute id="urgency"/>
@@ -228,35 +208,15 @@
                     <values>
                         <value id="1">
                             <enum_code>1</enum_code>
-                            <style>
-                                <main_color>#2B6CB0</main_color>
-                                <complementary_color>#FFFFFF</complementary_color>
-                                <decoration_classes/>
-                            </style>
                         </value>
                         <value id="2">
                             <enum_code>2</enum_code>
-                            <style>
-                                <main_color>#2B6CB0</main_color>
-                                <complementary_color>#FFFFFF</complementary_color>
-                                <decoration_classes/>
-                            </style>
                         </value>
                         <value id="3">
                             <enum_code>3</enum_code>
-                            <style>
-                                <main_color>#2B6CB0</main_color>
-                                <complementary_color>#FFFFFF</complementary_color>
-                                <decoration_classes/>
-                            </style>
                         </value>
                         <value id="4">
                             <enum_code>4</enum_code>
-                            <style>
-                                <main_color>#2B6CB0</main_color>
-                                <complementary_color>#FFFFFF</complementary_color>
-                                <decoration_classes/>
-                            </style>
                         </value>
                     </values>
                     <sql>urgency</sql>
@@ -267,35 +227,15 @@
                     <values>
                         <value id="mail">
                             <enum_code>mail</enum_code>
-                            <style>
-                                <main_color>#2B6CB0</main_color>
-                                <complementary_color>#FFFFFF</complementary_color>
-                                <decoration_classes/>
-                            </style>
                         </value>
                         <value id="phone">
                             <enum_code>phone</enum_code>
-                            <style>
-                                <main_color>#2B6CB0</main_color>
-                                <complementary_color>#FFFFFF</complementary_color>
-                                <decoration_classes/>
-                            </style>
                         </value>
                         <value id="portal">
                             <enum_code>portal</enum_code>
-                            <style>
-                                <main_color>#2B6CB0</main_color>
-                                <complementary_color>#FFFFFF</complementary_color>
-                                <decoration_classes/>
-                            </style>
                         </value>
                         <value id="monitoring">
                             <enum_code>monitoring</enum_code>
-                            <style>
-                                <main_color>#2B6CB0</main_color>
-                                <complementary_color>#FFFFFF</complementary_color>
-                                <decoration_classes/>
-                            </style>
                         </value>
                     </values>
                     <sql>origin</sql>
@@ -360,19 +300,9 @@
                     <values>
                         <value id="yes">
                             <enum_code>yes</enum_code>
-                            <style>
-                                <main_color>#2B6CB0</main_color>
-                                <complementary_color>#FFFFFF</complementary_color>
-                                <decoration_classes/>
-                            </style>
                         </value>
                         <value id="no">
                             <enum_code>no</enum_code>
-                            <style>
-                                <main_color>#2B6CB0</main_color>
-                                <complementary_color>#FFFFFF</complementary_color>
-                                <decoration_classes/>
-                            </style>
                         </value>
                     </values>
                     <sql>escalation_flag</sql>
@@ -510,59 +440,24 @@
                     <values>
                         <value id="assistance">
                             <enum_code>assistance</enum_code>
-                            <style>
-                                <main_color>#2B6CB0</main_color>
-                                <complementary_color>#FFFFFF</complementary_color>
-                                <decoration_classes/>
-                            </style>
                         </value>
                         <value id="other">
                             <enum_code>other</enum_code>
-                            <style>
-                                <main_color>#2B6CB0</main_color>
-                                <complementary_color>#FFFFFF</complementary_color>
-                                <decoration_classes/>
-                            </style>
                         </value>
                         <value id="software patch">
                             <enum_code>software patch</enum_code>
-                            <style>
-                                <main_color>#2B6CB0</main_color>
-                                <complementary_color>#FFFFFF</complementary_color>
-                                <decoration_classes/>
-                            </style>
                         </value>
                         <value id="training">
                             <enum_code>training</enum_code>
-                            <style>
-                                <main_color>#2B6CB0</main_color>
-                                <complementary_color>#FFFFFF</complementary_color>
-                                <decoration_classes/>
-                            </style>
                         </value>
                         <value id="hardware repair">
                             <enum_code>hardware repair</enum_code>
-                            <style>
-                                <main_color>#2B6CB0</main_color>
-                                <complementary_color>#FFFFFF</complementary_color>
-                                <decoration_classes/>
-                            </style>
                         </value>
                         <value id="system update">
                             <enum_code>system update</enum_code>
-                            <style>
-                                <main_color>#2B6CB0</main_color>
-                                <complementary_color>#FFFFFF</complementary_color>
-                                <decoration_classes/>
-                            </style>
                         </value>
                         <value id="bug fixed">
                             <enum_code>bug fixed</enum_code>
-                            <style>
-                                <main_color>#2B6CB0</main_color>
-                                <complementary_color>#FFFFFF</complementary_color>
-                                <decoration_classes/>
-                            </style>
                         </value>
                     </values>
                     <sql>resolution_code</sql>
@@ -636,35 +531,15 @@
                     <values>
                         <value id="1">
                             <enum_code>1</enum_code>
-                            <style>
-                                <main_color>#2B6CB0</main_color>
-                                <complementary_color>#FFFFFF</complementary_color>
-                                <decoration_classes/>
-                            </style>
                         </value>
                         <value id="2">
                             <enum_code>2</enum_code>
-                            <style>
-                                <main_color>#2B6CB0</main_color>
-                                <complementary_color>#FFFFFF</complementary_color>
-                                <decoration_classes/>
-                            </style>
                         </value>
                         <value id="3">
                             <enum_code>3</enum_code>
-                            <style>
-                                <main_color>#2B6CB0</main_color>
-                                <complementary_color>#FFFFFF</complementary_color>
-                                <decoration_classes/>
-                            </style>
                         </value>
                         <value id="4">
                             <enum_code>4</enum_code>
-                            <style>
-                                <main_color>#2B6CB0</main_color>
-                                <complementary_color>#FFFFFF</complementary_color>
-                                <decoration_classes/>
-                            </style>
                         </value>
                     </values>
                     <sql>user_satisfaction</sql>

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

@@ -131,19 +131,9 @@
           <values>
             <value id="dollars">
               <enum_code>dollars</enum_code>
-              <style>
-                <main_color>#2B6CB0</main_color>
-                <complementary_color>#FFFFFF</complementary_color>
-                <decoration_classes/>
-              </style>
             </value>
             <value id="euros">
               <enum_code>euros</enum_code>
-              <style>
-                <main_color>#2B6CB0</main_color>
-                <complementary_color>#FFFFFF</complementary_color>
-                <decoration_classes/>
-              </style>
             </value>
           </values>
           <sql>cost_currency</sql>
@@ -185,27 +175,12 @@
           <values>
             <value id="production">
               <enum_code>production</enum_code>
-              <style>
-                <main_color>#2B6CB0</main_color>
-                <complementary_color>#FFFFFF</complementary_color>
-                <decoration_classes/>
-              </style>
             </value>
             <value id="implementation">
               <enum_code>implementation</enum_code>
-              <style>
-                <main_color>#2B6CB0</main_color>
-                <complementary_color>#FFFFFF</complementary_color>
-                <decoration_classes/>
-              </style>
             </value>
             <value id="obsolete">
               <enum_code>obsolete</enum_code>
-              <style>
-                <main_color>#2B6CB0</main_color>
-                <complementary_color>#FFFFFF</complementary_color>
-                <decoration_classes/>
-              </style>
             </value>
           </values>
           <sql>status</sql>
@@ -1091,27 +1066,12 @@ public function PrefillSearchForm(&$aContextParam)
           <values>
             <value id="production">
               <enum_code>production</enum_code>
-              <style>
-                <main_color>#2B6CB0</main_color>
-                <complementary_color>#FFFFFF</complementary_color>
-                <decoration_classes/>
-              </style>
             </value>
             <value id="implementation">
               <enum_code>implementation</enum_code>
-              <style>
-                <main_color>#2B6CB0</main_color>
-                <complementary_color>#FFFFFF</complementary_color>
-                <decoration_classes/>
-              </style>
             </value>
             <value id="obsolete">
               <enum_code>obsolete</enum_code>
-              <style>
-                <main_color>#2B6CB0</main_color>
-                <complementary_color>#FFFFFF</complementary_color>
-                <decoration_classes/>
-              </style>
             </value>
           </values>
           <sql>status</sql>
@@ -1447,19 +1407,9 @@ public function PrefillSearchForm(&$aContextParam)
           <values>
             <value id="incident">
               <enum_code>incident</enum_code>
-              <style>
-                <main_color>#2B6CB0</main_color>
-                <complementary_color>#FFFFFF</complementary_color>
-                <decoration_classes/>
-              </style>
             </value>
             <value id="service_request">
               <enum_code>service_request</enum_code>
-              <style>
-                <main_color>#2B6CB0</main_color>
-                <complementary_color>#FFFFFF</complementary_color>
-                <decoration_classes/>
-              </style>
             </value>
           </values>
           <sql>request_type</sql>
@@ -1471,27 +1421,12 @@ public function PrefillSearchForm(&$aContextParam)
           <values>
             <value id="production">
               <enum_code>production</enum_code>
-              <style>
-                <main_color>#2B6CB0</main_color>
-                <complementary_color>#FFFFFF</complementary_color>
-                <decoration_classes/>
-              </style>
             </value>
             <value id="implementation">
               <enum_code>implementation</enum_code>
-              <style>
-                <main_color>#2B6CB0</main_color>
-                <complementary_color>#FFFFFF</complementary_color>
-                <decoration_classes/>
-              </style>
             </value>
             <value id="obsolete">
               <enum_code>obsolete</enum_code>
-              <style>
-                <main_color>#2B6CB0</main_color>
-                <complementary_color>#FFFFFF</complementary_color>
-                <decoration_classes/>
-              </style>
             </value>
           </values>
           <sql>status</sql>
@@ -1750,35 +1685,15 @@ public function PrefillSearchForm(&$aContextParam)
           <values>
             <value id="1">
               <enum_code>1</enum_code>
-              <style>
-                <main_color>#2B6CB0</main_color>
-                <complementary_color>#FFFFFF</complementary_color>
-                <decoration_classes/>
-              </style>
             </value>
             <value id="2">
               <enum_code>2</enum_code>
-              <style>
-                <main_color>#2B6CB0</main_color>
-                <complementary_color>#FFFFFF</complementary_color>
-                <decoration_classes/>
-              </style>
             </value>
             <value id="3">
               <enum_code>3</enum_code>
-              <style>
-                <main_color>#2B6CB0</main_color>
-                <complementary_color>#FFFFFF</complementary_color>
-                <decoration_classes/>
-              </style>
             </value>
             <value id="4">
               <enum_code>4</enum_code>
-              <style>
-                <main_color>#2B6CB0</main_color>
-                <complementary_color>#FFFFFF</complementary_color>
-                <decoration_classes/>
-              </style>
             </value>
           </values>
           <sql>priority</sql>
@@ -1790,19 +1705,9 @@ public function PrefillSearchForm(&$aContextParam)
           <values>
             <value id="service_request">
               <enum_code>service_request</enum_code>
-              <style>
-                <main_color>#2B6CB0</main_color>
-                <complementary_color>#FFFFFF</complementary_color>
-                <decoration_classes/>
-              </style>
             </value>
             <value id="incident">
               <enum_code>incident</enum_code>
-              <style>
-                <main_color>#2B6CB0</main_color>
-                <complementary_color>#FFFFFF</complementary_color>
-                <decoration_classes/>
-              </style>
             </value>
           </values>
           <sql>request_type</sql>
@@ -1814,19 +1719,9 @@ public function PrefillSearchForm(&$aContextParam)
           <values>
             <value id="tto">
               <enum_code>tto</enum_code>
-              <style>
-                <main_color>#2B6CB0</main_color>
-                <complementary_color>#FFFFFF</complementary_color>
-                <decoration_classes/>
-              </style>
             </value>
             <value id="ttr">
               <enum_code>ttr</enum_code>
-              <style>
-                <main_color>#2B6CB0</main_color>
-                <complementary_color>#FFFFFF</complementary_color>
-                <decoration_classes/>
-              </style>
             </value>
           </values>
           <sql>metric</sql>
@@ -1843,19 +1738,9 @@ public function PrefillSearchForm(&$aContextParam)
           <values>
             <value id="hours">
               <enum_code>hours</enum_code>
-              <style>
-                <main_color>#2B6CB0</main_color>
-                <complementary_color>#FFFFFF</complementary_color>
-                <decoration_classes/>
-              </style>
             </value>
             <value id="minutes">
               <enum_code>minutes</enum_code>
-              <style>
-                <main_color>#2B6CB0</main_color>
-                <complementary_color>#FFFFFF</complementary_color>
-                <decoration_classes/>
-              </style>
             </value>
           </values>
           <sql>unit</sql>

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

@@ -131,19 +131,9 @@
 					<values>
 						<value id="dollars">
 							<enum_code>dollars</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="euros">
 							<enum_code>euros</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 					</values>
 					<sql>cost_currency</sql>
@@ -185,27 +175,12 @@
 					<values>
 						<value id="production">
 							<enum_code>production</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="implementation">
 							<enum_code>implementation</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="obsolete">
 							<enum_code>obsolete</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 					</values>
 					<sql>status</sql>
@@ -1063,27 +1038,12 @@ public function PrefillSearchForm(&$aContextParam)
 					<values>
 						<value id="production">
 							<enum_code>production</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="implementation">
 							<enum_code>implementation</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="obsolete">
 							<enum_code>obsolete</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 					</values>
 					<sql>status</sql>
@@ -1441,19 +1401,9 @@ public function PrefillSearchForm(&$aContextParam)
 					<values>
 						<value id="incident">
 							<enum_code>incident</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="service_request">
 							<enum_code>service_request</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 					</values>
 					<sql>request_type</sql>
@@ -1465,27 +1415,12 @@ public function PrefillSearchForm(&$aContextParam)
 					<values>
 						<value id="production">
 							<enum_code>production</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="implementation">
 							<enum_code>implementation</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="obsolete">
 							<enum_code>obsolete</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 					</values>
 					<sql>status</sql>
@@ -1744,35 +1679,15 @@ public function PrefillSearchForm(&$aContextParam)
 					<values>
 						<value id="1">
 							<enum_code>1</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="2">
 							<enum_code>2</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="3">
 							<enum_code>3</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="4">
 							<enum_code>4</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 					</values>
 					<sql>priority</sql>
@@ -1784,19 +1699,9 @@ public function PrefillSearchForm(&$aContextParam)
 					<values>
 						<value id="service_request">
 							<enum_code>service_request</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="incident">
 							<enum_code>incident</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 					</values>
 					<sql>request_type</sql>
@@ -1808,19 +1713,9 @@ public function PrefillSearchForm(&$aContextParam)
 					<values>
 						<value id="tto">
 							<enum_code>tto</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="ttr">
 							<enum_code>ttr</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 					</values>
 					<sql>metric</sql>
@@ -1837,19 +1732,9 @@ public function PrefillSearchForm(&$aContextParam)
 					<values>
 						<value id="hours">
 							<enum_code>hours</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="minutes">
 							<enum_code>minutes</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 					</values>
 					<sql>unit</sql>

datamodels/2.x/itop-structure/datamodel.itop-structure.xml

@@ -51,7 +51,7 @@
             <value id="active">
               <enum_code>active</enum_code>
               <style>
-                <main_color>#2B6CB0</main_color>
+                <main_color>#689F38</main_color>
                 <complementary_color>#FFFFFF</complementary_color>
                 <decoration_classes/>
               </style>
@@ -59,8 +59,8 @@
             <value id="inactive">
               <enum_code>inactive</enum_code>
               <style>
-                <main_color>#2B6CB0</main_color>
-                <complementary_color>#FFFFFF</complementary_color>
+                <main_color>#E1E7EC</main_color>
+                <complementary_color>#6E7A8A</complementary_color>
                 <decoration_classes/>
               </style>
             </value>
@@ -224,7 +224,7 @@
             <value id="active">
               <enum_code>active</enum_code>
               <style>
-                <main_color>#2B6CB0</main_color>
+                <main_color>#689F38</main_color>
                 <complementary_color>#FFFFFF</complementary_color>
                 <decoration_classes/>
               </style>
@@ -232,8 +232,8 @@
             <value id="inactive">
               <enum_code>inactive</enum_code>
               <style>
-                <main_color>#2B6CB0</main_color>
-                <complementary_color>#FFFFFF</complementary_color>
+                <main_color>#E1E7EC</main_color>
+                <complementary_color>#6E7A8A</complementary_color>
                 <decoration_classes/>
               </style>
             </value>
@@ -409,7 +409,7 @@
             <value id="active">
               <enum_code>active</enum_code>
               <style>
-                <main_color>#2B6CB0</main_color>
+                <main_color>#689F38</main_color>
                 <complementary_color>#FFFFFF</complementary_color>
                 <decoration_classes/>
               </style>
@@ -417,8 +417,8 @@
             <value id="inactive">
               <enum_code>inactive</enum_code>
               <style>
-                <main_color>#2B6CB0</main_color>
-                <complementary_color>#FFFFFF</complementary_color>
+                <main_color>#E1E7EC</main_color>
+                <complementary_color>#6E7A8A</complementary_color>
                 <decoration_classes/>
               </style>
             </value>
@@ -452,19 +452,9 @@
           <values>
             <value id="yes">
               <enum_code>yes</enum_code>
-              <style>
-                <main_color>#2B6CB0</main_color>
-                <complementary_color>#FFFFFF</complementary_color>
-                <decoration_classes/>
-              </style>
             </value>
             <value id="no">
               <enum_code>no</enum_code>
-              <style>
-                <main_color>#2B6CB0</main_color>
-                <complementary_color>#FFFFFF</complementary_color>
-                <decoration_classes/>
-              </style>
             </value>
           </values>
           <sql>notify</sql>
@@ -1220,27 +1210,12 @@
           <values>
             <value id="draft">
               <enum_code>draft</enum_code>
-              <style>
-                <main_color>#2B6CB0</main_color>
-                <complementary_color>#FFFFFF</complementary_color>
-                <decoration_classes/>
-              </style>
             </value>
             <value id="published">
               <enum_code>published</enum_code>
-              <style>
-                <main_color>#2B6CB0</main_color>
-                <complementary_color>#FFFFFF</complementary_color>
-                <decoration_classes/>
-              </style>
             </value>
             <value id="obsolete">
               <enum_code>obsolete</enum_code>
-              <style>
-                <main_color>#2B6CB0</main_color>
-                <complementary_color>#FFFFFF</complementary_color>
-                <decoration_classes/>
-              </style>
             </value>
           </values>
           <sql>status</sql>

datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml

@@ -55,29 +55,29 @@
 					<values>
 						<value id="ongoing">
 							<enum_code>ongoing</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="resolved">
 							<enum_code>resolved</enum_code>
 							<style>
-								<main_color>#2B6CB0</main_color>
+								<main_color>#689F38</main_color>
 								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
+								<decoration_classes>fas fa-check</decoration_classes>
 							</style>
 						</value>
 						<value id="closed">
 							<enum_code>closed</enum_code>
 							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
+								<main_color>#E1E7EC</main_color>
+								<complementary_color>#6E7A8A</complementary_color>
 								<decoration_classes/>
 							</style>
 						</value>
 					</values>
+					<default_style>
+						<main_color>#2B6CB0</main_color>
+						<complementary_color>#FFFFFF</complementary_color>
+						<decoration_classes/>
+					</default_style>
 					<sql>operational_status</sql>
 					<default_value>ongoing</default_value>
 					<mappings>
@@ -431,27 +431,12 @@
 					<values>
 						<value id="manual">
 							<enum_code>manual</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="computed">
 							<enum_code>computed</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="do_not_notify">
 							<enum_code>do_not_notify</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 					</values>
 					<sql>impact_code</sql>
@@ -538,19 +523,9 @@
 					<values>
 						<value id="open">
 							<enum_code>open</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 						<value id="closed">
 							<enum_code>closed</enum_code>
-							<style>
-								<main_color>#2B6CB0</main_color>
-								<complementary_color>#FFFFFF</complementary_color>
-								<decoration_classes/>
-							</style>
 						</value>
 					</values>
 					<sql>status</sql>

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

@@ -36,35 +36,15 @@
           <values>
             <value id="production">
               <enum_code>production</enum_code>
-              <style>
-                <main_color>#2B6CB0</main_color>
-                <complementary_color>#FFFFFF</complementary_color>
-                <decoration_classes/>
-              </style>
             </value>
             <value id="implementation">
               <enum_code>implementation</enum_code>
-              <style>
-                <main_color>#2B6CB0</main_color>
-                <complementary_color>#FFFFFF</complementary_color>
-                <decoration_classes/>
-              </style>
             </value>
             <value id="stock">
               <enum_code>stock</enum_code>
-              <style>
-                <main_color>#2B6CB0</main_color>
-                <complementary_color>#FFFFFF</complementary_color>
-                <decoration_classes/>
-              </style>
             </value>
             <value id="obsolete">
               <enum_code>obsolete</enum_code>
-              <style>
-                <main_color>#2B6CB0</main_color>
-                <complementary_color>#FFFFFF</complementary_color>
-                <decoration_classes/>
-              </style>
             </value>
           </values>
           <sql>status</sql>

setup/compiler.class.inc.php

@@ -312,6 +312,10 @@ class MFCompiler
 				}
 			}
 
+
+			/** array of strings containing dynamic CSS class definitions */
+			$aClassesCss = [];
+
 			$oClasses = $this->oFactory->ListClasses($sModuleName);
 			$iClassCount = $oClasses->length;
 			if ($iClassCount == 0)
@@ -327,7 +331,7 @@ class MFCompiler
 					$aAllClasses[] = $sClass;
 					try
 					{
-						$sCompiledCode .= $this->CompileClass($oClass, $sTempTargetDir, $sFinalTargetDir, $sRelativeDir);
+						$sCompiledCode .= $this->CompileClass($oClass, $sTempTargetDir, $sFinalTargetDir, $sRelativeDir, $aClassesCss);
 					}
 					catch (DOMFormatException $e)
 					{
@@ -982,15 +986,17 @@ EOF
 	 * @param string $sTempTargetDir
 	 * @param string $sFinalTargetDir
 	 * @param string $sModuleRelativeDir
+	 * @param array $aClassesCss Contains dynamic CSS class definitions
 	 *
 	 * @return string
 	 * @throws \DOMFormatException
 	 */
-	protected function CompileClass($oClass, $sTempTargetDir, $sFinalTargetDir, $sModuleRelativeDir)
+	protected function CompileClass($oClass, $sTempTargetDir, $sFinalTargetDir, $sModuleRelativeDir, &$aClassesCss)
 	{
 		$sClass = $oClass->getAttribute('id');
 		$oProperties = $oClass->GetUniqueElement('properties');
 		$sPHP = '';
+		$sCss = ''; // Contains dynamic CSS class definitions
 	
 		// Class caracteristics
 		//
@@ -1353,15 +1359,47 @@ EOF
 						$oStyleNode = $oValue->GetOptionalElement('style');
 						if ($oStyleNode) {
 							$sMainColor = $this->GetMandatoryPropString($oStyleNode, 'main_color');
+							$sSafeCode = utils::GetSafeId($sCode);
+							$sEnumClass = "ibo-enum--$sClass-$sAttCode-$sSafeCode";
+							$sEnumClassAlt = "ibo-enum-alt--$sClass-$sAttCode-$sSafeCode";
 							$sComplementaryColor = $this->GetMandatoryPropString($oStyleNode, 'complementary_color');
 							$sDecorationClasses = $this->GetPropString($oStyleNode, 'decoration_classes', '');
-							$aStyledValues[] = "'$sCode' => new ormStyle($sMainColor, $sComplementaryColor, $sDecorationClasses)";
+							$aStyledValues[] = "'$sCode' => new ormStyle('$sEnumClass', '$sEnumClassAlt', $sMainColor, $sComplementaryColor, $sDecorationClasses)";
+							$sCss .= <<<CSS
+.$sEnumClass {
+	color: $sComplementaryColor;
+	background-color: $sMainColor;
+}
+.$sEnumClassAlt {
+	color: $sMainColor;
+}
+
+CSS;
 						}
 					}
 					$sValues = '"'.implode(',', $aValues).'"';
 					$aParameters['allowed_values'] = "new ValueSetEnum($sValues)";
 					$sStyledValues = "[".implode(',', $aStyledValues)."]";
 					$aParameters['styled_values'] = "$sStyledValues";
+					$oStyleNode = $oField->GetOptionalElement('default_style');
+					if ($oStyleNode) {
+						$sMainColor = $this->GetMandatoryPropString($oStyleNode, 'main_color');
+						$sEnumClass = "ibo-enum--$sClass-$sAttCode";
+						$sEnumClassAlt = "ibo-enum-alt--$sClass-$sAttCode";
+						$sComplementaryColor = $this->GetMandatoryPropString($oStyleNode, 'complementary_color');
+						$sDecorationClasses = $this->GetPropString($oStyleNode, 'decoration_classes', '');
+						$aParameters['default_style'] = "new ormStyle('$sEnumClass', '$sEnumClassAlt', $sMainColor, $sComplementaryColor, $sDecorationClasses)";
+						$sCss .= <<<CSS
+.$sEnumClass {
+	color: $sComplementaryColor;
+	background-color: $sMainColor;
+}
+.$sEnumClassAlt {
+	color: $sMainColor;
+}
+
+CSS;
+					}
 					$aParameters['display_style'] = $this->GetPropString($oField, 'display_style', 'list');
 					$aParameters['sql'] = $this->GetMandatoryPropString($oField, 'sql');
 					$aParameters['default_value'] = $this->GetPropString($oField, 'default_value', '');
@@ -1382,15 +1420,47 @@ EOF
 						$oStyleNode = $oValue->GetOptionalElement('style');
 						if ($oStyleNode) {
 							$sMainColor = $this->GetMandatoryPropString($oStyleNode, 'main_color');
+							$sSafeCode = utils::GetSafeId($sCode);
+							$sEnumClass = "ibo-enum--$sClass-$sAttCode-$sSafeCode";
+							$sEnumClassAlt = "ibo-enum-alt--$sClass-$sAttCode-$sSafeCode";
 							$sComplementaryColor = $this->GetMandatoryPropString($oStyleNode, 'complementary_color');
 							$sDecorationClasses = $this->GetPropString($oStyleNode, 'decoration_classes', '');
-							$aStyledValues[] = "'$sCode' => new ormStyle($sMainColor, $sComplementaryColor, $sDecorationClasses)";
+							$aStyledValues[] = "'$sCode' => new ormStyle('$sEnumClass', '$sEnumClassAlt', $sMainColor, $sComplementaryColor, $sDecorationClasses)";
+							$sCss .= <<<CSS
+.$sEnumClass {
+	color: $sComplementaryColor;
+	background-color: $sMainColor;
+}
+.$sEnumClassAlt {
+	color: $sMainColor;
+}
+
+CSS;
 						}
 					}
 					//	new style... $sValues = 'array('.implode(', ', $aValues).')';
 					$sValues = '"'.implode(',', $aValues).'"';
 					$sStyledValues = "[".implode(',', $aStyledValues)."]";
 					$aParameters['styled_values'] = "$sStyledValues";
+					$oStyleNode = $oField->GetOptionalElement('default_style');
+					if ($oStyleNode) {
+						$sMainColor = $this->GetMandatoryPropString($oStyleNode, 'main_color');
+						$sEnumClass = "ibo-enum--$sClass-$sAttCode";
+						$sEnumClassAlt = "ibo-enum-alt--$sClass-$sAttCode";
+						$sComplementaryColor = $this->GetMandatoryPropString($oStyleNode, 'complementary_color');
+						$sDecorationClasses = $this->GetPropString($oStyleNode, 'decoration_classes', '');
+						$aParameters['default_style'] = "new ormStyle('$sEnumClass', '$sEnumClassAlt', $sMainColor, $sComplementaryColor, $sDecorationClasses)";
+						$sCss .= <<<CSS
+.$sEnumClass {
+	color: $sComplementaryColor;
+	background-color: $sMainColor;
+}
+.$sEnumClassAlt {
+	color: $sMainColor;
+}
+
+CSS;
+					}
 					$aParameters['allowed_values'] = "new ValueSetEnum($sValues)";
 					$aParameters['sql'] = $this->GetMandatoryPropString($oField, 'sql');
 					$aParameters['default_value'] = $this->GetPropString($oField, 'default_value', '');
@@ -2104,6 +2174,8 @@ EOF
 			}
 		}
 
+		$aClassesCss[] = $sCss;
+
 		return $sPHP;
 	}
 
@@ -2801,6 +2873,7 @@ EOF;
 				copy($sPrecompiledFile, $sThemeDir.'/main.css');
 				// Make sure that the copy of the precompiled file is older than any other files to force a validation of the signature
 				touch($sThemeDir.'/main.css', 1577836800 /* 2020-01-01 00:00:00 */);
+
 			}
 			else if ($sPrecompiledFile != '')
 			{

setup/itopdesignformat.class.inc.php

@@ -800,24 +800,20 @@ class iTopDesignFormat
 
 		// New Enum values format
 		$oNodeList = $oXPath->query("/itop_design/classes//class/fields/field[@xsi:type='AttributeEnum']/values/value");
-		foreach ($oNodeList as $oNode)
-		{
+		foreach ($oNodeList as $oNode) {
 			$oNode->textContent = '';
 
 			$oCodeNode = $oNode->ownerDocument->createElement("enum_code", $oNode->textContent);
 			$oNode->appendChild($oCodeNode);
+		}
 
-			$oStyleNode = $oNode->ownerDocument->createElement("style");
-			$oNode->appendChild($oStyleNode);
+		// MetaEnum
+		$oNodeList = $oXPath->query("/itop_design/classes//class/fields/field[@xsi:type='AttributeMetaEnum']/values/value");
+		foreach ($oNodeList as $oNode) {
+			$oNode->textContent = '';
 
-			$oMainColorNode = $oNode->ownerDocument->createElement("main_color", "#2B6CB0");
-			$oStyleNode->appendChild($oMainColorNode);
-
-			$oComplementaryColorNode = $oNode->ownerDocument->createElement("complementary_color", "#FFFFFF");
-			$oStyleNode->appendChild($oComplementaryColorNode);
-
-			$oDecorationClassesNode = $oNode->ownerDocument->createElement("decoration_classes");
-			$oStyleNode->appendChild($oDecorationClassesNode);
+			$oCodeNode = $oNode->ownerDocument->createElement("enum_code", $oNode->textContent);
+			$oNode->appendChild($oCodeNode);
 		}
 	}
 
@@ -865,8 +861,7 @@ class iTopDesignFormat
 
 		// New Enum values format
 		$oNodeList = $oXPath->query("/itop_design/classes//class/fields/field[@xsi:type='AttributeEnum']/values/value");
-		foreach ($oNodeList as $oNode)
-		{
+		foreach ($oNodeList as $oNode) {
 			$oCodeNode = $oXPath->query('enum_code', $oNode)->item(0);
 			$oNode->textContent = $oCodeNode->textContent;
 			$this->DeleteNode($oCodeNode);
@@ -874,6 +869,21 @@ class iTopDesignFormat
 			$this->DeleteNode($oStyleNode);
 		}
 
+		$sPath = "/itop_design/classes//class/fields/field[@xsi:type='AttributeEnum']/default_style";
+		$this->RemoveNodeFromXPath($sPath);
+
+		// MetaEnum
+		$oNodeList = $oXPath->query("/itop_design/classes//class/fields/field[@xsi:type='AttributeMetaEnum']/values/value");
+		foreach ($oNodeList as $oNode) {
+			$oCodeNode = $oXPath->query('enum_code', $oNode)->item(0);
+			$oNode->textContent = $oCodeNode->textContent;
+			$this->DeleteNode($oCodeNode);
+			$oStyleNode = $oXPath->query('style', $oNode)->item(0);
+			$this->DeleteNode($oStyleNode);
+		}
+
+		$sPath = "/itop_design/classes//class/fields/field[@xsi:type='AttributeMetaEnum']/default_style";
+		$this->RemoveNodeFromXPath($sPath);
 	}
 
 	/**

sources/application/UI/Base/Component/FieldBadge/FieldBadge.php

@@ -21,6 +21,6 @@ class FieldBadge extends UIContentBlock
 
 	public function __construct(string $sName = null, string $sContainerClass = '')
 	{
-		parent::__construct($sName, $sContainerClass.' ibo-field-badge');
+		parent::__construct($sName, $sContainerClass);
 	}
 }

sources/application/UI/Base/Component/FieldBadge/FieldBadgeFactory.php

@@ -14,31 +14,38 @@ class FieldBadgeFactory
 {
 	/**
 	 * @param string $sValue
-	 * @param \ormStyle $oStyle
+	 * @param \ormStyle|null $oStyle
 	 *
 	 * @return \Combodo\iTop\Application\UI\Base\Component\FieldBadge\FieldBadge
 	 */
-	public static function MakeForField(string $sValue, ormStyle $oStyle)
+	public static function MakeForField(string $sValue, ?ormStyle $oStyle)
 	{
-		$sPrimaryColor = $oStyle->GetMainColor();
-		$oBadge = new FieldBadge();
-		$sId = $oBadge->GetId();
-		$sComplementaryColor = $oStyle->GetComplementaryColor();
-		$sDecorationClasses = $oStyle->GetDecorationClasses();
-		if ($sDecorationClasses != '') {
-			$oBadge->AddHtml("<i class=\"$sDecorationClasses\"></i>&nbsp;");
-		}
-		$oBadge->AddHtml("<span>$sValue</span>");
-		// Add custom style
-		$oBadge->AddHtml(<<<HTML
+		if ($oStyle) {
+			$sStyleClass = $oStyle->GetStyleClass();
+			$sPrimaryColor = $oStyle->GetMainColor();
+			$oBadge = new FieldBadge(null, $sStyleClass.' ibo-field-badge');
+			$sComplementaryColor = $oStyle->GetComplementaryColor();
+			$sDecorationClasses = $oStyle->GetDecorationClasses();
+			if ($sDecorationClasses != '') {
+				$oBadge->AddHtml("<i class=\"$sDecorationClasses\"></i>&nbsp;");
+			}
+			$oBadge->AddHtml("<span>$sValue</span>");
+			// Add custom style
+			// TODO 3.0 To be removed when compilation supports generated CSS
+			$oBadge->AddHtml(<<<HTML
 <style>
-	#$sId {
+.$sStyleClass {
 		color: $sComplementaryColor;
 		background-color: $sPrimaryColor;
 	}
 </style>
 HTML
-		);
+			);
+		} else {
+			$oBadge = new FieldBadge();
+			$oBadge->AddHtml("<span>$sValue</span>");
+		}
+
 		return $oBadge;
 	}
 }