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(''); // 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('
');