From b1dbddffb979890a4f67acd9d40f3d774333d962 Mon Sep 17 00:00:00 2001
From: Pierre Goiffon <pierre.goiffon@combodo.com>
Date: Thu, 17 Oct 2019 17:55:03 +0200
Subject: [PATCH] =?UTF-8?q?N=C2=B02518=20Integrating=20ACE=20in=20iTop?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 datamodels/2.x/itop-config/config.php                     | 8 ++++----
 {datamodels/2.x/itop-config/js => js/ace}/ace.js          | 0
 .../2.x/itop-config/js => js/ace}/ext-searchbox.js        | 0
 {datamodels/2.x/itop-config/js => js/ace}/mode-php.js     | 0
 .../2.x/itop-config/js => js/ace}/theme-eclipse.js        | 0
 {datamodels/2.x/itop-config/js => js/ace}/worker-php.js   | 0
 6 files changed, 4 insertions(+), 4 deletions(-)
 rename {datamodels/2.x/itop-config/js => js/ace}/ace.js (100%)
 rename {datamodels/2.x/itop-config/js => js/ace}/ext-searchbox.js (100%)
 rename {datamodels/2.x/itop-config/js => js/ace}/mode-php.js (100%)
 rename {datamodels/2.x/itop-config/js => js/ace}/theme-eclipse.js (100%)
 rename {datamodels/2.x/itop-config/js => js/ace}/worker-php.js (100%)

diff --git a/datamodels/2.x/itop-config/config.php b/datamodels/2.x/itop-config/config.php
index 124f43089..92cd2889f 100644
--- a/datamodels/2.x/itop-config/config.php
+++ b/datamodels/2.x/itop-config/config.php
@@ -101,10 +101,10 @@ ApplicationMenu::CheckMenuIdEnabled('ConfigEditor');
 
 $oP = new iTopWebPage(Dict::S('config-edit-title'));
 $oP->set_base(utils::GetAbsoluteUrlAppRoot().'pages/');
-$oP->add_linked_script(utils::GetCurrentModuleUrl().'/js/ace.js');
-$oP->add_linked_script(utils::GetCurrentModuleUrl().'/js/mode-php.js');
-$oP->add_linked_script(utils::GetCurrentModuleUrl().'/js/theme-eclipse.js');
-$oP->add_linked_script(utils::GetCurrentModuleUrl().'/js/ext-searchbox.js');
+$oP->add_linked_script(utils::GetAbsoluteUrlAppRoot().'/js/ace/ace.js');
+$oP->add_linked_script(utils::GetAbsoluteUrlAppRoot().'/js/ace/mode-php.js');
+$oP->add_linked_script(utils::GetAbsoluteUrlAppRoot().'/js/ace/theme-eclipse.js');
+$oP->add_linked_script(utils::GetAbsoluteUrlAppRoot().'/js/ace/ext-searchbox.js');
 
 try
 {
diff --git a/datamodels/2.x/itop-config/js/ace.js b/js/ace/ace.js
similarity index 100%
rename from datamodels/2.x/itop-config/js/ace.js
rename to js/ace/ace.js
diff --git a/datamodels/2.x/itop-config/js/ext-searchbox.js b/js/ace/ext-searchbox.js
similarity index 100%
rename from datamodels/2.x/itop-config/js/ext-searchbox.js
rename to js/ace/ext-searchbox.js
diff --git a/datamodels/2.x/itop-config/js/mode-php.js b/js/ace/mode-php.js
similarity index 100%
rename from datamodels/2.x/itop-config/js/mode-php.js
rename to js/ace/mode-php.js
diff --git a/datamodels/2.x/itop-config/js/theme-eclipse.js b/js/ace/theme-eclipse.js
similarity index 100%
rename from datamodels/2.x/itop-config/js/theme-eclipse.js
rename to js/ace/theme-eclipse.js
diff --git a/datamodels/2.x/itop-config/js/worker-php.js b/js/ace/worker-php.js
similarity index 100%
rename from datamodels/2.x/itop-config/js/worker-php.js
rename to js/ace/worker-php.js