From 41768e6a3aa204d5f65192c9f85a24927f27eb3d Mon Sep 17 00:00:00 2001
From: "tristan.champomier" <rooty@rooty.me>
Date: Mon, 7 Dec 2020 18:06:40 +0100
Subject: [PATCH] Half fixed issue #3. Working on full fixing it.

---
 lib/object_coordination/adminnode/adminnode.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/object_coordination/adminnode/adminnode.php b/lib/object_coordination/adminnode/adminnode.php
index cf9c5d6..f06e5e4 100755
--- a/lib/object_coordination/adminnode/adminnode.php
+++ b/lib/object_coordination/adminnode/adminnode.php
@@ -82,7 +82,7 @@ Class AdminNode extends CoordinationObj
         $arrayCallJs[] = "data/javascript/bootstrap-toggle/2.2.2/bootstrap-toggle.min.js";
         mxCallJs($arrayCallJs);
         
-        $arrayRawJs[] = "function imgPicto(){if(document.getElementById){if(document.getElementById(\"configNode\")){var obj=document.getElementById(\"template\");document.getElementById(\"pictoObject\").src=\"data/template/\"+obj.options[(obj.selectedIndex)].value+\"/media/picto/node/\"+document.getElementById(\"configNode\").iconeN.options[(document.getElementById(\"configNode\").iconeN.selectedIndex)].value;}}else if(document.all){if(document.all[\"configNode\"]){document.all[\"pictoObject\"].src=\"data/template/\"+obj.options[(obj.selectedIndex)].value+\"/media/picto/node/\"+document.all[\"configNode\"].iconeN.options[(document.all[\"configNode\"].iconeN.selectedIndex)].value;}}}function imgTemplate(){if(document.getElementById){if(document.getElementById(\"configNode\")){document.getElementById(\"screenTemplate\").src=\"data/template/\"+document.getElementById(\"template\").value+\"/preview.png\";}}else if(document.all){if(document.all[\"configNode\"]){var obj=document.getElementById(\"template\");document.all[\"configNode\"].screenTemplate.src=\"data/template/\"+obj.options[(obj.selectedIndex)].value+\"/preview.png\";}}}\$(document).ready(imgTemplate());";
+        $arrayRawJs[] = "function imgPicto(){if(document.getElementById){if(document.getElementById(\"configNode\")){var obj=document.getElementById(\"template\");document.getElementById(\"pictoObject\").src=\"data/image/icons/node/\"+document.getElementById(\"configNode\").iconeN.options[(document.getElementById(\"configNode\").iconeN.selectedIndex)].value;}}else if(document.all){if(document.all[\"configNode\"]){document.all[\"pictoObject\"].src=\"data/image/icons/node/\"+document.all[\"configNode\"].iconeN.options[(document.all[\"configNode\"].iconeN.selectedIndex)].value;}}}function imgTemplate(){if(document.getElementById){if(document.getElementById(\"configNode\")){document.getElementById(\"screenTemplate\").src=\"data/template/\"+document.getElementById(\"template\").value+\"/preview.png\";}}else if(document.all){if(document.all[\"configNode\"]){var obj=document.getElementById(\"template\");document.all[\"configNode\"].screenTemplate.src=\"data/template/\"+obj.options[(obj.selectedIndex)].value+\"/preview.png\";}}}\$(document).ready(imgTemplate());";
         mxRawJs($arrayRawJs);
 
         /* On inclus la template (voir package.template.php) */
@@ -122,7 +122,7 @@ Class AdminNode extends CoordinationObj
 
 		# Affichage de la liste déroulante
 		# Détermine le chemin des icônes
-		$chemintotal = $GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."media/picto/node/";
+		$chemintotal = $GLOBALS['CONF_DATA_PATH']."data/image/icons/node/";
 
 		# Lecture du dossier correspondant aux icônes
 		$handle  = @opendir($chemintotal);$i=0;
@@ -162,7 +162,7 @@ Class AdminNode extends CoordinationObj
 
 		$GLOBALS['SYSTEM_TEMPLATE']->MxSelect("template", "template_name", '', $tabTemplate, '', '', 'id="template"', "class=\"form\" title=\"".htmlspecialchars(getMessage("txtNodeTemplate"), ENT_QUOTES)."\"", getMessage("txtNodeTemplate"));
 		$GLOBALS["SYSTEM_TEMPLATE"]->MxImage("screenTemplate", $GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."preview.png", getMessage("PreviewTemplate"));
-		$GLOBALS["SYSTEM_TEMPLATE"]->MxImage("pictoObject", $GLOBALS['SYSTEM_TEMPLATE_PATH']."default/media/picto/node/defaultnode.gif", getMessage("PreviewPicto"));
+		$GLOBALS["SYSTEM_TEMPLATE"]->MxImage("pictoObject", $GLOBALS['CONF_DATA_PATH']."data/image/icons/node/defaultnode.gif", getMessage("PreviewPicto"));
 		$GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("ctype", "text", "node_ctype", "", "class=\"form\" title=\"".htmlspecialchars(getMessage("txtNodeType"), ENT_QUOTES)."\"", getMessage("txtNodeType"));
 		$GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("ctypereg", "text", "node_ctypereg", "", "class=\"form\" title=\"".htmlspecialchars(getMessage("txtNodeTypereg"), ENT_QUOTES)."\"", getMessage("txtNodeTypereg"));
 		$GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("domain", "text", "node_domain", "", "class=\"form\" title=\"".htmlspecialchars(getMessage("txtNodeDomain"), ENT_QUOTES)."\"", getMessage("txtNodeDomain"));