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

Increase custom graph report items container because not fit labels, fix loading message (no hide) -

Browse Source
This commit is contained in:
enriquecd 2017-03-03 12:44:00 +01:00
parent a1667fd129
commit b4dd2e97b2
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/include/functions_reporting_html.php
View File

@ -2053,7 +2053,7 @@ function reporting_html_monitor_report($table, $item, $mini) {
function reporting_html_graph($table, $item) { function reporting_html_graph($table, $item) {
$table->colspan['chart']['cell'] = 3; $table->colspan['chart']['cell'] = 3;
$table->cellstyle['chart']['cell'] = 'text-align: center;'; $table->cellstyle['chart']['cell'] = 'text-align: center;';
$table->data['chart']['cell'] = $item['chart']; $table->data['chart']['cell'] = $item['chart'].'<br><br><br><br>';
} }
function reporting_html_prediction_date($table, $item, $mini) { function reporting_html_prediction_date($table, $item, $mini) {

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

@ -1723,7 +1723,7 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
if (currentRanges == null || (currentRanges.xaxis.from < j && j < currentRanges.xaxis.to)) { if (currentRanges == null || (currentRanges.xaxis.from < j && j < currentRanges.xaxis.to)) {
$('#timestamp_'+graph_id).show(); $('#timestamp_'+graph_id).show();
// If no legend, the timestamp labels are short and with value // If no legend, the timestamp labels are short and with value
if (legends.length == 0) { if (legend.length == 0) {
$('#timestamp_'+graph_id).text(labels[j] + ' (' + parseFloat(y).toFixed(2) + ')'); $('#timestamp_'+graph_id).text(labels[j] + ' (' + parseFloat(y).toFixed(2) + ')');
} }
else { else {
@ -1982,7 +1982,7 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
// Adjust the menu image on top of the plot // Adjust the menu image on top of the plot
// If there is no legend we increase top-padding to make space to the menu // If there is no legend we increase top-padding to make space to the menu
if (legends.length == 0) { if (legend.length == 0) {
$('#menu_' + graph_id).parent().css('padding-top', $('#menu_' + graph_id).parent().css('padding-top',
$('#menu_' + graph_id).css('height')); $('#menu_' + graph_id).css('height'));
} }