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

Re-fixed problems with visual console. Tiquet: #3492

This commit is contained in:
m-lopez-f 2016-03-23 15:13:31 +01:00
parent bff7d3ef8f
commit 951856d837
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pandora_console/godmode/reporting/visual_console_builder.editor.php
View File

@ -107,7 +107,8 @@ foreach ($layoutDatas as $layoutData) {
visual_map_print_user_lines($layoutData);
break;
default:
visual_map_print_item("write", $layoutData);
visual_map_print_item("write", $layoutData,
null, true, false, false);
break;
}

5
pandora_console/include/graphs/functions_flot.php
View File

@ -202,7 +202,7 @@ function flot_area_graph($chart_data, $width, $height, $color, $legend,
}
$return .= html_print_input_hidden ('lineWidhtGraph', $config['custom_graph_width'],true);
$menu_width = 25 * $nbuttons + 15;
if ( $dashboard == false) {
if ( $dashboard == false AND $vconsole == false) {
$return .= "<div id='menu_$graph_id' class='menu_graph' " .
"style='display: none; " .
"text-align: center; " .
@ -233,7 +233,8 @@ function flot_area_graph($chart_data, $width, $height, $color, $legend,
else {
$height = 1;
}
$return .= "<div id='overview_$graph_id' class='overview_graph' style='visibility: hidden; margin-left:0px; margin-top:20px; width: ".$width."px; height: ".$height ."px;'></div>";
if ( $dashboard == false AND $vconsole == false )
$return .= "<div id='overview_$graph_id' class='overview_graph' style='visibility: hidden; margin-left:0px; margin-top:20px; width: ".$width."px; height: ".$height ."px;'></div>";
if ($water_mark != '') {
$return .= "<div id='watermark_$graph_id' style='display:none; position:absolute;'><img id='watermark_image_$graph_id' src='$water_mark'></div>";

3
pandora_console/operation/visual_console/render_view.php
View File

@ -42,6 +42,7 @@ else {
}
$refr = (int) get_parameter ('refr', $config['vc_refr']);
$graph_javascript = (bool) get_parameter ('graph_javascript', false);
$vc_refr = false;
if (isset($config['vc_refr']) and $config['vc_refr'] != 0)
@ -153,7 +154,7 @@ else {
html_print_input_hidden('metaconsole', 1);
}
visual_map_print_visual_map ($id_layout, true, true, null, null, '', false, true);
visual_map_print_visual_map ($id_layout, true, true, null, null, '', false, $graph_javascript);