--- misc/xenconsole/webadmin.php	2012/11/30 08:27:52	1876
+++ misc/xenconsole/index.php	2012/11/30 21:41:29	1886
@@ -39,27 +39,80 @@
 
 <script type='text/javascript'>
 $(document).ready( function() {
-	loadServer();
+	setInterval(refreshData, 60000);	
+	refreshData();
+	$('.console').click( function() {
+		var session = $(this).data('session');
+		var conurl = $(this).data('conurl');
+		console(conurl,session);
+	});
 });
 
-function doAction(action, uuid) {
+function refreshData() {
+	$.get('ajaxdata.php', function(xml) {
+		$(xml).find('vm').each(function() {
+			var name = $(this).find('name').text();
+			var state = $(this).find('state').text();
+			var network = $(this).find('network').text();
+			var state = $(this).find('state').text();
+			var conurl = $(this).find('conurl').text();
+			var session = $(this).find('session').text();
+
+			name = name.replace(" ", "_");
+			name = name.replace(".", "_");
+			
+			var id = "#vm_" + name;
+
+			var vm = $(id);			
+
+			if (state == "Running") {
+				vm.find('.state').css("background-image", "url('gfx/vps_topgreen.png')");
+				vm.find('.network').show();
+				vm.find('.network').text( '(IP: ' + network + ')' );
+				vm.find('.console').show();
+				vm.find('.console').data('conurl', conurl);
+				vm.find('.console').data('session', session);
+				vm.find('.actionstop').show();
+				vm.find('.actionstart').hide();
+			} else {
+				if (state == "Halted") {
+					vm.find('.state').css("background-image", "url('gfx/vps_topred.png')");
+				} else {
+					vm.find('.state').css("background-image", "url('gfx/vps_topyellow.png')");
+				}
+				vm.find('.network').hide();
+				vm.find('.console').hide();
+				vm.find('.actionstop').hide();
+				vm.find('.actionstart').show();
+			}
+			
+           })
+       });
+}
+
+function doAction(action, uuid, vm) {
 	var key = prompt("Key");
 	if (key == "" || key == null) {
 		return;
 	}
 	document.body.style.cursor = 'wait';
+	$('#vm_' + vm).find('.state').css("background-image", "url('gfx/vps_topyellow.png')");
 
 	var url = "action.php?action=" + action + "&uuid=" + uuid + "&key=" + key;
 	var response = $.get(url, function(data) {
-		alert(data);
-		document.body.style.cursor = 'default'
-		if (data == "OK") {
-			window.location.reload();
+		if (data != 'OK') {
+			alert(data);
 		}
+		document.body.style.cursor = 'default'
+
+		refreshData();
 	});
 }
 
 function console(url, session) {
+	if (url == '')
+		return;
+
 	var key = prompt("Key");
 	if (key == "" || key == null) {
 		return;
@@ -67,16 +120,11 @@
 	var url = "console.php?url=" + url + "&session=" + session + "&key=" + key;
 
 	//window.location = url;
-	$('#mainwindow').load(url);
+	//$('#mainwindow').load(url);
+	window.open(url);
 }
 
-function loadServer() {
-	$('#mainwindow').load('server.php');
-}
 
-function loadvm(uuid) {
-	$('#mainwindow').load('vm.php?uuid=' + uuid );
-}
 
 </script>
 
@@ -152,6 +200,10 @@
 	$harddrive_size = 0;
 	$cpu_count = $vm["VCPUs_max"];
 
+	$clean_name = str_replace(" ", "_", $name);
+	$clean_name = str_replace(".", "_", $clean_name);
+	
+
 	foreach ($vm["VBDs"] as $vbds) {
         	$vbd = $xenserver->VBD__get_record($vbds);
 		if ($vbd["type"] == 'Disk') {
@@ -160,29 +212,39 @@
 		}
 	}
 
-	$vps_topbg = 'vps_topyellow.png';
 
-	if ($state == "Running") {
-		$vps_topbg = 'vps_topgreen.png';
-	} else if ($state == "Halted") {
-		$vps_topbg = 'vps_topred.png';
-	}
-
-
-//	echo "<a href='#' onclick=\"loadvm('$uuid');\">$name</a><br>\n";
+	
 ?>
 	<!-- MACHINE -->
-	<table width='99%' cellpadding='3' cellspacing='0' border='0' class='vps'>
-		<tr background='gfx/vps_topbg.png'>
-			<td width='10' background='gfx/<?php echo $vps_topbg; ?>' class='small'>&nbsp;</td>
+	<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></td>
-			<td colspan='2' class='small' align='right'>(IP: 192.168.10.45, 172.10.0.34) <img src='gfx/icon-terminal.png' style='vertical-align: middle;'></td>
+			<td colspan='2' 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;'>
+				</a>
+			</td>
 		</tr>
 
 		<tr bgcolor='#eee'>
 		<td></td>
 
-			<td width='150' class='small'>start stop force</td>
+		<td width='150' class='small'>
+			<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>
+			</span>
+			
+			<span class="actionstart">			
+				<a href='#' onclick="doAction('start','<?php echo $uuid;?>','<?php echo $clean_name;?>')" >start</a> | 
+				stop | 
+				force shutdown
+			</span>
+
+		</td>
 
 		<td width='100' align='right' class='small'>
 			<img src='gfx/icon-cpu.png' style='vertical-align: middle;'>