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

Merge branch '1827-Graficas_TIP_eje_x_no_mantiene_ratio' into 'develop'

Browse Source 
1827 graficas tip eje x no mantiene ratio

See merge request artica/pandorafms!1531
This commit is contained in:
vgilc 2018-06-12 16:45:06 +02:00
commit 946ad40f2a
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/include/functions_graph.php
View File

@ -1939,7 +1939,7 @@ function graphic_combined_module (
$ttl,
$homeurl,
$background_color,
'black'
'#c1c1c1'
);
}
@ -1964,7 +1964,7 @@ function graphic_combined_module (
$background_color,
true,
false,
"black"
"#c1c1c1"
);
}
@ -3652,7 +3652,7 @@ function graph_custom_sql_graph ($id, $width, $height,
"white",
false,
false,
"black"
"c1c1c1"
);
break;
case 'sql_graph_hbar': // horizontal bar
@ -3674,7 +3674,7 @@ function graph_custom_sql_graph ($id, $width, $height,
$ttl,
$homeurl,
'white',
'black'
'c1c1c1'
);
break;
case 'sql_graph_pie': // Pie

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

@ -369,6 +369,7 @@ function pandoraFlotHBars(graph_id, values, labels, water_mark,
hoverable: true,
borderWidth: 1,
tickColor: tick_color,
borderColor: '#C1C1C1',
backgroundColor: { colors: [background_color, background_color] }
},
xaxis: {
@ -620,6 +621,7 @@ function pandoraFlotVBars(graph_id, values, labels, labels_long, legend, colors,
hoverable: true,
borderWidth: 1,
tickColor: tick_color,
borderColor: '#C1C1C1',
backgroundColor: { colors: [background_color, background_color] }
}
};