From 2b955ddd5339008373e9a89db85a2279e751c7f4 Mon Sep 17 00:00:00 2001
From: Pierre Goiffon <pierre.goiffon@combodo.com>
Date: Fri, 19 Jul 2019 10:00:34 +0200
Subject: [PATCH] =?UTF-8?q?N=C2=B02269=20Font=20Awesome=20v5=20:=20move=20?=
 =?UTF-8?q?back=20lib=20from=20/lib=20to=20/css=20Thanks=20to=20the=20team?=
 =?UTF-8?q?,=20yeah=20you're=20right,=20this=20wasn't=20a=20good=20idea=20?=
 =?UTF-8?q?(did=20because=20there=20is=20a=20way=20to=20use=20Font=20Aweso?=
 =?UTF-8?q?me=20in=20JS,=20but=20we'll=20see=20if=20we=20do=20so=20in=20th?=
 =?UTF-8?q?e=20future,=20for=20now=20we=20don't=20:)=20)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/itopwebpage.class.inc.php               |   4 ++--
 {lib => css}/font-awesome/LICENSE.txt               |   0
 {lib => css}/font-awesome/css/all.min.css           |   0
 {lib => css}/font-awesome/css/v4-shims.min.css      |   0
 .../font-awesome/webfonts/fa-brands-400.eot         | Bin
 .../font-awesome/webfonts/fa-brands-400.svg         |   0
 .../font-awesome/webfonts/fa-brands-400.ttf         | Bin
 .../font-awesome/webfonts/fa-brands-400.woff        | Bin
 .../font-awesome/webfonts/fa-brands-400.woff2       | Bin
 .../font-awesome/webfonts/fa-regular-400.eot        | Bin
 .../font-awesome/webfonts/fa-regular-400.svg        |   0
 .../font-awesome/webfonts/fa-regular-400.ttf        | Bin
 .../font-awesome/webfonts/fa-regular-400.woff       | Bin
 .../font-awesome/webfonts/fa-regular-400.woff2      | Bin
 {lib => css}/font-awesome/webfonts/fa-solid-900.eot | Bin
 {lib => css}/font-awesome/webfonts/fa-solid-900.svg |   0
 {lib => css}/font-awesome/webfonts/fa-solid-900.ttf | Bin
 .../font-awesome/webfonts/fa-solid-900.woff         | Bin
 .../font-awesome/webfonts/fa-solid-900.woff2        | Bin
 datamodels/2.x/itop-hub-connector/land.php          |   4 ++--
 20 files changed, 4 insertions(+), 4 deletions(-)
 rename {lib => css}/font-awesome/LICENSE.txt (100%)
 rename {lib => css}/font-awesome/css/all.min.css (100%)
 rename {lib => css}/font-awesome/css/v4-shims.min.css (100%)
 rename {lib => css}/font-awesome/webfonts/fa-brands-400.eot (100%)
 rename {lib => css}/font-awesome/webfonts/fa-brands-400.svg (100%)
 rename {lib => css}/font-awesome/webfonts/fa-brands-400.ttf (100%)
 rename {lib => css}/font-awesome/webfonts/fa-brands-400.woff (100%)
 rename {lib => css}/font-awesome/webfonts/fa-brands-400.woff2 (100%)
 rename {lib => css}/font-awesome/webfonts/fa-regular-400.eot (100%)
 rename {lib => css}/font-awesome/webfonts/fa-regular-400.svg (100%)
 rename {lib => css}/font-awesome/webfonts/fa-regular-400.ttf (100%)
 rename {lib => css}/font-awesome/webfonts/fa-regular-400.woff (100%)
 rename {lib => css}/font-awesome/webfonts/fa-regular-400.woff2 (100%)
 rename {lib => css}/font-awesome/webfonts/fa-solid-900.eot (100%)
 rename {lib => css}/font-awesome/webfonts/fa-solid-900.svg (100%)
 rename {lib => css}/font-awesome/webfonts/fa-solid-900.ttf (100%)
 rename {lib => css}/font-awesome/webfonts/fa-solid-900.woff (100%)
 rename {lib => css}/font-awesome/webfonts/fa-solid-900.woff2 (100%)

diff --git a/application/itopwebpage.class.inc.php b/application/itopwebpage.class.inc.php
index 6f0324ccb..0828594b5 100644
--- a/application/itopwebpage.class.inc.php
+++ b/application/itopwebpage.class.inc.php
@@ -77,8 +77,8 @@ class iTopWebPage extends NiceWebPage implements iTabbedPage
 		$this->add_linked_stylesheet("../css/jquery.multiselect.css");
 		$this->add_linked_stylesheet("../css/magnific-popup.css");
 		$this->add_linked_stylesheet("../css/c3.min.css");
-		$this->add_linked_stylesheet("../lib/font-awesome/css/all.min.css");
-		$this->add_linked_stylesheet("../lib/font-awesome/css/v4-shims.min.css");
+		$this->add_linked_stylesheet("../css/font-awesome/css/all.min.css");
+		$this->add_linked_stylesheet("../css/font-awesome/css/v4-shims.min.css");
 
 		$this->add_linked_script('../js/jquery.layout.min.js');
 		$this->add_linked_script('../js/jquery.ba-bbq.min.js');
diff --git a/lib/font-awesome/LICENSE.txt b/css/font-awesome/LICENSE.txt
similarity index 100%
rename from lib/font-awesome/LICENSE.txt
rename to css/font-awesome/LICENSE.txt
diff --git a/lib/font-awesome/css/all.min.css b/css/font-awesome/css/all.min.css
similarity index 100%
rename from lib/font-awesome/css/all.min.css
rename to css/font-awesome/css/all.min.css
diff --git a/lib/font-awesome/css/v4-shims.min.css b/css/font-awesome/css/v4-shims.min.css
similarity index 100%
rename from lib/font-awesome/css/v4-shims.min.css
rename to css/font-awesome/css/v4-shims.min.css
diff --git a/lib/font-awesome/webfonts/fa-brands-400.eot b/css/font-awesome/webfonts/fa-brands-400.eot
similarity index 100%
rename from lib/font-awesome/webfonts/fa-brands-400.eot
rename to css/font-awesome/webfonts/fa-brands-400.eot
diff --git a/lib/font-awesome/webfonts/fa-brands-400.svg b/css/font-awesome/webfonts/fa-brands-400.svg
similarity index 100%
rename from lib/font-awesome/webfonts/fa-brands-400.svg
rename to css/font-awesome/webfonts/fa-brands-400.svg
diff --git a/lib/font-awesome/webfonts/fa-brands-400.ttf b/css/font-awesome/webfonts/fa-brands-400.ttf
similarity index 100%
rename from lib/font-awesome/webfonts/fa-brands-400.ttf
rename to css/font-awesome/webfonts/fa-brands-400.ttf
diff --git a/lib/font-awesome/webfonts/fa-brands-400.woff b/css/font-awesome/webfonts/fa-brands-400.woff
similarity index 100%
rename from lib/font-awesome/webfonts/fa-brands-400.woff
rename to css/font-awesome/webfonts/fa-brands-400.woff
diff --git a/lib/font-awesome/webfonts/fa-brands-400.woff2 b/css/font-awesome/webfonts/fa-brands-400.woff2
similarity index 100%
rename from lib/font-awesome/webfonts/fa-brands-400.woff2
rename to css/font-awesome/webfonts/fa-brands-400.woff2
diff --git a/lib/font-awesome/webfonts/fa-regular-400.eot b/css/font-awesome/webfonts/fa-regular-400.eot
similarity index 100%
rename from lib/font-awesome/webfonts/fa-regular-400.eot
rename to css/font-awesome/webfonts/fa-regular-400.eot
diff --git a/lib/font-awesome/webfonts/fa-regular-400.svg b/css/font-awesome/webfonts/fa-regular-400.svg
similarity index 100%
rename from lib/font-awesome/webfonts/fa-regular-400.svg
rename to css/font-awesome/webfonts/fa-regular-400.svg
diff --git a/lib/font-awesome/webfonts/fa-regular-400.ttf b/css/font-awesome/webfonts/fa-regular-400.ttf
similarity index 100%
rename from lib/font-awesome/webfonts/fa-regular-400.ttf
rename to css/font-awesome/webfonts/fa-regular-400.ttf
diff --git a/lib/font-awesome/webfonts/fa-regular-400.woff b/css/font-awesome/webfonts/fa-regular-400.woff
similarity index 100%
rename from lib/font-awesome/webfonts/fa-regular-400.woff
rename to css/font-awesome/webfonts/fa-regular-400.woff
diff --git a/lib/font-awesome/webfonts/fa-regular-400.woff2 b/css/font-awesome/webfonts/fa-regular-400.woff2
similarity index 100%
rename from lib/font-awesome/webfonts/fa-regular-400.woff2
rename to css/font-awesome/webfonts/fa-regular-400.woff2
diff --git a/lib/font-awesome/webfonts/fa-solid-900.eot b/css/font-awesome/webfonts/fa-solid-900.eot
similarity index 100%
rename from lib/font-awesome/webfonts/fa-solid-900.eot
rename to css/font-awesome/webfonts/fa-solid-900.eot
diff --git a/lib/font-awesome/webfonts/fa-solid-900.svg b/css/font-awesome/webfonts/fa-solid-900.svg
similarity index 100%
rename from lib/font-awesome/webfonts/fa-solid-900.svg
rename to css/font-awesome/webfonts/fa-solid-900.svg
diff --git a/lib/font-awesome/webfonts/fa-solid-900.ttf b/css/font-awesome/webfonts/fa-solid-900.ttf
similarity index 100%
rename from lib/font-awesome/webfonts/fa-solid-900.ttf
rename to css/font-awesome/webfonts/fa-solid-900.ttf
diff --git a/lib/font-awesome/webfonts/fa-solid-900.woff b/css/font-awesome/webfonts/fa-solid-900.woff
similarity index 100%
rename from lib/font-awesome/webfonts/fa-solid-900.woff
rename to css/font-awesome/webfonts/fa-solid-900.woff
diff --git a/lib/font-awesome/webfonts/fa-solid-900.woff2 b/css/font-awesome/webfonts/fa-solid-900.woff2
similarity index 100%
rename from lib/font-awesome/webfonts/fa-solid-900.woff2
rename to css/font-awesome/webfonts/fa-solid-900.woff2
diff --git a/datamodels/2.x/itop-hub-connector/land.php b/datamodels/2.x/itop-hub-connector/land.php
index e42346504..d4fdf9fbb 100644
--- a/datamodels/2.x/itop-hub-connector/land.php
+++ b/datamodels/2.x/itop-hub-connector/land.php
@@ -240,8 +240,8 @@ function DoInstall(WebPage $oPage)
     $oPage->add('</div>'); // module-selection-body
 
 
-	$oPage->add_linked_stylesheet('../lib/font-awesome/css/all.min.css');
-	$oPage->add_linked_stylesheet('../lib/font-awesome/css/v4-shims.min.css');
+	$oPage->add_linked_stylesheet('../css/font-awesome/css/all.min.css');
+	$oPage->add_linked_stylesheet('../css/font-awesome/css/v4-shims.min.css');
 
 
     $oPage->add('<div id="hub_installation_widget"></div>');