--- misc/xenconsole/index.php	2012/12/01 11:27:10	1888
+++ misc/xenconsole/index.php	2012/12/10 12:40:58	1898
@@ -40,11 +40,12 @@
 
 $vms_array = $xenserver->VM__get_all_records();
 
+$namelabel = $host["name_label"];
 
 ?>
 <html>
 <head>
-<title>XenServer::SERVER</title>
+<title>XenServer::<?php echo $namelabel;?></title>
 <script type='text/javascript' src="jquery-1.8.2.min.js"></script>
 
 <script type='text/javascript'>
@@ -63,7 +64,31 @@
 });
 
 function refreshData() {
+	$("#logo").hide();	
 	$.get('ajaxdata.php', function(xml) {
+		$(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;
+			var mem_percentage = Math.round( (memused/memtotal) * 100);
+
+			//alert(memused + ' ' + mem_percentage);
+
+			$('#server_memory_usage').attr('src', 'usagebar.php?usage=' + mem_percentage);
+			$('#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();
 			var state = $(this).find('state').text();
@@ -72,6 +97,12 @@
 			var conurl = $(this).find('conurl').text();
 			var session = $(this).find('session').text();
 			var os = $(this).find('os').text();
+			var guestversion = $(this).find('guestversion').text();
+			var cpuavg = $(this).find('cpuavg').text();
+			var curmem = $(this).find('curmem').text();
+			var maxmem = $(this).find('maxmem').text();
+
+			var mempercent = Math.round( (curmem*100) / maxmem );
 
 			name = name.replace(" ", "_");
 			name = name.replace(".", "_");
@@ -80,6 +111,10 @@
 
 			var vm = $(id);			
 
+			if (guestversion != '') {
+				os += ' Guest Tools: ' + guestversion;
+			}
+
 			if (state == "Running") {
 				vm.find('.state').css("background-image", "url('gfx/vps_topgreen.png')");
 				vm.find('.network').show();
@@ -90,6 +125,15 @@
 				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 + '%');
+
+				vm.find('.mem_graph').show();
+				vm.find('.mem_graph').attr('src', 'usagebar.php?usage=' + mempercent);
+				vm.find('.mem_graph').attr('title',  curmem + ' / ' + maxmem + ' MB' );
 			} else {
 				if (state == "Halted") {
 					vm.find('.state').css("background-image", "url('gfx/vps_topred.png')");
@@ -100,9 +144,12 @@
 				vm.find('.console').hide();
 				vm.find('.actionstop').hide();
 				vm.find('.actionstart').show();
+				vm.find('.cpu_graph').hide();
+				vm.find('.mem_graph').hide();
 			}
 			
-           })
+           	});
+		$('#logo').show();
        });
 }
 
@@ -183,19 +230,19 @@
 <table width='100%' background='gfx/topbg.png' cellpadding='3' cellspacing='0' border='0' class='toptable'>
 <tr>
 	<td rowspan='2' width='160'><img src='gfx/citrix-logo.png' id='logo'></td>
-	<td colspan='3' class='small' align='right'><?php echo $xenversion;?><br><?php echo $license;?></td>
+	<td colspan='4' class='small' align='right'><?php echo $namelabel . " / " . $xenversion;?><br><?php echo $license;?></td>
 </tr>
 <tr>
 	<td width='150' align='right' class='small'><img src='gfx/icon-cpu.png'>
-		<img id='server_cpu_usage' src='usagebar.php?usage=12' width='102' height='16'><div id='server_cpu_usage_txt'>12%</div></td>
-<!--
+		<img id='server_cpu_usage' src='usagebar.php?usage=12' width='102' height='16' title='static dummy data'><div id='server_cpu_usage_txt'>12%</div></td>
+
 	<td width='150' align='right' class='small'><img src='gfx/icon-memory.png'>
-		<img id='server_memory_usage' src='usagebar.php?usage=81' width='102' height='16'><div id='server_memory_usage_txt'>4096/7912 MB</div></td>
--->
+		<img id='server_memory_usage' src='usagebar.php?usage=1' width='102' height='16' title='static dummy data'><div id='server_memory_usage_txt'>0/4 MB</div></td>
+
 	<td width='150' align='right' class='small'><img src='gfx/icon-network.png'>
-		<img id='server_net_usage' src='usagebar.php?usage=41' width='102' height='16'><div id='server_net_usage_txt'>1%</div></td>
+		<img id='server_net_usage' src='usagebar.php?usage=41' width='102' height='16' title='static dummy data'><div id='server_net_usage_txt'>1%</div></td>
 	<td width='150' align='right' class='small'><img src='gfx/icon-disk.png'>
-		<img id='server_disk_usage' src='usagebar.php?usage=41' width='102' height='16'><div id='server_memory_usage_txt'>89.3/405.5 GB</div></td>
+		<img id='server_disk_usage' src='usagebar.php?usage=41' width='102' height='16' title='static dummy data'><div id='server_memory_usage_txt'>89.3/405.5 GB</div></td>
 
 	</td>
 </tr></table>
@@ -235,8 +282,8 @@
 	<table width='99%' cellpadding='3' cellspacing='0' border='0' class='vps' id='vm_<?php echo $clean_name;?>'>
 		<tr background='gfx/vps_topbg.png'  >
 			<td width='10' class='small state'>&nbsp;</td>
-			<td colspan='2' class='small'><b><?php echo $name; ?></b><span class='os'></span></td>
-			<td colspan='2' class='small' align='right'>
+			<td colspan='3' class='small'><b><?php echo $name; ?></b><span class='os'></span></td>
+			<td colspan='1' class='small' align='right'>
 				<span class='network'></span>
 				<a href='#' style='display:none;' class='console'>
 					<img src='gfx/icon-terminal.png' style='vertical-align: middle;'>
@@ -262,11 +309,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>
@@ -276,11 +325,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='bottom'>
 			<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 -->
