diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 0212458998..5521a9bb3b 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,16 @@
+2012-04-18 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
+
+	* include/styles/pandora_minimal.css
+	 include/javascript/pandora.js
+	 operation/agentes/stat_win.php: Changed layout of interactive graph
+	 menu.
+	
+	* images/graphmenu_arrow.png
+	 images/graphmenu_arrow_hide.png: Added images for interactive 
+	 graph menu.
+	 
+	 Merged from branches.
+
 2012-04-18 Miguel de Dios <miguel.dedios@artica.es>
 	
 	* include/functions_agents.php: into the function
diff --git a/pandora_console/images/graphmenu_arrow.png b/pandora_console/images/graphmenu_arrow.png
new file mode 100644
index 0000000000..f1054005f6
Binary files /dev/null and b/pandora_console/images/graphmenu_arrow.png differ
diff --git a/pandora_console/images/graphmenu_arrow_hide.png b/pandora_console/images/graphmenu_arrow_hide.png
new file mode 100644
index 0000000000..3b24937e6b
Binary files /dev/null and b/pandora_console/images/graphmenu_arrow_hide.png differ
diff --git a/pandora_console/include/javascript/pandora.js b/pandora_console/include/javascript/pandora.js
index d378c0c0ca..f17a6b287e 100644
--- a/pandora_console/include/javascript/pandora.js
+++ b/pandora_console/include/javascript/pandora.js
@@ -11,7 +11,7 @@ function toggleDiv (divid){
 
 function winopeng (url, wid) {
 	open (url, wid,"width=650,height=410,status=no,toolbar=no,menubar=no,scrollbar=no");
-	// WARNING !! Internet Explorer DOESNT SUPPORT "-" CHARACTERS IN WINDOW HANDLE VARIABLE
+	// WARNING !! Internet Explorer DOESNT SUPPORT "-" CARACTERS IN WINDOW HANDLE VARIABLE
 	status =wid;
 }
 
diff --git a/pandora_console/include/styles/pandora_minimal.css b/pandora_console/include/styles/pandora_minimal.css
index a15e9e398e..ea37e357df 100644
--- a/pandora_console/include/styles/pandora_minimal.css
+++ b/pandora_console/include/styles/pandora_minimal.css
@@ -76,7 +76,8 @@ table, img {
 }
 .menu {
 	color:#000;
-	background:#ddd;
+	background:#cccacb url('../../images/login_background.png') right center no-repeat;
+
 	margin-left: 10px;
 	padding-left: 10px;
 	padding-top: 10px;
@@ -89,10 +90,24 @@ table, img {
 	width:400px;
 	height:260px;
 	visibility:hidden;
-	filter:alpha(opacity=90);
-	-moz-opacity: 0.90;
-	opacity: 0.90;
+	
+	-moz-box-shadow: 0px 6px 6px #010E1B !important;
+	-webkit-box-shadow: 0px 6px 6px #010E1B !important;
+	box-shadow: 0px 6px 6px #010E1B !important;	
+	
+	-moz-border-top-right-radius: 10px;
+	-webkit-border-top-right-radius: 10px;
+	border-top-right-radius: 10px;	
+	
+	filter:alpha(opacity=97);
+	-moz-opacity: 0.97;
+	opacity: 0.97;
 }
+
+#show_menu {
+	background:#cccacb;
+}
+
 #loading {
 	position:fixed;
 	width: 200px;
@@ -158,3 +173,12 @@ tfoot.scwFoot {
         color: #FFA500 !important;
 }
 
+input.next {
+	background: #e5e5e5 url(../../images/go.png) no-repeat 98% 2px;
+}
+
+input.next {
+	padding-right: 21px;
+}
+
+
diff --git a/pandora_console/operation/agentes/stat_win.php b/pandora_console/operation/agentes/stat_win.php
index 0eb05beb3d..5ef32f93df 100644
--- a/pandora_console/operation/agentes/stat_win.php
+++ b/pandora_console/operation/agentes/stat_win.php
@@ -61,23 +61,66 @@ if ($refresh > 0) {
 <script type='text/javascript' src='../../include/javascript/x_event.js'></script>
 <script type='text/javascript' src='../../include/javascript/x_slide.js'></script>
 <script type='text/javascript' src='../../include/javascript/pandora.js'></script>
-<script type='text/javascript' src='../../include/javascript/jquery-1.7.1.js'></script>
+<script type='text/javascript' src='../../include/javascript/jquery.js'></script>
 <script type='text/javascript'><!--
 var defOffset = 2;
 var defSlideTime = 220;
 var tnActive = 0;
-var visibleMargin = 15;
+var visibleMargin = 45;
 var menuW = 400;
 var menuH = 310;
+var showed = 0;
 window.onload = function() {
 	var d;
 	d = xGetElementById('divmenu');
 	d.termNumber = 1;
 	xMoveTo(d, visibleMargin - menuW, 0);
 	xShow(d);
-	xAddEventListener(document, 'mousemove', docOnMousemove, false);
+
+	// If navigator is IE then call attachEvent, else call addEventListener
+	if ('\v'=='v')
+		document.getElementById('show_menu').attachEvent('onclick', docOnMousemoveIn);
+	else
+		document.getElementById('show_menu').addEventListener('click', docOnMousemoveIn, false);
+	
+
+
+	// Hack to repeat the init process to period select
+	var periodSelectId = $('[name="period"]').attr('class');
+
+	period_select_init(periodSelectId);
+	
+	$("#graph_menu_arrow").click(function(){
+		console.log($("#graph_menu_arrow").attr("src").indexOf("hide"));
+		if ($("#graph_menu_arrow").attr("src").indexOf("hide") == -1){
+			$("#graph_menu_arrow").attr("src", <?php echo '"' . $config['homeurl'] . '"'; ?> + "/images/graphmenu_arrow_hide.png");	
+		}
+		else {
+			$("#graph_menu_arrow").attr("src", <?php echo '"' . $config['homeurl'] . '"'; ?> + "/images/graphmenu_arrow.png");
+		}
+	});
+
 };
 
+function docOnMousemoveIn(evt) {
+
+	var e = new xEvent(evt);
+	var d = getTermEle(e.target);
+
+//	if (!tnActive) { // no def is active
+//		if (d) { // mouse is over a term, activate its def
+		if (showed == 0) {
+			xSlideTo('divmenu', 0, xPageY(d), defSlideTime);
+			showed = 1;
+		}
+		else {
+			xSlideTo('divmenu', visibleMargin - menuW, xPageY(d), defSlideTime);
+			showed = 0;
+		}
+//		}
+//	}
+}
+
 function docOnMousemove(evt) {
 	var e = new xEvent(evt);
 	var d = getTermEle(e.target);
@@ -148,7 +191,7 @@ if ($zoom > 1) {
 	$height = $height * ($zoom / 2.1);
 	$width = $width * ($zoom / 1.4);
 
-	echo "<script type='text/javascript'>window.resizeTo($width + 10, $height + 280);</script>";
+	echo "<script type='text/javascript'>window.resizeTo($width + 80, $height + 120);</script>";
 }
 
 $utime = get_system_time ();
@@ -167,10 +210,7 @@ $urlImage .= $_SERVER['SERVER_NAME'] . $config['homeurl'] . '/';
 
 // log4x doesnt support flash yet
 //
-echo "<br>";
-
-echo "<div style='margin-left:30px'>";
-
+echo '<div style="margin-left: 30px">';
 switch ($graph_type) {
 	case 'boolean':
 		echo grafico_modulo_boolean ($id, $period, $draw_events, $width, $height,
@@ -205,10 +245,11 @@ switch ($graph_type) {
 		echo fs_error_image ('../images');
 		break;
 }
-echo "</div>";
+echo '</div>';
 
 //z-index is 1 because 2 made the calendar show under the divmenu.
-echo '<div id="divmenu" class="menu" style="z-index:1; height:280px;"><b>'.__('Pandora FMS Graph configuration menu').'</b><br />'.__('Please, make your changes and apply with the <i>Update</i> button');
+echo '<div id="divmenu" class="menu" style="z-index:1; height: 98%;"><b>'.__('Pandora FMS Graph configuration menu').'</b><br /><br />'.__('Please, make your changes and apply with the <i>Reload</i> button');
+echo '<div style="float: left">';
 echo '<form method="get" action="stat_win.php">';
 html_print_input_hidden ("id", $id);
 html_print_input_hidden ("label", $label);
@@ -266,11 +307,12 @@ echo '</td><td>';
 echo '</td></tr><tr><td>'.__('Show event graph').'</td><td>';
 html_print_checkbox ("show_events_graph", 1, (bool) $show_events_graph);
 
-echo '</td><td>';
+echo '</td></tr>';
+echo '<tr><td></td><td style="text-align: right">';
 
-html_print_submit_button (__('Update'), "submit", false, 'class="sub next"');
+html_print_submit_button (__('Reload'), "submit", false, 'class="sub next"');
 
-echo '</td></tr></table></form></div></body></html>';
+echo '</td></tr></table></form></div><div id="show_menu" style="position: relative; border:1px solid #FFF; float: right; height: 50px; width: 50px;">' . html_print_image("images/graphmenu_arrow.png", true, array('id' => 'graph_menu_arrow')) . '<div></div></body></html>';
 ?>
 </body>
 </html>