From b7ac4932a45e864f24a050e19d3fc66c74573968 Mon Sep 17 00:00:00 2001
From: Rosiak <sorenrosiak@gmail.com>
Date: Sat, 2 Jan 2016 01:32:43 +0100
Subject: [PATCH 1/4] Small changes to Virtual Machines page

---
 html/includes/print-vm.inc.php | 12 ++++++++----
 html/pages/device/vm.inc.php   | 10 +++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/html/includes/print-vm.inc.php b/html/includes/print-vm.inc.php
index e697300019..f068daf029 100644
--- a/html/includes/print-vm.inc.php
+++ b/html/includes/print-vm.inc.php
@@ -1,7 +1,5 @@
 <?php
-
 echo '<tr class="list">';
-
 echo '<td class="list">';
 
 if (getidbyname($vm['vmwVmDisplayName'])) {
@@ -12,7 +10,13 @@ else {
 }
 
 echo '</td>';
-echo '<td class="list">'.$vm['vmwVmState'].'</td>';
+
+if ($vm['vmwVmState'] == 'powered off') {
+    echo '<td class="list"><span class="label label-default">OFF</span></td>';
+}
+else {
+    echo '<td class="list"><span class="label label-success">ON</span></td>';
+}
 
 if ($vm['vmwVmGuestOS'] == 'E: tools not installed') {
     echo '<td class="box-desc">Unknown (VMware Tools not installed)</td>';
@@ -34,4 +38,4 @@ else {
     echo '<td class=list>'.sprintf('%.2f', $vm['vmwVmMemSize']).' MB</td>';
 }
 
-echo '<td class="list">'.$vm['vmwVmCpus'].' CPU</td>';
+echo '<td class="list">'.$vm['vmwVmCpus'].' CPU</td>';
\ No newline at end of file
diff --git a/html/pages/device/vm.inc.php b/html/pages/device/vm.inc.php
index 5dee674a55..63b05b9143 100644
--- a/html/pages/device/vm.inc.php
+++ b/html/pages/device/vm.inc.php
@@ -1,15 +1,11 @@
 <?php
-
-echo '<table border="0" cellspacing="0" cellpadding="5" width="100%" class="sortable"><tr class="tablehead"><th>Server Name</th><th>Power Status</th><th>Operating System</th><th>Memory</th><th>CPU</th></tr>';
-
+echo '<table border="0" cellspacing="0" cellpadding="5" width="100%" class="table table-condensed"><tr class="tablehead"><th>Server Name</th><th>Power Status</th><th>Operating System</th><th>Memory</th><th>CPU</th></tr>';
 $i = '1';
 
-foreach (dbFetchRows('SELECT * FROM vminfo WHERE device_id = ? ORDER BY vmwVmDisplayName', array($device['device_id'])) as $vm) {
+foreach (dbFetchRows('SELECT `vmwVmDisplayName`,`vmwVmState`,`vmwVmGuestOS`,`vmwVmMemSize`,`vmwVmCpus` FROM `vminfo` WHERE `device_id` = ? ORDER BY `vmwVmDisplayName', array($device['device_id'])) as $vm) {
     include 'includes/print-vm.inc.php';
-
     $i++;
 }
 
 echo '</table>';
-
-$pagetitle[] = 'Virtual Machines';
+$pagetitle[] = 'Virtual Machines';
\ No newline at end of file

From e3663fff3496fdb9fe5f8a548b33208a6d55a8d3 Mon Sep 17 00:00:00 2001
From: Rosiak <sorenrosiak@gmail.com>
Date: Sat, 2 Jan 2016 02:06:19 +0100
Subject: [PATCH 2/4] Set min-width

---
 html/includes/print-vm.inc.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/html/includes/print-vm.inc.php b/html/includes/print-vm.inc.php
index f068daf029..91b04b4953 100644
--- a/html/includes/print-vm.inc.php
+++ b/html/includes/print-vm.inc.php
@@ -12,10 +12,10 @@ else {
 echo '</td>';
 
 if ($vm['vmwVmState'] == 'powered off') {
-    echo '<td class="list"><span class="label label-default">OFF</span></td>';
+    echo '<td class="list"><span style="min-width:40px; display:inline-block;" class="label label-default">OFF</span></td>';
 }
 else {
-    echo '<td class="list"><span class="label label-success">ON</span></td>';
+    echo '<td class="list"><span style="min-width:40px; display:inline-block;" class="label label-success">ON</span></td>';
 }
 
 if ($vm['vmwVmGuestOS'] == 'E: tools not installed') {
@@ -38,4 +38,4 @@ else {
     echo '<td class=list>'.sprintf('%.2f', $vm['vmwVmMemSize']).' MB</td>';
 }
 
-echo '<td class="list">'.$vm['vmwVmCpus'].' CPU</td>';
\ No newline at end of file
+echo '<td class="list">'.$vm['vmwVmCpus'].' CPU</td>';

From e61f6cd2a81bc7be3b21ee906b4bbc45930b7719 Mon Sep 17 00:00:00 2001
From: Rosiak <sorenrosiak@gmail.com>
Date: Sat, 2 Jan 2016 23:34:55 +0100
Subject: [PATCH 3/4] re-add newline

---
 html/pages/device/vm.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/pages/device/vm.inc.php b/html/pages/device/vm.inc.php
index 63b05b9143..cfc03f165b 100644
--- a/html/pages/device/vm.inc.php
+++ b/html/pages/device/vm.inc.php
@@ -8,4 +8,4 @@ foreach (dbFetchRows('SELECT `vmwVmDisplayName`,`vmwVmState`,`vmwVmGuestOS`,`vmw
 }
 
 echo '</table>';
-$pagetitle[] = 'Virtual Machines';
\ No newline at end of file
+$pagetitle[] = 'Virtual Machines';

From 1ee694fcdb515dd14da42fd1d934c2be0f22c746 Mon Sep 17 00:00:00 2001
From: Rosiak <sorenrosiak@gmail.com>
Date: Sat, 2 Jan 2016 23:46:45 +0100
Subject: [PATCH 4/4] add missing backtick

---
 html/pages/device/vm.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/pages/device/vm.inc.php b/html/pages/device/vm.inc.php
index cfc03f165b..699fb92f36 100644
--- a/html/pages/device/vm.inc.php
+++ b/html/pages/device/vm.inc.php
@@ -2,7 +2,7 @@
 echo '<table border="0" cellspacing="0" cellpadding="5" width="100%" class="table table-condensed"><tr class="tablehead"><th>Server Name</th><th>Power Status</th><th>Operating System</th><th>Memory</th><th>CPU</th></tr>';
 $i = '1';
 
-foreach (dbFetchRows('SELECT `vmwVmDisplayName`,`vmwVmState`,`vmwVmGuestOS`,`vmwVmMemSize`,`vmwVmCpus` FROM `vminfo` WHERE `device_id` = ? ORDER BY `vmwVmDisplayName', array($device['device_id'])) as $vm) {
+foreach (dbFetchRows('SELECT `vmwVmDisplayName`,`vmwVmState`,`vmwVmGuestOS`,`vmwVmMemSize`,`vmwVmCpus` FROM `vminfo` WHERE `device_id` = ? ORDER BY `vmwVmDisplayName`', array($device['device_id'])) as $vm) {
     include 'includes/print-vm.inc.php';
     $i++;
 }