diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index a3d6197410..b379b3de12 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,11 @@ +2011-04-13 Miguel de Dios <miguel.dedios@artica.es> + + * include/graphs/functions_pchart.php: added lost lines of source code to + set bottom margin. + + * godmode/reporting/visual_console_builder.editor.js: changed to use new + progress bar. + 2011-04-13 Miguel de Dios <miguel.dedios@artica.es> * include/functions_graph.php, include/graphs/functions_gd.php, diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js index 60d417595d..f3f6598bfc 100644 --- a/pandora_console/godmode/reporting/visual_console_builder.editor.js +++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js @@ -657,7 +657,7 @@ function getPercentileBar(id_data) { else var percentile = 100; - var img = 'include/fgraph.php?tipo=progress&height=15&width=' + width_percentile + '&mode=1&percent=' + percentile; + var img = 'include/graphs/fgraph.php?graph_type=progressbar&height=15&width=' + width_percentile + '&mode=1&progress=' + percentile; return img; } diff --git a/pandora_console/include/graphs/functions_pchart.php b/pandora_console/include/graphs/functions_pchart.php index 2e5e776260..317f941205 100755 --- a/pandora_console/include/graphs/functions_pchart.php +++ b/pandora_console/include/graphs/functions_pchart.php @@ -511,11 +511,13 @@ function pch_vertical_graph ($graph_type, $index, $data, $width, $height, $rgb_c if (isset($size['Height'])) { /* Define the chart area */ - $myPicture->setGraphArea(40,$size['Height'],$width,$height - 90); + //$myPicture->setGraphArea(40,$size['Height'],$width,$height - 90); + $myPicture->setGraphArea(40,$size['Height'],$width,$height - $margin_bottom); } else { /* Define the chart area */ - $myPicture->setGraphArea(40, 5,$width,$height - 90); + //$myPicture->setGraphArea(40, 5,$width,$height - 90); + $myPicture->setGraphArea(40, 5,$width,$height - $margin_bottom); } /* Draw the scale */