Half fixed issue #3. Working on full fixing it.

This commit is contained in:
Rooty 2020-12-07 18:06:40 +01:00
parent 1b065ab75d
commit 41768e6a3a

View File

@ -82,7 +82,7 @@ Class AdminNode extends CoordinationObj
$arrayCallJs[] = "data/javascript/bootstrap-toggle/2.2.2/bootstrap-toggle.min.js"; $arrayCallJs[] = "data/javascript/bootstrap-toggle/2.2.2/bootstrap-toggle.min.js";
mxCallJs($arrayCallJs); 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); mxRawJs($arrayRawJs);
/* On inclus la template (voir package.template.php) */ /* On inclus la template (voir package.template.php) */
@ -122,7 +122,7 @@ Class AdminNode extends CoordinationObj
# Affichage de la liste déroulante # Affichage de la liste déroulante
# Détermine le chemin des icônes # 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 # Lecture du dossier correspondant aux icônes
$handle = @opendir($chemintotal);$i=0; $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']->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("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("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("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")); $GLOBALS["SYSTEM_TEMPLATE"]->MxFormField("domain", "text", "node_domain", "", "class=\"form\" title=\"".htmlspecialchars(getMessage("txtNodeDomain"), ENT_QUOTES)."\"", getMessage("txtNodeDomain"));