From 1a6e1a44d86aab66446f7179e53c39583b734123 Mon Sep 17 00:00:00 2001
From: Levi <levinoelvm@gmail.com>
Date: Thu, 11 May 2017 00:38:53 -0500
Subject: [PATCH] fixing formatting

---
 hosting/opennebula_functions.py                 |  6 ------
 .../hosting/virtual_machine_detail.html         | 17 +++++++++--------
 hosting/templates/hosting/virtual_machines.html |  4 ++--
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/hosting/opennebula_functions.py b/hosting/opennebula_functions.py
index d9421d48..d2796ec8 100644
--- a/hosting/opennebula_functions.py
+++ b/hosting/opennebula_functions.py
@@ -174,9 +174,6 @@ class OpenNebulaManager:
     def get_vm_templates(self):
         template_pool = oca.VmTemplatePool(self.oneadmin_client)
         template_pool.info()
-        a = template_pool[0]
-        import pdb
-        pdb.set_trace()
         return template_pool
 
     def get_vm(self, email, vm_id):
@@ -206,9 +203,6 @@ class OpenNebulaManager:
 
         return vm_pool
 
-
-
-
 class HostingManageVMAdmin(admin.ModelAdmin):
     client = None
     oneadmin_client = None
diff --git a/hosting/templates/hosting/virtual_machine_detail.html b/hosting/templates/hosting/virtual_machine_detail.html
index e0909b24..06e5a53c 100644
--- a/hosting/templates/hosting/virtual_machine_detail.html
+++ b/hosting/templates/hosting/virtual_machine_detail.html
@@ -85,7 +85,7 @@
 								      <div class="col-md-3">
 								        <div class="well text-center">
 								        	<i class="fa fa-hdd-o" aria-hidden="true"></i> {% trans "Disk"%} <br/>
-								        	<span class="label label-success">{{virtual_machine.disk_size}} GiB</span>
+								        	<span class="label label-success">{{virtual_machine.disk_size|floatformat:2}} GiB</span>
 								        </div>
 								      </div>
 								    </div><!--/row-->    
@@ -150,14 +150,15 @@
 				            	<div class="row ">
 									<div class="col-md-12 inline-headers">
 										<h3>{% trans "Current status"%}</h3>
+
 										<div  class="pull-right space-above">
-											{% if virtual_machine.status == 'pending' %}
-												<span class="label label-warning"><strong>{{virtual_machine.get_status_display}}</strong></span>
-											{% elif  virtual_machine.status == 'online' %}
-												<span class="label label-success"><strong>{{virtual_machine.get_status_display}}</strong></span>
-											{% elif  virtual_machine.status == 'canceled'%}
-												<span class="label label-danger"><strong>{{virtual_machine.get_status_display}}</strong></span>
-											{% endif %}
+                                            {% if virtual_machine.state == 'ACTIVE' %}
+                                                <span class="h3 label label-success"><strong> {{virtual_machine.state}}</strong></span>
+                                            {% elif  virtual_machine.state == 'POWEROFF' %}
+                                                <span class="h3 label label-danger"><strong>{{virtual_machine.state}}</strong></span>
+                                            {% else %}
+                                                <span class="h3 label label-warning"><strong>{{virtual_machine.state}}</strong></span>
+                                            {% endif %}  
 										</div>
 									</div>
 				            	</div>
diff --git a/hosting/templates/hosting/virtual_machines.html b/hosting/templates/hosting/virtual_machines.html
index 2de8aa48..431dcb82 100644
--- a/hosting/templates/hosting/virtual_machines.html
+++ b/hosting/templates/hosting/virtual_machines.html
@@ -22,8 +22,8 @@
 				<tbody> 
 					{% for vm in vms_opennebula %}
 					<tr>
-						<td scope="row">{{vm.deploy_id}}</td> 
-						<td>{{vm.price}} CHF</td> 
+						<td scope="row">{{vm.name}}</td> 
+						<td>{{vm.price|floatformat:2}} CHF</td> 
 						<td>
                            
 							{% if vm.state == 'ACTIVE' %}