--- misc/xenconsole/index.php	2013/03/25 12:47:31	1952
+++ misc/xenconsole/index.php	2013/07/17 17:47:49	2014
@@ -1,5 +1,5 @@
 <?php
-include("config.php");
+require("config.php");
 
 function format_memory($size) {
   if (1024 > $size) {
@@ -46,24 +46,72 @@
 <html>
 <head>
 <title>XenServer::<?php echo $namelabel;?></title>
-<script type='text/javascript' src="jquery-1.8.2.min.js"></script>
+
+<link rel="stylesheet" type="text/css" href="jquery/theme/jquery-ui.css">
+<style>
+.ui-menu {
+	width: 200px;
+}
+</style>
+<script type='text/javascript' src="jquery/jquery-1.9.1.min.js"></script>
+<script type='text/javascript' src="jquery/jquery-ui-1.10.2.min.js"></script>
 
 <script type='text/javascript'>
+var menu = 0;
+var menu_uuid = '';
+
 $(document).ready( function() {
+	$("#menu").hide();
 	setInterval(refreshData, 60000);	
 	refreshData();
 	$('.console').click( function() {
 		var session = $(this).data('session');
 		var conurl = $(this).data('conurl');
 		var name = $(this).data('name');
-		console(conurl,session,name);
+		openConsole(conurl,session,name);
 	});
 
 	$('#logo').click( function() {
 		refreshData();
 	});
+
+	$('.settings').click( function(event) {
+		menu_uuid = $(this).attr('uuid');
+
+		$('#menu').menu( {
+			select: function(event2,ui) {
+					var action = $(ui.item).attr("action");
+					if (action == "memory") {
+						doAction("setMemory", menu_uuid, "");	
+					}
+					if (action == "cpu") {
+						doAction("setCPU", menu_uuid, "");	
+					}
+				},
+			create: function(event3,ui) {
+				menu = 1;
+				}
+			/*position: { 
+				my: "left", of: event 
+			}*/
+		});
+		$('#menu').show().position( {my: "left top", of: event} );
+		event.stopPropagation();
+	});
+
+	$(document).click( function(event) {
+		closeMenu();
+	});
+
 });
 
+function closeMenu() {
+	if (menu > 0) {
+		$("#menu").menu("destroy").hide();
+		menu = 0;
+	}
+}
+
 function refreshData() {
 	$("#logo").hide();	
 	$.get('ajaxdata.php', function(xml) {
@@ -102,11 +150,14 @@
 			var cpuavg = $(this).find('cpuavg').text();
 			var curmem = $(this).find('curmem').text();
 			var maxmem = $(this).find('maxmem').text();
+			var cpus = $(this).find('cpus').text();
 
 			var mempercent = Math.round( (curmem*100) / maxmem );
 
-			name = name.replace(" ", "_");
-			name = name.replace(".", "_");
+			name = name.replace(/ /g, "_");
+			name = name.replace(/\./g, "_");
+			name = name.replace(/\(/g, "_");
+			name = name.replace(/\)/g, "_");
 			
 			var id = "#vm_" + name;
 
@@ -117,6 +168,7 @@
 			}
 
 			vm.find('.vps_memory_usage_txt_UID').text( maxmem + " MB");
+			vm.find('.vps_cpu_usage_txt_UID').text( cpus + " VCPU");
 
 			if (state == "Running") {
 				vm.find('.state').css("background-image", "url('gfx/vps_topgreen.png')");
@@ -126,6 +178,7 @@
 				vm.find('.console').data('conurl', conurl);
 				vm.find('.console').data('session', session);
 				vm.find('.console').data('name', name);
+				vm.find('.settings').hide();
 				vm.find('.actionstop').show();
 				vm.find('.actionstart').hide();
 				vm.find('.os').text(' - ' + os);
@@ -148,6 +201,7 @@
 
 				vm.find('.network').hide();
 				vm.find('.console').hide();
+				vm.find('.settings').show();
 				vm.find('.actionstop').hide();
 				vm.find('.actionstart').show();
 				vm.find('.cpu_graph').hide();
@@ -171,8 +225,14 @@
 
 	if (action == "setMemory") {
 		val = prompt("Set memory target");
+		val *= (1024*1024);
+		if (val == "" || val == null) {
+			return;
+		}
+	}
+	if (action == "setCPU") {
+		val = prompt("Set CPU count");
 		if (val == "" || val == null) {
-			alert("" + val);
 			return;
 		}
 	}
@@ -188,7 +248,7 @@
 	});
 }
 
-function console(url, session, name) {
+function openConsole(url, session, name) {
 	if (url == '')
 		return;
 
@@ -284,6 +344,8 @@
 
 	$clean_name = str_replace(" ", "_", $name);
 	$clean_name = str_replace(".", "_", $clean_name);
+	$clean_name = str_replace("(", "_", $clean_name);
+	$clean_name = str_replace(")", "_", $clean_name);
 	
 
 	foreach ($vm["VBDs"] as $vbds) {
@@ -307,6 +369,9 @@
 				<a href='#' style='display:none;' class='console'>
 					<img src='gfx/icon-terminal.png' style='vertical-align: middle;'>
 				</a>
+				<a href='#' style='display:none;' class='settings' uuid='<?php echo $uuid;?>'>
+					<img src='gfx/icon-settings16.png' style='vertical-align: middle;'>
+				</a>
 			</td>
 		</tr>
 
@@ -317,16 +382,13 @@
 			<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> | 
-				set memory
+				<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 | 
-
-				<a href='#' onclick="doAction('setMemory','<?php echo $uuid;?>','<?php echo $clean_name;?>')" >set memory</a> 
+				force shutdown
 			</span>
 
 		</td>
@@ -334,7 +396,7 @@
 		<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>
+			<span class='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>
@@ -359,5 +421,26 @@
 
 <?PHP } ?>
 </td></tr></table>
+
+<br>
+
+<ul id="menu">
+	<li action="memory"><a href="#">Set Memory Size</a></li>
+	<li action="cpu"><a href="#">Set CPU Count</a></li>
+
+
+<!--	<li><a href="#">Item 3</a>
+		<ul>
+			<li><a href="#">Item 3-1</a></li>
+			<li><a href="#">Item 3-2</a></li>
+			<li><a href="#">Item 3-3</a></li>
+			<li><a href="#">Item 3-4</a></li>
+			<li><a href="#">Item 3-5</a></li>
+		</ul>
+	</li>
+	<li><a href="#">Item 4</a></li>
+	<li><a href="#">Item 5</a></li>-->
+</ul>
+
 </body></html>
 
