From 8d812202025c73caf81d427efd3681d14a31b433 Mon Sep 17 00:00:00 2001
From: Levi <levinoelvm@gmail.com>
Date: Tue, 23 May 2017 11:48:02 -0500
Subject: [PATCH 1/2] changed virtual machine list

---
 datacenterlight/templates/datacenterlight/index.html  | 2 +-
 hosting/templates/hosting/create_virtual_machine.html | 2 +-
 hosting/templates/hosting/virtual_machine_detail.html | 2 +-
 hosting/templates/hosting/virtual_machines.html       | 6 ++++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/datacenterlight/templates/datacenterlight/index.html b/datacenterlight/templates/datacenterlight/index.html
index 953ce2c6..d097dec1 100755
--- a/datacenterlight/templates/datacenterlight/index.html
+++ b/datacenterlight/templates/datacenterlight/index.html
@@ -227,7 +227,7 @@
                                <h3>{% trans "VM hosting" %} </h3> 
                             </div>
                           <div class="price">
-                              <span>15CHF</span>
+                              <span>15CHF/month</span>
                           </div>
                           <div class="descriptions">
                               <div class="description">
diff --git a/hosting/templates/hosting/create_virtual_machine.html b/hosting/templates/hosting/create_virtual_machine.html
index ac6ae1d1..ac72046c 100644
--- a/hosting/templates/hosting/create_virtual_machine.html
+++ b/hosting/templates/hosting/create_virtual_machine.html
@@ -36,7 +36,7 @@
                                     CORE: {{config.cpu|floatformat}},
                                     RAM: {{config.memory|floatformat}} GiB, 
                                     SSD: {{config.disk_size|floatformat}} GiB,
-                                    PRICE: {{config.price|floatformat}} CHF
+                                    PRICE: {{config.price|floatformat}} CHF/Month
                                 </option>
                             {% endfor %}
                         </select>
diff --git a/hosting/templates/hosting/virtual_machine_detail.html b/hosting/templates/hosting/virtual_machine_detail.html
index 0b17878d..227cbd8f 100644
--- a/hosting/templates/hosting/virtual_machine_detail.html
+++ b/hosting/templates/hosting/virtual_machine_detail.html
@@ -98,7 +98,7 @@
 				            	<div class="row ">
 									<div class="col-md-12 inline-headers">
 										<h3>{% trans "Current pricing"%}</h3>
-										<span class="h3 pull-right"><strong>{{virtual_machine.price|floatformat}} CHF</strong>/mo</span> 
+										<span class="h3 pull-right"><strong>{{virtual_machine.price|floatformat}} CHF</strong>/month</span> 
 										<hr>
 									</div>
 				            	</div>
diff --git a/hosting/templates/hosting/virtual_machines.html b/hosting/templates/hosting/virtual_machines.html
index e7dee999..4a75ec24 100644
--- a/hosting/templates/hosting/virtual_machines.html
+++ b/hosting/templates/hosting/virtual_machines.html
@@ -26,7 +26,7 @@
 				<thead> 
 				<tr> 
 					<th>{% trans "ID"%}</th>
-					<th>{% trans "Amount"%}</th>
+					<th>{% trans "Ipv4"%}</th>
 					<th>{% trans "Status"%}</th>
 					<th></th>
 				</tr>
@@ -35,7 +35,9 @@
 					{% for vm in vms %}
 					<tr>
 						<td scope="row">{{vm.vm_id}}</td> 
-						<td>{{vm.price}} CHF</td> 
+                        {% if virtual_machine.ip %}
+						<td>{{vm.price}}</td> 
+                        {% endif %}
 						<td>
                            
 							{% if vm.state == 'ACTIVE' %}

From 60fc2890f11ab1b2f1331ce37d92973f82f1e0ec Mon Sep 17 00:00:00 2001
From: Levi <levinoelvm@gmail.com>
Date: Tue, 23 May 2017 11:50:02 -0500
Subject: [PATCH 2/2] added ipv4 and ipv6 to virtualmachine list

---
 hosting/templates/hosting/virtual_machines.html | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/hosting/templates/hosting/virtual_machines.html b/hosting/templates/hosting/virtual_machines.html
index 27a02297..b43e1b86 100644
--- a/hosting/templates/hosting/virtual_machines.html
+++ b/hosting/templates/hosting/virtual_machines.html
@@ -26,7 +26,8 @@
 				<thead> 
 				<tr> 
 					<th>{% trans "ID"%}</th>
-					<th>{% trans "Ipv4"%}</th>
+                    <th>{% trans "Ipv4"%}</th>
+					<th>{% trans "Ipv6"%}</th>
 					<th>{% trans "Status"%}</th>
 					<th></th>
 				</tr>
@@ -35,9 +36,12 @@
 					{% for vm in vms %}
 					<tr>
 						<td scope="row">{{vm.vm_id}}</td> 
-                        {% if virtual_machine.ip %}
-						<td>{{vm.price}}</td> 
+                        {% if virtual_machine.ipv6 
+						  <td>{{virtual_machine.ipv4}}</td> 
+                        
+                          <td>{{virtual_machine.ipv6}}</td> 
                         {% endif %}
+
 						<td>
                            
 							{% if vm.state == 'ACTIVE' %}