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

2014-06-11 Alejandro Gallardo <alejandro.gallardo@artica.es> 

* godmode/users/configure_user.php: Fixed some input
	properties.

	* include/graphs/functions_flot.php: Added an option
	to set the width to auto on the function "flot_vcolumn_chart".

	* include/graphs/flot/pandora.flot.js: Increased the tick size
	of the vertical labels on the function "pandoraFlotVBars".


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10163 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
alexhigh 2014-06-11 11:34:27 +00:00
parent d23303ece8
commit bbf9ee8005
4 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pandora_console/ChangeLog
View File

@ -1,3 +1,14 @@
2014-06-11 Alejandro Gallardo <alejandro.gallardo@artica.es>
* godmode/users/configure_user.php: Fixed some input
properties.
* include/graphs/functions_flot.php: Added an option
to set the width to auto on the function "flot_vcolumn_chart".
* include/graphs/flot/pandora.flot.js: Increased the tick size
of the vertical labels on the function "pandoraFlotVBars".
2014-06-10 Alejandro Gallardo <alejandro.gallardo@artica.es> 2014-06-10 Alejandro Gallardo <alejandro.gallardo@artica.es>
* include/functions_graph.php: Added the function * include/functions_graph.php: Added the function

6
pandora_console/godmode/users/configure_user.php
View File

@ -401,7 +401,7 @@ $table->data[0][1] = html_print_input_text_extended ('id_user', $id, '', '', 20,
$table->data[1][0] = __('Full (display) name'); $table->data[1][0] = __('Full (display) name');
$table->data[1][1] = html_print_input_text_extended ('fullname', $user_info['fullname'], $table->data[1][1] = html_print_input_text_extended ('fullname', $user_info['fullname'],
'', '', 30, 255, $view_mode, '', '', true); '', '', 30, 125, $view_mode, '', '', true);
$table->data[2][0] = __('Language'); $table->data[2][0] = __('Language');
$table->data[2][1] = html_print_select_from_sql ('SELECT id_language, name FROM tlanguage', $table->data[2][1] = html_print_select_from_sql ('SELECT id_language, name FROM tlanguage',
@ -410,10 +410,10 @@ $table->data[2][1] = html_print_select_from_sql ('SELECT id_language, name FROM
if ($config['user_can_update_password']) { if ($config['user_can_update_password']) {
$table->data[4][0] = __('Password'); $table->data[4][0] = __('Password');
$table->data[4][1] = html_print_input_text_extended ('password_new', '', '', '', $table->data[4][1] = html_print_input_text_extended ('password_new', '', '', '',
15, 255, $view_mode, '', '', true, true); 15, 45, $view_mode, '', '', true, true);
$table->data[5][0] = __('Password confirmation'); $table->data[5][0] = __('Password confirmation');
$table->data[5][1] = html_print_input_text_extended ('password_confirm', '', '', $table->data[5][1] = html_print_input_text_extended ('password_confirm', '', '',
'', 15, 255, $view_mode, '', '', true, true); '', 15, 45, $view_mode, '', '', true, true);
} }
$own_info = get_user_info ($config['id_user']); $own_info = get_user_info ($config['id_user']);

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

@ -319,7 +319,7 @@ function pandoraFlotVBars(graph_id, values, labels, labels_long, legend, colors,
} ], } ],
yaxes: [ { yaxes: [ {
tickFormatter: yFormatter, tickFormatter: yFormatter,
tickSize: 1, tickSize: 20,
color: '#000' color: '#000'
}, },
{ {

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

@ -514,8 +514,12 @@ function flot_vcolumn_chart ($graph_data, $width, $height, $color, $legend, $lon
$graph_id = uniqid('graph_'); $graph_id = uniqid('graph_');
$graph_id2 = uniqid('graph_'); $graph_id2 = uniqid('graph_');
if ($width != 'auto') {
$width = $width . "px";
}
// Set some containers to legend, graph, timestamp tooltip, etc. // Set some containers to legend, graph, timestamp tooltip, etc.
$return .= "<div id='$graph_id' class='graph $adapt_key' style='width: ".$width."px; height: ".$height."px;'></div>"; $return .= "<div id='$graph_id' class='graph $adapt_key' style='width: ".$width."; height: ".$height."px;'></div>";
$return .= "<div id='value_$graph_id' style='display:none; position:absolute; background:#fff; border: solid 1px #aaa; padding: 2px'></div>"; $return .= "<div id='value_$graph_id' style='display:none; position:absolute; background:#fff; border: solid 1px #aaa; padding: 2px'></div>";
if ($water_mark != '') { if ($water_mark != '') {