--- misc/xenconsole/index.php	2013/03/26 13:15:05	1957
+++ misc/xenconsole/index.php	2013/03/26 17:17:12	1960
@@ -58,6 +58,7 @@
 
 <script type='text/javascript'>
 var menu = 0;
+var menu_uuid = '';
 
 $(document).ready( function() {
 	$("#menu").hide();
@@ -75,10 +76,17 @@
 	});
 
 	$('.settings').click( function(event) {
+		menu_uuid = $(this).attr('uuid');
 
 		$('#menu').menu( {
 			select: function(event2,ui) {
-					alert( ui.item.text() );
+					var action = $(ui.item).attr("action");
+					if (action == "memory") {
+						doAction("setMemory", menu_uuid, "");	
+					}
+					if (action == "cpu") {
+						doAction("setCPU", menu_uuid, "");	
+					}
 				},
 			create: function(event3,ui) {
 				menu = 1;
@@ -142,6 +150,7 @@
 			var cpuavg = $(this).find('cpuavg').text();
 			var curmem = $(this).find('curmem').text();
 			var maxmem = $(this).find('maxmem').text();
+			var cpus = $(this).find('cpus').text();
 
 			var mempercent = Math.round( (curmem*100) / maxmem );
 
@@ -157,6 +166,7 @@
 			}
 
 			vm.find('.vps_memory_usage_txt_UID').text( maxmem + " MB");
+			vm.find('.vps_cpu_usage_txt_UID').text( cpus + " VCPU");
 
 			if (state == "Running") {
 				vm.find('.state').css("background-image", "url('gfx/vps_topgreen.png')");
@@ -213,8 +223,14 @@
 
 	if (action == "setMemory") {
 		val = prompt("Set memory target");
+		val *= (1024*1024);
+		if (val == "" || val == null) {
+			return;
+		}
+	}
+	if (action == "setCPU") {
+		val = prompt("Set CPU count");
 		if (val == "" || val == null) {
-			alert("" + val);
 			return;
 		}
 	}
@@ -349,7 +365,7 @@
 				<a href='#' style='display:none;' class='console'>
 					<img src='gfx/icon-terminal.png' style='vertical-align: middle;'>
 				</a>
-				<a href='#' style='display:none;' class='settings'>
+				<a href='#' style='display:none;' class='settings' uuid='<?php echo $uuid;?>'>
 					<img src='gfx/icon-settings16.png' style='vertical-align: middle;'>
 				</a>
 			</td>
@@ -362,16 +378,13 @@
 			<span class="actionstop" style='display:none'>
 				start | 
 				<a href='#' onclick="doAction('shutdown','<?php echo $uuid;?>','<?php echo $clean_name;?>')" >stop</a> | 
-				<a href='#' onclick="doAction('hardshutdown','<?php echo $uuid;?>','<?php echo $clean_name;?>')" >force shutdown</a> | 
-				set memory
+				<a href='#' onclick="doAction('hardshutdown','<?php echo $uuid;?>','<?php echo $clean_name;?>')" >force shutdown</a>
 			</span>
 			
 			<span class="actionstart">			
 				<a href='#' onclick="doAction('start','<?php echo $uuid;?>','<?php echo $clean_name;?>')" >start</a> | 
 				stop | 
-				force shutdown | 
-
-				<a href='#' onclick="doAction('setMemory','<?php echo $uuid;?>','<?php echo $clean_name;?>')" >set memory</a> 
+				force shutdown
 			</span>
 
 		</td>
@@ -379,7 +392,7 @@
 		<td width='100' align='right' class='small' valign='top'>
 			<img src='usagebar.php?usage=1' width='102' height='16' title='static dummy data' class='cpu_graph'><br>
 			<img src='gfx/icon-cpu.png' style='vertical-align: middle;'>
-			<span id='vps_cpu_usage_txt_UID'><?php echo $cpu_count; ?> VCPU</span>
+			<span class='vps_cpu_usage_txt_UID'><?php echo $cpu_count; ?> VCPU</span>
 		</td>
 		<td width='100' align='right' class='small'>
 			<img src='usagebar.php?usage=1' width='102' height='16' title='static dummy data' class='mem_graph'><br>
@@ -408,8 +421,8 @@
 <br>
 
 <ul id="menu">
-	<li><a href="#">Set Memory Size</a></li>
-	<li><a href="#">Set CPU Count</a></li>
+	<li action="memory"><a href="#">Set Memory Size</a></li>
+	<li action="cpu"><a href="#">Set CPU Count</a></li>
 
 
 <!--	<li><a href="#">Item 3</a>