--- misc/xenconsole/index.php	2012/12/10 12:32:50	1897
+++ misc/xenconsole/index.php	2013/03/25 12:47:31	1952
@@ -55,7 +55,8 @@
 	$('.console').click( function() {
 		var session = $(this).data('session');
 		var conurl = $(this).data('conurl');
-		console(conurl,session);
+		var name = $(this).data('name');
+		console(conurl,session,name);
 	});
 
 	$('#logo').click( function() {
@@ -115,6 +116,8 @@
 				os += ' Guest Tools: ' + guestversion;
 			}
 
+			vm.find('.vps_memory_usage_txt_UID').text( maxmem + " MB");
+
 			if (state == "Running") {
 				vm.find('.state').css("background-image", "url('gfx/vps_topgreen.png')");
 				vm.find('.network').show();
@@ -122,6 +125,7 @@
 				vm.find('.console').show();
 				vm.find('.console').data('conurl', conurl);
 				vm.find('.console').data('session', session);
+				vm.find('.console').data('name', name);
 				vm.find('.actionstop').show();
 				vm.find('.actionstart').hide();
 				vm.find('.os').text(' - ' + os);
@@ -140,6 +144,8 @@
 				} else {
 					vm.find('.state').css("background-image", "url('gfx/vps_topyellow.png')");
 				}
+				vm.find('.os').text('');
+
 				vm.find('.network').hide();
 				vm.find('.console').hide();
 				vm.find('.actionstop').hide();
@@ -154,6 +160,8 @@
 }
 
 function doAction(action, uuid, vm) {
+	var val="";
+
 	var key = prompt("Key");
 	if (key == "" || key == null) {
 		return;
@@ -161,7 +169,15 @@
 	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;
+	if (action == "setMemory") {
+		val = prompt("Set memory target");
+		if (val == "" || val == null) {
+			alert("" + val);
+			return;
+		}
+	}
+
+	var url = "action.php?action=" + action + "&uuid=" + uuid + "&key=" + key + "&val=" + val;;
 	var response = $.get(url, function(data) {
 		if (data != 'OK') {
 			alert(data);
@@ -172,7 +188,7 @@
 	});
 }
 
-function console(url, session) {
+function console(url, session, name) {
 	if (url == '')
 		return;
 
@@ -180,7 +196,7 @@
 	if (key == "" || key == null) {
 		return;
 	}
-	var url = "console.php?url=" + url + "&session=" + session + "&key=" + key;
+	var url = "console.php?url=" + url + "&session=" + session + "&key=" + key + "&name=" + name;
 
 	//window.location = url;
 	//$('#mainwindow').load(url);
@@ -233,18 +249,20 @@
 	<td colspan='4' class='small' align='right'><?php echo $namelabel . " / " . $xenversion;?><br><?php echo $license;?></td>
 </tr>
 <tr>
+<td width='150'></td>
+<td width='150'></td>
 	<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' 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=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' 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' title='static dummy data'><div id='server_memory_usage_txt'>89.3/405.5 GB</div></td>
-
 	</td>
+-->
 </tr></table>
 
 
@@ -257,6 +275,7 @@
 	}
 
 	$name = $vm["name_label"];
+	$description = $vm["name_description"];
 	$uuid = $vm["uuid"];
 	$state = $vm["power_state"] ;
 	$memory = $vm['memory_target'];
@@ -282,8 +301,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='3' class='small'><b><?php echo $name; ?></b><span class='os'></span></td>
-			<td colspan='1' class='small' align='right'>
+			<td colspan='2' class='small' title='<?php echo $description;?>'><b><?php echo $name; ?></b><span class='os'></span></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;'>
@@ -298,13 +317,16 @@
 			<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>
+				<a href='#' onclick="doAction('hardshutdown','<?php echo $uuid;?>','<?php echo $clean_name;?>')" >force shutdown</a> | 
+				set memory
 			</span>
 			
 			<span class="actionstart">			
 				<a href='#' onclick="doAction('start','<?php echo $uuid;?>','<?php echo $clean_name;?>')" >start</a> | 
 				stop | 
-				force shutdown
+				force shutdown | 
+
+				<a href='#' onclick="doAction('setMemory','<?php echo $uuid;?>','<?php echo $clean_name;?>')" >set memory</a> 
 			</span>
 
 		</td>
@@ -317,7 +339,7 @@
 		<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>
+			<span class='vps_memory_usage_txt_UID'><?php echo format_memory($memory); ?></span>
 		</td>
 <!--
 		<td width='100' align='right' class='small'>
@@ -325,7 +347,7 @@
 			<span id='vps_net_usage_txt_UID'>na</span>
 		</td>
 -->
-		<td width='100' align='right' class='small' valign='top'>
+		<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>