--- misc/xenconsole/index.php	2013/07/23 21:03:32	2030
+++ misc/xenconsole/index.php	2013/11/07 21:27:15	2069
@@ -83,8 +83,7 @@
 		openConsole(conurl,session,name);
 	});
 
-	$('#server_memory_usage').progressbar( );
-	$('#server_cpu_usage').progressbar( );
+	$('.bar').progressbar( );
 
 	$('#logo').click( function() {
 		refreshData();
@@ -283,13 +282,15 @@
 				}
 				vm.find('.os').text(' - ' + os);
 
-
+				cpuavg = cpuavg * 1;
 				vm.find('.cpu_graph').show();
-				vm.find('.cpu_graph').attr('src', 'usagebar.php?usage=' + cpuavg);
+				//vm.find('.cpu_graph').attr('src', 'usagebar.php?usage=' + cpuavg);
+				vm.find('.cpu_graph').progressbar( "value", 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('src', 'usagebar.php?usage=' + mempercent);
+				vm.find('.mem_graph').progressbar( "value", mempercent );
 				vm.find('.mem_graph').attr('title',  curmem + ' / ' + maxmem + ' MB' );
 			} else {
 				if (state == "Halted") {
@@ -417,6 +418,12 @@
 	background: #61B4F3;
 }
 
+.ui-progressbar {
+	border-style:solid;
+	border-width:1px;
+	border-color: #666666;
+}
+
 .bar {
 	width:  102px;
 	height:  16px;
@@ -519,7 +526,8 @@
 			<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> | 
+				<a href='#' onclick="doAction('hardreboot','<?php echo $uuid;?>','<?php echo $clean_name;?>')" >force reboot</a>
 			</span>
 			
 			<span class="actionstart" style='display:none'>			
@@ -531,12 +539,12 @@
 		</td>
 
 		<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>
+			<div class='cpu_graph bar'></div>
 			<img src='gfx/icon-cpu.png' style='vertical-align: middle;'>
 			<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>
+			<div class='mem_graph bar'></div>
 			<img src='gfx/icon-memory.png' style='vertical-align: middle;'>
 			<span class='vps_memory_usage_txt_UID'><?php echo format_memory($memory); ?></span>
 		</td>