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

Merge branch '537-Removed-menu-options-in-dashboard-but-keep-cancel-zoom-dev' into 'develop' 

Works in good dashboards module graphs

See merge request !509
This commit is contained in:
vgilc 2017-05-25 10:54:58 +02:00
parent faa96927dd 09b90be1ca
commit d4c635d5f1
3 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/include/graphs/fgraph.php
View File

@ -249,7 +249,7 @@ function area_graph($flash_chart, $chart_data, $width, $height, $color,
return '<img src="' . $no_data_image . '" />';
}
if ($dashboard || $vconsole) $menu = false;
if ($vconsole) $menu = false;
if ($flash_chart) {
return flot_area_simple_graph(

2
pandora_console/include/graphs/flot/pandora.flot.js
View File

@ -1476,7 +1476,7 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
// Adjust linked graph to the width and position of the main plot
// Miniplot
if ( !dashboard && !vconsole) {
if (!vconsole) {
var overview = $.plot($('#overview_'+graph_id),datas, {
series: {
stack: stacked,

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

@ -270,7 +270,28 @@ function flot_area_graph($chart_data, $width, $height, $color, $legend,
$return .= "</div>";
$return .= "</div>";
}
if ($dashboard) {
$return .= "<div id='geneal_menu_$graph_id' class='menu_graph' style='
width: 30px;
height: 250px;
left: " . $width . "px;
position: absolute;
top: 0px;
background-color: white;'>";
$return .= "<div id='menu_$graph_id' " .
"style='display: none; " .
"text-align: center;" .
"position: relative;".
"border-bottom: 0px;'>
<a href='javascript:'><img id='menu_cancelzoom_$graph_id' src='".$homeurl."images/zoom_cross_grey.disabled.png' alt='".__('Cancel zoom')."' title='".__('Cancel zoom')."'></a>";
$return .= "</div>";
$return .= "</div>";
}
}
$return .= html_print_input_hidden('line_width_graph', $config['custom_graph_width'], true);
$return .= "<div id='timestamp_$graph_id' class='timestamp_graph' style='font-size:".$font_size."pt;display:none; position:absolute; background:#fff; border: solid 1px #aaa; padding: 2px; z-index:1000;'></div>";
$return .= "<div id='$graph_id' class='";
@ -282,7 +303,7 @@ function flot_area_graph($chart_data, $width, $height, $color, $legend,
else {
$height = 1;
}
if (!$dashboard && !$vconsole)
if (!$vconsole)
$return .= "<div id='overview_$graph_id' class='overview_graph' style='display: none; margin-left:0px; margin-top:20px; margin-bottom:50px; width: ".$width."px; height: ".$height ."px;'></div>";
if ($water_mark != '') {