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

Fixed problems with fonts in simples graphs. Ticket: #4115

Browse Source
This commit is contained in:
m-lopez-f 2016-11-21 13:27:34 +01:00
parent 5935a4c4b0
commit c5e0b84ad3
2 changed files with 33 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1536,7 +1536,8 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
axisLabel: xaxisname, axisLabel: xaxisname,
tickFormatter: xFormatter, tickFormatter: xFormatter,
minTickSize: steps, minTickSize: steps,
color: '#000' color: '#000',
font: font
} ], } ],
yaxes: [ { yaxes: [ {
tickFormatter: yFormatter, tickFormatter: yFormatter,
@ -1545,8 +1546,8 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
{ {
// align if we are to the right // align if we are to the right
alignTicksWithAxis: 1, alignTicksWithAxis: 1,
position: 'right' position: 'right',
font: font
//tickFormatter: dFormatter //tickFormatter: dFormatter
} ] } ]
, ,
@ -1873,7 +1874,7 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
} }
function lFormatter(v, item) { function lFormatter(v, item) {
return '<div class='+font+' style=color:#000;font-size:'+font_size+'pt>'+v+'</div>'; return '<div style=color:#000;font-size:'+font_size+'pt>'+v+'</div>';
// Prepared to turn series with a checkbox // Prepared to turn series with a checkbox
//return '<div style=color:#000;font-size:'+font_size+'pt><input type="checkbox" id="' + graph_id + '_' + item.id +'" checked="checked" class="check_serie_'+graph_id+'">'+v+'</div>'; //return '<div style=color:#000;font-size:'+font_size+'pt><input type="checkbox" id="' + graph_id + '_' + item.id +'" checked="checked" class="check_serie_'+graph_id+'">'+v+'</div>';
} }

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

@ -93,11 +93,12 @@ function include_javascript_dependencies_flot_graph($return = false) {
////////// AREA GRAPHS //////// ////////// AREA GRAPHS ////////
/////////////////////////////// ///////////////////////////////
function flot_area_stacked_graph($chart_data, $width, $height, $color, function flot_area_stacked_graph($chart_data, $width, $height, $color,
$legend, $long_index, $homeurl = '', $font = '', $font_size = 7,$unit = '', $water_mark = '', $legend, $long_index, $homeurl = '', $font = '', $font_size = 7,
$serie_types = array(), $chart_extra_data = array(), $unit = '', $water_mark = '', $serie_types = array(),
$yellow_threshold = 0, $red_threshold = 0, $adapt_key= '', $chart_extra_data = array(), $yellow_threshold = 0,
$force_integer = false, $series_suffix_str = '', $menu = true, $red_threshold = 0, $adapt_key= '', $force_integer = false,
$background_color = 'white', $dashboard = false, $vconsole = false, $agent_module_id = 0) { $series_suffix_str = '', $menu = true, $background_color = 'white',
$dashboard = false, $vconsole = false, $agent_module_id = 0) {
global $config; global $config;
@ -105,7 +106,8 @@ function flot_area_stacked_graph($chart_data, $width, $height, $color,
$legend, $long_index, $homeurl, $unit, 'area_stacked', $legend, $long_index, $homeurl, $unit, 'area_stacked',
$water_mark, $serie_types, $chart_extra_data, $yellow_threshold, $water_mark, $serie_types, $chart_extra_data, $yellow_threshold,
$red_threshold, $adapt_key, $force_integer, $series_suffix_str, $red_threshold, $adapt_key, $force_integer, $series_suffix_str,
$menu, $background_color, $dashboard, $vconsole, $agent_module_id, $font,$font_size); $menu, $background_color, $dashboard, $vconsole,
$agent_module_id, $font, $font_size);
} }
function flot_area_simple_graph($chart_data, $width, $height, $color, function flot_area_simple_graph($chart_data, $width, $height, $color,
@ -113,7 +115,8 @@ function flot_area_simple_graph($chart_data, $width, $height, $color,
$serie_types = array(), $chart_extra_data = array(), $serie_types = array(), $chart_extra_data = array(),
$yellow_threshold = 0, $red_threshold = 0, $adapt_key= '', $yellow_threshold = 0, $red_threshold = 0, $adapt_key= '',
$force_integer = false, $series_suffix_str = '', $menu = true, $force_integer = false, $series_suffix_str = '', $menu = true,
$background_color = 'white', $dashboard = false, $vconsole = false, $agent_module_id = 0, $font = '',$font_size = 7, $xaxisname = '') { $background_color = 'white', $dashboard = false, $vconsole = false,
$agent_module_id = 0, $font = '', $font_size = 7, $xaxisname = '') {
global $config; global $config;
@ -121,15 +124,17 @@ function flot_area_simple_graph($chart_data, $width, $height, $color,
$legend, $long_index, $homeurl, $unit, 'area_simple', $legend, $long_index, $homeurl, $unit, 'area_simple',
$water_mark, $serie_types, $chart_extra_data, $yellow_threshold, $water_mark, $serie_types, $chart_extra_data, $yellow_threshold,
$red_threshold, $adapt_key, $force_integer, $series_suffix_str, $red_threshold, $adapt_key, $force_integer, $series_suffix_str,
$menu, $background_color, $dashboard, $vconsole, $agent_module_id,$font,$font_size, $xaxisname); $menu, $background_color, $dashboard, $vconsole,
$agent_module_id, $font, $font_size, $xaxisname);
} }
function flot_line_stacked_graph($chart_data, $width, $height, $color, function flot_line_stacked_graph($chart_data, $width, $height, $color,
$legend, $long_index, $homeurl = '',$font = '', $font_size = 7, $unit = '', $water_mark = '', $legend, $long_index, $homeurl = '', $font = '', $font_size = 7,
$serie_types = array(), $chart_extra_data = array(), $unit = '', $water_mark = '', $serie_types = array(),
$yellow_threshold = 0, $red_threshold = 0, $adapt_key= '', $chart_extra_data = array(), $yellow_threshold = 0,
$force_integer = false, $series_suffix_str = '', $menu = true, $red_threshold = 0, $adapt_key= '', $force_integer = false,
$background_color = 'white', $dashboard = false, $vconsole = false, $agent_module_id = 0) { $series_suffix_str = '', $menu = true, $background_color = 'white',
$dashboard = false, $vconsole = false, $agent_module_id = 0) {
global $config; global $config;
@ -137,16 +142,18 @@ function flot_line_stacked_graph($chart_data, $width, $height, $color,
$legend, $long_index, $homeurl, $unit, 'line_stacked', $legend, $long_index, $homeurl, $unit, 'line_stacked',
$water_mark, $serie_types, $chart_extra_data, $yellow_threshold, $water_mark, $serie_types, $chart_extra_data, $yellow_threshold,
$red_threshold, $adapt_key, $force_integer, $series_suffix_str, $red_threshold, $adapt_key, $force_integer, $series_suffix_str,
$menu, $background_color, $dashboard, $vconsole, $agent_module_id, $font, $font_size); $menu, $background_color, $dashboard, $vconsole,
$agent_module_id, $font, $font_size);
} }
function flot_line_simple_graph($chart_data, $width, $height, $color, function flot_line_simple_graph($chart_data, $width, $height, $color,
$legend, $long_index, $homeurl = '', $font = '', $font_size = 7, $unit = '', $water_mark = '', $legend, $long_index, $homeurl = '', $font = '', $font_size = 7,
$serie_types = array(), $chart_extra_data = array(), $unit = '', $water_mark = '', $serie_types = array(),
$yellow_threshold = 0, $red_threshold = 0, $adapt_key= '', $chart_extra_data = array(), $yellow_threshold = 0,
$force_integer = false, $series_suffix_str = '', $menu = true, $red_threshold = 0, $adapt_key= '', $force_integer = false,
$background_color = 'white', $dashboard = false, $vconsole = false, $series_suffix_str = '', $menu = true, $background_color = 'white',
$agent_module_id = 0, $percentil_values = array()) { $dashboard = false, $vconsole = false, $agent_module_id = 0,
$percentil_values = array()) {
global $config; global $config;
@ -163,7 +170,7 @@ function flot_area_graph($chart_data, $width, $height, $color, $legend,
$chart_extra_data, $yellow_threshold, $red_threshold, $adapt_key, $chart_extra_data, $yellow_threshold, $red_threshold, $adapt_key,
$force_integer, $series_suffix_str = '', $menu = true, $force_integer, $series_suffix_str = '', $menu = true,
$background_color = 'white', $dashboard = false, $vconsole = false, $background_color = 'white', $dashboard = false, $vconsole = false,
$agent_module_id = 0,$font = '',$font_size = 7, $xaxisname = '', $agent_module_id = 0, $font = '', $font_size = 7, $xaxisname = '',
$percentil_values = array()) { $percentil_values = array()) {
global $config; global $config;