--- misc/xenconsole/index.php	2012/12/02 14:56:06	1891
+++ misc/xenconsole/index.php	2012/12/02 16:30:24	1892
@@ -67,6 +67,8 @@
 		$(xml).find('host').each(function() {
 			var memtotal = $(this).find('memtotal').text();
 			var memfree = $(this).find('memfree').text();	
+			var cpuavg = $(this).find('cpuavg').text();
+
 			memtotal = Math.round ( memtotal / (1024*1024) );
 			memfree = Math.round ( memfree / (1024*1024) );
 			var memused = memtotal - memfree;
@@ -78,6 +80,12 @@
 			$('#server_memory_usage').attr('alt', mem_percentage + '%');
 			$('#server_memory_usage').attr('title', mem_percentage + '%');
 			$('#server_memory_usage_txt').text( memused + '/' + memtotal + 'MB');
+
+
+			$('#server_cpu_usage').attr('src', 'usagebar.php?usage=' + cpuavg);
+			$('#server_cpu_usage').attr('alt', cpuavg + '%');
+			$('#server_cpu_usage').attr('title', cpuavg + '%');
+			$('#server_cpu_usage_txt').text( cpuavg+ '%');
 		});
 		$(xml).find('vm').each(function() {
 			var name = $(this).find('name').text();
@@ -87,6 +95,7 @@
 			var conurl = $(this).find('conurl').text();
 			var session = $(this).find('session').text();
 			var os = $(this).find('os').text();
+			var cpuavg = $(this).find('cpuavg').text();
 
 			name = name.replace(" ", "_");
 			name = name.replace(".", "_");
@@ -105,6 +114,11 @@
 				vm.find('.actionstop').show();
 				vm.find('.actionstart').hide();
 				vm.find('.os').text(' - ' + os);
+
+
+				vm.find('.cpu_graph').show();
+				vm.find('.cpu_graph').attr('src', 'usagebar.php?usage=' + cpuavg);
+				vm.find('.cpu_graph').attr('title',  cpuavg + '%');
 			} else {
 				if (state == "Halted") {
 					vm.find('.state').css("background-image", "url('gfx/vps_topred.png')");
@@ -115,6 +129,8 @@
 				vm.find('.console').hide();
 				vm.find('.actionstop').hide();
 				vm.find('.actionstart').show();
+				vm.find('.cpu_graph').hide();
+				vm.find('.mem_graph').hide();
 			}
 			
            	})
@@ -277,11 +293,13 @@
 
 		</td>
 
-		<td width='100' align='right' class='small'>
+		<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>
 		</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>
 			<img src='gfx/icon-memory.png' style='vertical-align: middle;'>
 			<span id='vps_memory_usage_txt_UID'><?php echo format_memory($memory); ?></span>
 		</td>
@@ -291,11 +309,12 @@
 			<span id='vps_net_usage_txt_UID'>na</span>
 		</td>
 -->
-		<td width='100' align='right' class='small'>
+		<td width='100' align='right' class='small' valign='top'>
 			<img src='gfx/icon-disk.png' style='vertical-align: middle;'>
 			<span id='vps_disk_usage_txt_UID'><?php echo format_storage($harddrive_size); ?></span>
 		</td>
 		</tr>
+		
 
 	</table>
 	<!-- MACHINE END -->