tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2013-06-12 Miguel de Dios <miguel.dedios@artica.es> 

* 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
This commit is contained in:
mdtrooper 2013-06-12 14:43:08 +00:00
parent 9be74b0865
commit 13c6d0e3e0
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2013-06-12 Miguel de Dios <miguel.dedios@artica.es>
* 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 <mario.pulido@artica.es> 2013-06-12 Mario Pulido <mario.pulido@artica.es>
* pandoradb.data.postgreSQL.sql, * pandoradb.data.postgreSQL.sql,

6
pandora_console/include/functions_networkmap.php
View File

@ -773,11 +773,13 @@ function networkmap_create_pandora_node ($name, $font_size = 10, $simple = 0, $s
'action=get_networkmap_summary&' . 'action=get_networkmap_summary&' .
'stats='.$stats_json . '&' . 'stats='.$stats_json . '&' .
'metaconsole=1'; 'metaconsole=1';
$url = 'index.php'; $url = '';
$color = "#052938";
} }
else { 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_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'; $url = 'index.php?sec=estado&sec2=operation/agentes/group_view';
$color = "#373737";
} }
$img_tag = html_print_image($img_src, true, false, false, true); $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 = ''; $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 . '" ];'; shape="ellipse", tooltip="' . $url_tooltip . '", URL="' . $url . '" ];';
return $node; return $node;

1
pandora_console/operation/tree.php
View File

@ -109,6 +109,7 @@ if (is_ajax ())
* 1 1 - hide 2 branch * 1 1 - hide 2 branch
*/ */
$lessBranchs = get_parameter('less_branchs'); $lessBranchs = get_parameter('less_branchs');
switch ($type) { switch ($type) {
case 'group': case 'group':
case 'os': case 'os':