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

Fixed the icons of menu on combined charts. TICKET: #1869

Browse Source 
(cherry picked from commit 380cddc4d47a4bb8f9024c3fb66944ab9b5ce5db)
This commit is contained in:
mdtrooper 2015-03-02 13:12:50 +01:00
parent ea8662c7bc
commit 52e3926c71
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/include/functions_custom_graphs.php
View File

@ -206,7 +206,9 @@ function custom_graphs_print($id_graph, $height, $width, $period,
return; return;
} }
if (empty($homeurl)) {
$homeurl = ui_get_full_url(false, false, false, false);
}
$output = graphic_combined_module($modules, $output = graphic_combined_module($modules,
$weights, $weights,

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

@ -1053,7 +1053,7 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
$('#menu_cancelzoom_' + graph_id).click(function() { $('#menu_cancelzoom_' + graph_id).click(function() {
// cancel the zooming // cancel the zooming
plot = $.plot($('#'+graph_id), data_base, plot = $.plot($('#' + graph_id), data_base,
$.extend(true, {}, options, { $.extend(true, {}, options, {
xaxis: {max: max_x }, xaxis: {max: max_x },
legend: { show: false } legend: { show: false }
@ -1075,9 +1075,11 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
// Add bottom margin in the legend // Add bottom margin in the legend
// Estimated height of 24 (works fine with this data in all browsers) // Estimated height of 24 (works fine with this data in all browsers)
menu_height = 24; menu_height = 24;
var legend_margin_bottom = parseInt($('#legend_'+graph_id).css('margin-bottom').split('px')[0]); var legend_margin_bottom = parseInt(
$('#legend_'+graph_id).css('margin-bottom').split('px')[0]);
$('#legend_'+graph_id).css('margin-bottom', menu_height+legend_margin_bottom+'px'); $('#legend_'+graph_id).css('margin-bottom', menu_height+legend_margin_bottom+'px');
parent_height = parseInt($('#menu_'+graph_id).parent().css('height').split('px')[0]); parent_height = parseInt(
$('#menu_'+graph_id).parent().css('height').split('px')[0]);
adjust_menu(graph_id, plot, parent_height); adjust_menu(graph_id, plot, parent_height);
} }