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

Now some graphs has auto margin (left and right) to center it to its container

This commit is contained in:
Alejandro Gallardo Escobar 2016-05-26 09:50:13 +02:00
parent e79458bbcf
commit 97615ce9fd
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -102,6 +102,8 @@ function pandoraFlotPie(graph_id, values, labels, nseries, width, font_size, wat
$('#' + graph_id).bind('plothover', pieHover);
$('#' + graph_id).bind('plotclick', pieClick);
$('#' + graph_id).bind('mouseout',resetInteractivity);
$('#' + graph_id).css('margin-left', 'auto');
$('#' + graph_id).css('margin-right', 'auto');
function pieHover(event, pos, obj)
{
@ -224,6 +226,8 @@ function pandoraFlotPieCustom(graph_id, values, labels, width,
$('#' + graph_id).bind('plothover', pieHover);
$('#' + graph_id).bind('plotclick', Clickpie);
$('#' + graph_id).bind('mouseout',resetInteractivity);
$('#' + graph_id).css('margin-left', 'auto');
$('#' + graph_id).css('margin-right', 'auto');
function pieHover(event, pos, obj)
{
@ -347,7 +351,8 @@ function pandoraFlotHBars(graph_id, values, labels, water_mark,
var plot = $.plot($('#' + graph_id), datas, options );
$('#' + graph_id).HUseTooltip();
$('#' + graph_id).css("margin-left","35px");
$('#' + graph_id).css("margin-left","auto");
$('#' + graph_id).css("margin-right","auto");
// Adjust the top of yaxis tick to set it in the middle of the bars
//yAxisHeight = $('#' + graph_id + ' .yAxis .tickLabel')
//.css('height').split('px')[0];
@ -620,8 +625,8 @@ function pandoraFlotVBars(graph_id, values, labels, labels_long, legend, colors,
var plot = $.plot($('#'+graph_id),datas, options );
$('#' + graph_id).VUseTooltip();
$('#' + graph_id).css("margin-left","25px");
$('#' + graph_id).css("margin-right","20px");
$('#' + graph_id).css("margin-left","auto");
$('#' + graph_id).css("margin-right","auto");
// Adjust the top of yaxis tick to set it in the middle of the bars
//yAxisHeight = $('#'+graph_id+' .yAxis .tickLabel').css('height').split('px')[0];

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

@ -152,7 +152,7 @@ function d3_bullet_chart($chart_data, $width, $height, $color, $legend,
$id_bullet = uniqid();
$output .=
'<div id="bullet_graph_' . $id_bullet . '" class="bullet" style="overflow: hidden; width: '.$width.'px"></div>
'<div id="bullet_graph_' . $id_bullet . '" class="bullet" style="overflow: hidden; width: '.$width.'px; margin-left: auto; margin-right: auto;"></div>
<style>
.bullet_graph {