tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 00:04:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
(cherry picked from commit 951856d837600c7a370e64d7f5fea51933afda27)
This commit is contained in:
m-lopez-f 2016-03-23 15:13:31 +01:00
parent 82174f0bae
commit d989ac8442
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); visual_map_print_user_lines($layoutData);
break; break;
default: default:
visual_map_print_item("write", $layoutData); visual_map_print_item("write", $layoutData,
null, true, false, false);
break; 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); $return .= html_print_input_hidden ('lineWidhtGraph', $config['custom_graph_width'],true);
$menu_width = 25 * $nbuttons + 15; $menu_width = 25 * $nbuttons + 15;
if ( $dashboard == false) { if ( $dashboard == false AND $vconsole == false) {
$return .= "<div id='menu_$graph_id' class='menu_graph' " . $return .= "<div id='menu_$graph_id' class='menu_graph' " .
"style='display: none; " . "style='display: none; " .
"text-align: center; " . "text-align: center; " .
@ -233,7 +233,8 @@ function flot_area_graph($chart_data, $width, $height, $color, $legend,
else { else {
$height = 1; $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 != '') { if ($water_mark != '') {
$return .= "<div id='watermark_$graph_id' style='display:none; position:absolute;'><img id='watermark_image_$graph_id' src='$water_mark'></div>"; $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']); $refr = (int) get_parameter ('refr', $config['vc_refr']);
$graph_javascript = (bool) get_parameter ('graph_javascript', false);
$vc_refr = false; $vc_refr = false;
if (isset($config['vc_refr']) and $config['vc_refr'] != 0) if (isset($config['vc_refr']) and $config['vc_refr'] != 0)
@ -153,7 +154,7 @@ else {
html_print_input_hidden('metaconsole', 1); 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);