From 5b3c442f2d0df0d90ace2de91e0ef78b2947be9b Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Wed, 12 Jun 2013 14:43:08 +0000 Subject: [PATCH] 2013-06-12 Miguel de Dios * operation/tree.php: improved the source code style. * include/functions_networkmap.php: remove the link in metaconsole node and set the color. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8303 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 7 +++++++ pandora_console/include/functions_networkmap.php | 6 ++++-- pandora_console/operation/tree.php | 1 + 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index e5f5287758..de218534d1 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,10 @@ +2013-06-12 Miguel de Dios + + * operation/tree.php: improved the source code style. + + * include/functions_networkmap.php: remove the link in metaconsole + node and set the color. + 2013-06-12 Mario Pulido * pandoradb.data.postgreSQL.sql, diff --git a/pandora_console/include/functions_networkmap.php b/pandora_console/include/functions_networkmap.php index b37cf205db..50903eff74 100644 --- a/pandora_console/include/functions_networkmap.php +++ b/pandora_console/include/functions_networkmap.php @@ -773,11 +773,13 @@ function networkmap_create_pandora_node ($name, $font_size = 10, $simple = 0, $s 'action=get_networkmap_summary&' . 'stats='.$stats_json . '&' . 'metaconsole=1'; - $url = 'index.php'; + $url = ''; + $color = "#052938"; } else { $url_tooltip = 'ajax.php?page=include/ajax/networkmap.ajax&action=get_networkmap_summary&stats='.$stats_json.'", URL="index.php?sec=estado&sec2=operation/agentes/group_view'; $url = 'index.php?sec=estado&sec2=operation/agentes/group_view'; + $color = "#373737"; } $img_tag = html_print_image($img_src, true, false, false, true); @@ -789,7 +791,7 @@ function networkmap_create_pandora_node ($name, $font_size = 10, $simple = 0, $s $label = ''; } - $node = '0 [ color="#364D1F", fontsize='.$font_size.', style="filled", fixedsize=true, width=0.8, height=0.6, label=<'.$label.'>, + $node = '0 [ color="' . $color . '", fontsize='.$font_size.', style="filled", fixedsize=true, width=0.8, height=0.6, label=<'.$label.'>, shape="ellipse", tooltip="' . $url_tooltip . '", URL="' . $url . '" ];'; return $node; diff --git a/pandora_console/operation/tree.php b/pandora_console/operation/tree.php index d98065586b..e1c09632c6 100644 --- a/pandora_console/operation/tree.php +++ b/pandora_console/operation/tree.php @@ -109,6 +109,7 @@ if (is_ajax ()) * 1 1 - hide 2 branch */ $lessBranchs = get_parameter('less_branchs'); + switch ($type) { case 'group': case 'os':