From eedc077eec3a809f52ebd1338737a34eb25db360 Mon Sep 17 00:00:00 2001
From: Molkobain <lajarige.guillaume@free.fr>
Date: Mon, 6 May 2019 17:06:10 +0200
Subject: [PATCH] :bug: Fix compatibility with some FontAwesome 4.x icons not
 displaying

---
 .../common/css/fontawesome5-pack.css                        | 4 ++++
 .../common/css/fontawesome5-pack.scss                       | 3 +++
 .../console/pageuiextension.class.inc.php                   | 1 +
 dist/molkobain-fontawesome5-pack/extension.xml              | 6 +++---
 .../module.molkobain-fontawesome5-pack.php                  | 2 +-
 .../portal/portaluiextension.class.inc.php                  | 1 +
 6 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 dist/molkobain-fontawesome5-pack/common/css/fontawesome5-pack.css
 create mode 100644 dist/molkobain-fontawesome5-pack/common/css/fontawesome5-pack.scss

diff --git a/dist/molkobain-fontawesome5-pack/common/css/fontawesome5-pack.css b/dist/molkobain-fontawesome5-pack/common/css/fontawesome5-pack.css
new file mode 100644
index 0000000..ee6abd2
--- /dev/null
+++ b/dist/molkobain-fontawesome5-pack/common/css/fontawesome5-pack.css
@@ -0,0 +1,4 @@
+.fa {
+  font-family: FontAwesome !important;
+  /* Compatibility fix for old FA4 icons cohabiting with FA5 icons */
+}
diff --git a/dist/molkobain-fontawesome5-pack/common/css/fontawesome5-pack.scss b/dist/molkobain-fontawesome5-pack/common/css/fontawesome5-pack.scss
new file mode 100644
index 0000000..8ac0c2b
--- /dev/null
+++ b/dist/molkobain-fontawesome5-pack/common/css/fontawesome5-pack.scss
@@ -0,0 +1,3 @@
+.fa{
+	font-family: FontAwesome !important; /* Compatibility fix for old FA4 icons cohabiting with FA5 icons */
+}
\ No newline at end of file
diff --git a/dist/molkobain-fontawesome5-pack/console/pageuiextension.class.inc.php b/dist/molkobain-fontawesome5-pack/console/pageuiextension.class.inc.php
index befea8f..1ec8194 100644
--- a/dist/molkobain-fontawesome5-pack/console/pageuiextension.class.inc.php
+++ b/dist/molkobain-fontawesome5-pack/console/pageuiextension.class.inc.php
@@ -27,6 +27,7 @@ public function GetNorthPaneHtml(iTopWebPage $oPage)
     {
         $sModuleVersion = utils::GetCompiledModuleVersion('molkobain-fontawesome5-pack');
         $oPage->add_linked_stylesheet(utils::GetAbsoluteUrlModulesRoot() . 'molkobain-fontawesome5-pack/fontawesome-free-5.7.2-web/css/all.min.css?v=' . $sModuleVersion);
+        $oPage->add_saas('env-'.utils::GetCurrentEnvironment().'/molkobain-fontawesome5-pack/common/css/fontawesome5-pack.scss');
     }
 
     /**
diff --git a/dist/molkobain-fontawesome5-pack/extension.xml b/dist/molkobain-fontawesome5-pack/extension.xml
index 12b902b..6c0302d 100644
--- a/dist/molkobain-fontawesome5-pack/extension.xml
+++ b/dist/molkobain-fontawesome5-pack/extension.xml
@@ -5,9 +5,9 @@
 	<author><![CDATA[Guillaume Lajarige]]></author>
 	<label><![CDATA[Font Awesome 5]]></label>
 	<description><![CDATA[Use new icon sets for both portal & console.]]></description>
-	<version>1.1.0</version>
-	<release_date>2019-03-09</release_date>
-	<version_description><![CDATA[Update FontAwesome to v5.7.2]]></version_description>
+	<version>1.1.1</version>
+	<release_date>2019-05-06</release_date>
+	<version_description><![CDATA[Fix compatiblity with some FontAwesome 4.x icons]]></version_description>
 	<itop_version_min>2.4.0</itop_version_min>
 	<status>stable</status>
 	<mandatory>false</mandatory>
diff --git a/dist/molkobain-fontawesome5-pack/module.molkobain-fontawesome5-pack.php b/dist/molkobain-fontawesome5-pack/module.molkobain-fontawesome5-pack.php
index d7364da..263e8c0 100644
--- a/dist/molkobain-fontawesome5-pack/module.molkobain-fontawesome5-pack.php
+++ b/dist/molkobain-fontawesome5-pack/module.molkobain-fontawesome5-pack.php
@@ -14,7 +14,7 @@
 /** @noinspection PhpUnhandledExceptionInspection */
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'molkobain-fontawesome5-pack/1.1.0',
+	'molkobain-fontawesome5-pack/1.1.1',
 	array(
 		// Identification
 		//
diff --git a/dist/molkobain-fontawesome5-pack/portal/portaluiextension.class.inc.php b/dist/molkobain-fontawesome5-pack/portal/portaluiextension.class.inc.php
index 2c84516..bab0040 100644
--- a/dist/molkobain-fontawesome5-pack/portal/portaluiextension.class.inc.php
+++ b/dist/molkobain-fontawesome5-pack/portal/portaluiextension.class.inc.php
@@ -31,6 +31,7 @@ public function GetCSSFiles(Application $oApp)
 			$aReturn = array();
 
 			$aReturn[] = utils::GetAbsoluteUrlModulesRoot() . 'molkobain-fontawesome5-pack/fontawesome-free-5.7.2-web/css/all.min.css?v=' . utils::GetCompiledModuleVersion('molkobain-fontawesome5-pack');
+			$aReturn[] = utils::GetAbsoluteUrlModulesRoot() . 'molkobain-fontawesome5-pack/common/css/fontawesome5-pack.css?v=' . utils::GetCompiledModuleVersion('molkobain-fontawesome5-pack');
 
 			return $aReturn;
 		}