From b93b4c35b321ae5d119df064a0d76dd21ccedca3 Mon Sep 17 00:00:00 2001
From: alexhigh <alex@artica.es>
Date: Wed, 11 Jun 2014 11:34:27 +0000
Subject: [PATCH] 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
---
 pandora_console/ChangeLog                           | 11 +++++++++++
 pandora_console/godmode/users/configure_user.php    |  6 +++---
 pandora_console/include/graphs/flot/pandora.flot.js |  2 +-
 pandora_console/include/graphs/functions_flot.php   |  6 +++++-
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 5c60308caf..212065024b 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -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>
 	
 	* include/functions_graph.php: Added the function
diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php
index 4a901461fa..66fa34af2a 100644
--- a/pandora_console/godmode/users/configure_user.php
+++ b/pandora_console/godmode/users/configure_user.php
@@ -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][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][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']) {
 	$table->data[4][0] = __('Password');
 	$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][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']);
diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js
index 33beb0e08b..a281408d0b 100644
--- a/pandora_console/include/graphs/flot/pandora.flot.js
+++ b/pandora_console/include/graphs/flot/pandora.flot.js
@@ -319,7 +319,7 @@ function pandoraFlotVBars(graph_id, values, labels, labels_long, legend, colors,
 					} ],
 			yaxes: [ { 
 					tickFormatter: yFormatter,
-					tickSize: 1,
+					tickSize: 20,
 					color: '#000'
 					},
 					{
diff --git a/pandora_console/include/graphs/functions_flot.php b/pandora_console/include/graphs/functions_flot.php
index 9b71e1a827..8e2ee96b01 100644
--- a/pandora_console/include/graphs/functions_flot.php
+++ b/pandora_console/include/graphs/functions_flot.php
@@ -513,9 +513,13 @@ function flot_vcolumn_chart ($graph_data, $width, $height, $color, $legend, $lon
 	// Get a unique identifier to graph
 	$graph_id = uniqid('graph_');
 	$graph_id2 = uniqid('graph_');
+
+	if ($width != 'auto') {
+		$width = $width . "px";
+	}
 	
 	// 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>";
 	
 	if ($water_mark != '') {