From 230a792d5c06706957722927f6215855651e32c1 Mon Sep 17 00:00:00 2001
From: Tlams <contact@thomasgsp.fr>
Date: Sun, 18 Feb 2018 17:51:09 +0000
Subject: [PATCH] Clean code & update

---
 code/web/www/pages/js/main.js   |  3 +-
 code/web/www/pages/nodes.php    | 47 +++++++++++----------------
 code/web/www/pages/storages.php | 37 +++++++---------------
 code/web/www/pages/vms.php      | 56 +++++++--------------------------
 4 files changed, 42 insertions(+), 101 deletions(-)

diff --git a/code/web/www/pages/js/main.js b/code/web/www/pages/js/main.js
index 077c9a1..b9abb6c 100755
--- a/code/web/www/pages/js/main.js
+++ b/code/web/www/pages/js/main.js
@@ -137,10 +137,9 @@ $(document).ready(function()
             
             var commandinfo = "The status available in the table is not dynamically update, you must wait the next cron rotate. <br /> You can play the status command to have an updated informations";
             box.html('<center> <img src="images/icon-load.gif"  height="60" width="60"></center>');
-            		
 
             $.ajax({
-                url: 'requires/pveaction.php?id='+id.val()+'&action=status',
+                url: 'requires/pveaction.php?id='+id.val()+'&action='+action.val(),
                 type : 'GET',
                 timeout: 32000,
                 success: function (data) {
diff --git a/code/web/www/pages/nodes.php b/code/web/www/pages/nodes.php
index 63ac28c..51f57b8 100755
--- a/code/web/www/pages/nodes.php
+++ b/code/web/www/pages/nodes.php
@@ -1,44 +1,35 @@
 <?php
 include(dirname(__DIR__).'/pages/includes/header.php');
 $html_HYPs = $html->List_HYPs($lastdate);
-
 ?>
 <div id="page-wrapper">
     <div class="row">
         <div class="col-lg-12">
-            <h1 class="page-header">HYPERVISORS</h1>
+            <h1 class="page-header">Nodes</h1>
         </div>
-        <div class="col-lg-12" id="List_Dates">
-
-
-        </div>
-        <!-- /.col-lg-12 -->
     </div>
-    <!-- /.row -->
     <div class="row">
         <div class="col-lg-12">
             <div class="panel panel-default">
-                <!-- /.panel-heading -->
                 <div class="panel-body" >
-
                     <table width="100%"  class="table table-striped table-bordered table-hover" id="dataTables-hypervisors" >
                         <thead class="thead-inverse">
                         <tr>
                             <th></th>
-                            <th data-priority="1">Cluster</th>
-                            <th data-priority="1">Name</th>
-                            <th data-priority="1">RAM(Used)</th>
-                            <th data-priority="1">RAM(Alloc/Total)</th>
-                            <th data-priority="1">CPU(Alloc/Total)</th>
-                            <th data-priority="1">STO(Used)*</th>
-                            <th data-priority="1">STO(Alloc/Total)</th>
-                            <th data-priority="1">Load</th>
-                            <th data-priority="1">Uptime</th>
-                            <th data-priority="1">Eligibility*</th>
-                            <th class="none" >Swap (used/total)</th>
-                            <th class="none" >PVE Version</th>
-                            <th class="none" >Kernel</th>
-                            <th class="none" >CPU - Informations</th>
+                            <th data-priority="1">cluster</th>
+                            <th data-priority="1">name</th>
+                            <th data-priority="1">ram (used)</th>
+                            <th data-priority="1">ram (alloc/total)</th>
+                            <th data-priority="1">cpu (alloc/total)</th>
+                            <th data-priority="1">storage (used)</th>
+                            <th data-priority="1">storage (alloc/total)</th>
+                            <th data-priority="1">load</th>
+                            <th data-priority="1">uptime</th>
+                            <th data-priority="1">eligibility</th>
+                            <th class="none" >swap (used/total)</th>
+                            <th class="none" >pve-version Version</th>
+                            <th class="none" >kernel</th>
+                            <th class="none" >cpu informations</th>
                         </tr>
                         </thead>
                         <?php echo $html_HYPs;  ?>
@@ -48,9 +39,9 @@ $html_HYPs = $html->List_HYPs($lastdate);
                 * The storage used is the largest.<br/>
                 * This is a score to evaluate the eligibility to receive news VM. Lower score are the best.
             </div>
-
         </div>
     </div>
-    <?php
-    include(dirname(__DIR__).'/pages/includes/footer.php');
-    ?>
+</div>
+<?php
+include(dirname(__DIR__).'/pages/includes/footer.php');
+?>
diff --git a/code/web/www/pages/storages.php b/code/web/www/pages/storages.php
index c12d7b0..d435553 100755
--- a/code/web/www/pages/storages.php
+++ b/code/web/www/pages/storages.php
@@ -1,52 +1,37 @@
 <?php
 include(dirname(__DIR__).'/pages/includes/header.php');
-
-// GEN HTML LIST Dates
-$html = new API_Gen_HTML;
-
 $html_sto = $html->List_STO($lastdate);
-
 ?>
 <div id="page-wrapper">
     <div class="row">
         <div class="col-lg-12">
             <h1 class="page-header">Storages</h1>
         </div>
-        <div class="col-lg-12" id="List_Dates">
-
-
-        </div>
-        <!-- /.col-lg-12 -->
     </div>
-    <!-- /.row -->
     <div class="row">
         <div class="col-lg-12">
             <div class="panel panel-default">
-
-                <!-- /.panel-heading -->
                 <div class="panel-body" >
-
                     <table width="100%"  class="display nowrap table table-striped table-bordered table-hover" id="dataTables-storages" >
                         <thead class="thead-inverse">
                         <tr>
                             <th> </th>
-                            <th data-priority="1">Node</th>
-                            <th data-priority="1">Name</th>
-                            <th data-priority="1">Total</th>
-                            <th data-priority="1">Allocate</th>
-                            <th data-priority="1">Available</th>
-                            <th data-priority="1">Used </th>
-                            <th class="none">Disks</th>
+                            <th data-priority="1">node</th>
+                            <th data-priority="1">name</th>
+                            <th data-priority="1">total</th>
+                            <th data-priority="1">allocate</th>
+                            <th data-priority="1">available</th>
+                            <th data-priority="1">used </th>
+                            <th class="none">disks</th>
                         </tr>
                         </thead>
                         <?php echo $html_sto;  ?>
                     </table>
                 </div>
-                <div id="result"></div>
             </div>
         </div>
     </div>
-    <!-- /#wrapper -->
-    <?php
-    include(dirname(__DIR__).'/pages/includes/footer.php');
-    ?>
+</div>
+<?php
+include(dirname(__DIR__).'/pages/includes/footer.php');
+?>
diff --git a/code/web/www/pages/vms.php b/code/web/www/pages/vms.php
index 54d2f61..b5f362d 100755
--- a/code/web/www/pages/vms.php
+++ b/code/web/www/pages/vms.php
@@ -1,75 +1,41 @@
 <?php
-
 include(dirname(__DIR__).'/pages/includes/header.php');
-
-
 $html_VMs = $html->List_VMs($lastdate);
-
 ?>
 <div id="page-wrapper">
     <div class="row">
         <div class="col-lg-12">
-            <h1 class="page-header">VM list</h1>
+            <h1 class="page-header">Instances (KVM/LXC)</h1>
         </div>
-        <div class="col-lg-12" id="List_Dates">
-
-
-        </div>
-        <!-- /.col-lg-12 -->
     </div>
-    <!-- /.row -->
     <div class="row">
         <div class="col-lg-12">
             <div class="panel panel-default">
-
-                <!-- /.panel-heading -->
-                <div class="result"></div>
                 <div class="panel-body" >
-
                     <table width="100%"  class="display nowrap table table-striped table-bordered table-hover dataTables-vm">
                         <thead class="thead-inverse">
                             <tr>
                                 <th></th>
-                                <th data-priority="1">Cluster</th>
-                                <th data-priority="1">Node</th>
-                                <th data-priority="1">Name</th>
+                                <th data-priority="1">cluster</th>
+                                <th data-priority="1">node</th>
+                                <th data-priority="1">name</th>
+                                <th data-priority="1">type</th>
                                 <th data-priority="1">vmid</th>
-                                <th data-priority="1">RAM</th>
-                                <th data-priority="1">CPU </th>
-                                <th data-priority="1">Disk</th>
-                                <th data-priority="1">Macs</th>
-                                <th data-priority="1">Uptime</th>
-                                <th data-priority="1">Status</th>
-                                <th data-priority="0">Actions</th>
+                                <th data-priority="1">ram</th>
+                                <th data-priority="1">cpu </th>
+                                <th data-priority="1">disk</th>
+                                <th data-priority="1">macs</th>
+                                <th data-priority="1">uptime</th>
+                                <th data-priority="1">status</th>
                             </tr>
                         </thead>
                         <?php echo $html_VMs;  ?>
                     </table>
                 </div>
-                <div class="result"></div>
             </div>
         </div>
     </div>
 </div>
-
-<!-- /#wrapper -->
-<div id="dialog-form" title="/!\ VM ACTION /!\" style="background-color: #8c8c8c;z-index: 3;">
-    <p class="validateTips">Proxmox authentification required.</p>
-    <form>
-        <fieldset>
-            <label for="name">Username:</label>
-            <input type="text" name="name" id="name" value="root@pam" class="text ui-widget-content ui-corner-all">
-            <br />
-            <label for="password">Password:</label>
-            <input type="password" name="password" id="password" value="" class="text ui-widget-content ui-corner-all">
-
-            <input type="hidden" name="action" id="action" value="">
-            <input type="hidden" name="vmid" id="vmid" value="">
-            <input type="hidden" name="node" id="node" value="">
-            <input type="submit" tabindex="-1" style="position:absolute; top:-1000px">
-        </fieldset>
-    </form>
-</div>
 <?php
 include(dirname(__DIR__).'/pages/includes/footer.php');
 ?>