--- misc/xenconsole/index.php	2012/11/30 15:54:54	1884
+++ misc/xenconsole/index.php	2012/11/30 17:56:07	1885
@@ -41,6 +41,11 @@
 $(document).ready( function() {
 	setInterval(refreshData, 60000);	
 	refreshData();
+	$('.console').click( function() {
+		var session = $(this).data('session');
+		var conurl = $(this).data('conurl');
+		console(conurl,session);
+	});
 });
 
 function refreshData() {
@@ -48,17 +53,37 @@
 		$(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 = "#state_" + name;
-			var css = $(id).css("background");
+			var id = "#vm_" + name;
+
+			var vm = $(id);			
 
 			if (state == "Running") {
-				$(id).css("background-image", "url('gfx/vps_topgreen.png')");
+				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 {
-				$(id).css("background-image", "url('gfx/vps_topred.png')");
+				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();
 			}
 			
            })
@@ -184,52 +209,19 @@
 		}
 	}
 
-	$vps_topbg = 'vps_topyellow.png';
-
-	if ($state == "Running") {
-		$vps_topbg = 'vps_topgreen.png';
-	} else if ($state == "Halted") {
-		$vps_topbg = 'vps_topred.png';
-	}
-
-	$network = "";
-	if ( $vm["power_state"] == "Running" && $vm["guest_metrics"] != "OpaqueRef:NULL" ) {
-        	$guest_metrics = $xenserver->VM_guest_metrics__get_record( $vm["guest_metrics"] );
-		$network = "(IP: " . implode( ",",  $guest_metrics["networks"]) . ")";
-	} else {
-        	$guest_metrics = Array() ;
-	}
-
 
-	$url = "";
-	$session = "";
-	foreach($vm["consoles"] as $conref) {
-        	$con = $xenserver->console__get_record( $conref );
-	        //var_dump($con);
-
-        	if ($con["protocol"] == "rfb") {
-	                $url = urlencode( $con["location"] );
-	                $session = $xenserver->get_id();
-        	}
-	}
 	
-
-
-
-//	echo "<a href='#' onclick=\"loadvm('$uuid');\">$name</a><br>\n";
 ?>
 	<!-- MACHINE -->
-	<table width='99%' cellpadding='3' cellspacing='0' border='0' class='vps' id='<?php echo $name;?>'>
-		<tr background='gfx/vps_topbg.png'>
-			<td width='10' background='gfx/<?php echo $vps_topbg; ?>' class='small' id='state_<?php echo $clean_name;?>'>&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'>
-				<?php echo $network;?>
-				<?php 
-				if ($url != "") {
-					echo "<a href='#' onclick=\"console('$url','$session')\"><img src='gfx/icon-terminal.png' style='vertical-align: middle;'></a>";
-				} 
-				?>
+				<span class='network'></span>
+				<a href='#' style='display:none;' class='console'>
+					<img src='gfx/icon-terminal.png' style='vertical-align: middle;'>
+				</a>
 			</td>
 		</tr>
 
@@ -237,17 +229,17 @@
 		<td></td>
 
 		<td width='150' class='small'>
-			<?php
-			if ($state == "Running") {
-				echo "start | ";
-				echo "<a href='#' onclick=\"doAction('shutdown','$uuid')\">stop</a> | ";
-				echo "<a href='#' onclick=\"doAction('hardshutdown','$uuid')\">force shutdown</a>";
-			} else {
-				echo "<a href='#' onclick=\"doAction('start','$uuid')\">start</a> | ";
-				echo "stop | ";
-				echo "force shutdown";
-			}
-			?>
+			<span class="actionstop" style='display:none'>
+				start | 
+				<a href='#' onclick="doAction('shutdown','<?php echo $uuid;?>')" >stop</a> | 
+				<a href='#' onclick="doAction('hardshutdown','<?php echo $uuid;?>')" >force shutdown</a>
+			</span>
+			
+			<span class="actionstart">			
+				<a href='#' onclick="doAction('start','<?php echo $uuid;?>')" >start</a> | 
+				stop | 
+				force shutdown
+			</span>
 
 		</td>