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 font and font-family

Browse Source
This commit is contained in:
daniel 2018-06-14 10:02:26 +02:00
parent fc970b9b8e
commit 9d2f069d20
2 changed files with 70 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -861,12 +861,11 @@ function pandoraFlotArea( graph_id, values, legend,
series_type, color, water_mark, date_array, series_type, color, water_mark, date_array,
data_module_graph, params, events_array data_module_graph, params, events_array
) { ) {
//diferents vars //diferents vars
var unit = params.unit ? params.unit : ''; var unit = params.unit ? params.unit : '';
var homeurl = params.homeurl; var homeurl = params.homeurl;
var font_size = params.font_size; var font_size = parseInt(params.font_size);
var font = params.font; var font = params.font.split("/").pop().split(".").shift();
var width = params.width; var width = params.width;
var height = params.height; var height = params.height;
var vconsole = params.vconsole; var vconsole = params.vconsole;
@ -884,7 +883,7 @@ function pandoraFlotArea( graph_id, values, legend,
//XXXXXX colocar //XXXXXX colocar
var force_integer = 0; var force_integer = 0;
console.log(type);
if(typeof type === 'undefined' || type == ''){ if(typeof type === 'undefined' || type == ''){
type = params.type_graph; type = params.type_graph;
} }
@ -1475,7 +1474,7 @@ console.log(type);
} }
} }
} }
console.log(type);
switch (type) { switch (type) {
case 'line': case 'line':
case 2: case 2:
@ -1580,12 +1579,10 @@ console.log(type);
}); });
// The first execution, the graph data is the base data // The first execution, the graph data is the base data
datas = data_base; datas = data_base;
// minTickSize // minTickSize
var count_data = datas[0].data.length; var count_data = datas[0].data.length;
var min_tick = datas[0].data[0][0];
var max_tick = datas[0].data[count_data - 1][0];
var number_ticks = 8; var number_ticks = 8;
if(vconsole){ if(vconsole){
@ -1623,27 +1620,29 @@ console.log(type);
}, },
xaxis: { xaxis: {
min: min_x, min: min_x,
max: max_x max: max_x,
font: {
size: font_size + 2,
color: legend_color,
family: font+'Font'
}
}, },
xaxes: [{ xaxes: [{
axisLabelUseCanvas: true,
axisLabelFontSizePixels: font_size,
axisLabelFontFamily: font,
axisLabelPadding: 0,
mode: "time", mode: "time",
timezone: "browser", timezone: "browser",
localTimezone: true, localTimezone: true,
//tickFormatter: xFormatter,
tickSize: [maxticks, 'hour'] tickSize: [maxticks, 'hour']
}], }],
yaxis: {
font: {
size: font_size + 2,
color: legend_color,
family: font+'Font'
},
},
yaxes: [{ yaxes: [{
tickFormatter: yFormatter, tickFormatter: yFormatter,
color: '', position: 'left'
alignTicksWithAxis: 1,
labelWidth: 30,
position: 'left',
font: font,
reserveSpace: true
}], }],
legend: { legend: {
position: 'se', position: 'se',
@ -1725,27 +1724,29 @@ if (vconsole) {
}, },
xaxis: { xaxis: {
min: date_array.start_date * 1000, min: date_array.start_date * 1000,
max: date_array.final_date * 1000 max: date_array.final_date * 1000,
font: {
size: font_size + 2,
color: legend_color,
family: font+'Font'
}
}, },
xaxes: [{ xaxes: [{
axisLabelUseCanvas: true,
axisLabelFontSizePixels: font_size,
axisLabelFontFamily: font,
axisLabelPadding: 0,
mode: "time", mode: "time",
timezone: "browser", timezone: "browser",
localTimezone: true, localTimezone: true,
//tickFormatter: xFormatter,
tickSize: [maxticks, 'hour'] tickSize: [maxticks, 'hour']
}], }],
yaxis: {
font: {
size: font_size + 2,
color: legend_color,
family: font+'Font'
},
},
yaxes: [{ yaxes: [{
tickFormatter: yFormatter, tickFormatter: yFormatter,
color: '', position: 'left'
alignTicksWithAxis: 1,
labelWidth: 30,
position: 'left',
font: font,
reserveSpace: true
}], }],
legend: { legend: {
position: 'se', position: 'se',
@ -1798,31 +1799,31 @@ if (vconsole) {
}, },
xaxis: { xaxis: {
min: ranges.xaxis.from, min: ranges.xaxis.from,
max: ranges.xaxis.to max: ranges.xaxis.to,
font: {
size: font_size + 2,
color: legend_color,
family: font+'Font'
}
}, },
xaxes: [{ xaxes: [{
axisLabelUseCanvas: true,
axisLabelFontSizePixels: font_size,
axisLabelFontFamily: font,
axisLabelPadding: 0,
mode: "time", mode: "time",
timezone: "browser", timezone: "browser",
localTimezone: true, localTimezone: true,
//tickFormatter: xFormatter,
tickSize: [maxticks_zoom, 'hour'] tickSize: [maxticks_zoom, 'hour']
}], }],
yaxis:{ yaxis:{
min: ranges.yaxis.from, min: ranges.yaxis.from,
max: ranges.yaxis.to max: ranges.yaxis.to,
font: {
size: font_size + 2,
color: legend_color,
family: font+'Font'
},
}, },
yaxes: [{ yaxes: [{
tickFormatter: yFormatter, tickFormatter: yFormatter,
color: '', position: 'left'
alignTicksWithAxis: 1,
labelWidth: 30,
position: 'left',
font: font,
reserveSpace: true,
}], }],
legend: { legend: {
show: true show: true
@ -1839,31 +1840,31 @@ if (vconsole) {
}, },
xaxis: { xaxis: {
min: ranges.xaxis.from, min: ranges.xaxis.from,
max: ranges.xaxis.to max: ranges.xaxis.to,
font: {
size: font_size + 2,
color: legend_color,
family: font+'Font'
}
}, },
xaxes: [{ xaxes: [{
axisLabelUseCanvas: true,
axisLabelFontSizePixels: font_size,
axisLabelFontFamily: font,
axisLabelPadding: 0,
mode: "time", mode: "time",
timezone: "browser", timezone: "browser",
localTimezone: true, localTimezone: true,
//tickFormatter: xFormatter,
tickSize: [maxticks_zoom, 'hour'] tickSize: [maxticks_zoom, 'hour']
}], }],
yaxis:{ yaxis:{
min: ranges.yaxis.from, min: ranges.yaxis.from,
max: ranges.yaxis.to max: ranges.yaxis.to,
font: {
size: font_size + 2,
color: legend_color,
family: font+'Font'
},
}, },
yaxes: [{ yaxes: [{
tickFormatter: yFormatter, tickFormatter: yFormatter,
color: '', position: 'left'
alignTicksWithAxis: 1,
labelWidth: 30,
position: 'left',
font: font,
reserveSpace: true,
}], }],
legend: { legend: {
show: true show: true
@ -1928,6 +1929,11 @@ if (vconsole) {
$('#timestamp_'+graph_id).height() + $('#timestamp_'+graph_id).height() +
$('#legend_' + graph_id).height()); $('#legend_' + graph_id).height());
$('#timestamp_'+graph_id).css('color', legend_color);
$('#timestamp_'+graph_id).css('font-size', font_size + 2);
$('#timestamp_'+graph_id).css('font-family', font + 'Font');
$('#timestamp_'+graph_id).css('color', legend_color);
if (timesize+timenewpos > canvaslimit) { if (timesize+timenewpos > canvaslimit) {
$('#timestamp_'+graph_id).css('left', timenewpos - timesize); $('#timestamp_'+graph_id).css('left', timenewpos - timesize);
} }
@ -1988,14 +1994,7 @@ if (vconsole) {
); );
} }
$('#legend_' + graph_id + ' .legendLabel') $('#legend_' + graph_id + ' .legendLabel').eq(i).css('color', legend_color);
.eq(i).css('font-size',font_size+'pt');
$('#legend_' + graph_id + ' .legendLabel')
.eq(i).css('color', legend_color);
$('#legend_' + graph_id + ' .legendLabel')
.eq(i).css('font-family',font);
i++; i++;
} }
@ -2168,28 +2167,6 @@ if (vconsole) {
} }
} }
// Format functions
function xFormatter(v, axis) {
var d = new Date(v);
var result_date_format = 0;
var monthNames = [
"Jan", "Feb", "Mar",
"Apr", "May", "Jun",
"Jul", "Aug", "Sep",
"Oct", "Nov", "Dec"
];
result_date_format = (d.getDate() <10?'0':'') + d.getDate() + " " +
monthNames[d.getMonth()] + " " +
d.getFullYear() + "\n" +
(d.getHours()<10?'0':'') + d.getHours() + ":" +
(d.getMinutes()<10?'0':'') + d.getMinutes() + ":" +
(d.getSeconds()<10?'0':'') + d.getSeconds();
return '<div class='+font+' style="font-size:'+font_size+'pt; margin-top:15px;">'+result_date_format+'</div>';
}
function yFormatter(v, axis) { function yFormatter(v, axis) {
axis.datamin = 0; axis.datamin = 0;
if (short_data) { if (short_data) {
@ -2206,25 +2183,19 @@ if (vconsole) {
// Get only two decimals // Get only two decimals
formatted = round_with_decimals(formatted, 100); formatted = round_with_decimals(formatted, 100);
return '<div class='+font+' style="font-size:'+font_size+'pt;">'+formatted+'</div>'; return formatted;
} }
function lFormatter(v, item) { function lFormatter(v, item) {
return '<div style="font-size:'+font_size+'pt; color:'+legend_color+';">'+legend[v]+'</div>'; return '<span style="color:'+legend_color+'">'+legend[v]+'</span>';
} }
$('#overview_' + graph_id).css('display', 'none');
if (menu) { if (menu) {
var parent_height; var parent_height;
$('#menu_overview_' + graph_id).click(function() { $('#menu_overview_' + graph_id).click(function() {
$('#overview_' + graph_id).toggle(); $('#overview_' + graph_id).toggle();
/*
if($('#overview_' + graph_id).css('visibility') == 'visible'){
$('#overview_' + graph_id).css('visibility', 'hidden');
}
else{
$('#overview_' + graph_id).css('visibility', 'visible');
}
*/
}); });
$("#menu_export_csv_"+graph_id) $("#menu_export_csv_"+graph_id)

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

@ -222,7 +222,7 @@ function flot_area_graph (
if (!$vconsole){ if (!$vconsole){
$return .= "<div id='overview_$graph_id' class='overview_graph' $return .= "<div id='overview_$graph_id' class='overview_graph'
style='margin:0px; margin-top:30px; margin-bottom:50px; display:none; width: ".$params['width']."; height: 200px;'></div>"; style='margin:0px; margin-top:30px; margin-bottom:50px; width: ".$params['width']."; height: 200px;'></div>";
} }
if ($water_mark != '') { if ($water_mark != '') {
@ -280,9 +280,7 @@ function flot_area_graph (
"JSON.parse('$params'), \n" . "JSON.parse('$params'), \n" .
"JSON.parse('$array_events_alerts')". "JSON.parse('$array_events_alerts')".
");"; ");";
$return .= "$('#legend_" . $graph_id . " .legendLabel').css('color', 'green')";
$return .= "});"; $return .= "});";
$return .= "</script>"; $return .= "</script>";
// Parent layer // Parent layer