From 7039ccd3b9ba9f5855b2e3104621ad902afef772 Mon Sep 17 00:00:00 2001
From: Arvind Tiwari <tiwariav@gmail.com>
Date: Thu, 28 Sep 2017 02:09:03 +0530
Subject: [PATCH 1/3] modal btn color changed

---
 hosting/templates/hosting/order_detail.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hosting/templates/hosting/order_detail.html b/hosting/templates/hosting/order_detail.html
index 08b52770..59b0bcd6 100644
--- a/hosting/templates/hosting/order_detail.html
+++ b/hosting/templates/hosting/order_detail.html
@@ -173,7 +173,7 @@
                         {% trans "Hold tight, we are processing your request" %}
                     </div>
                     <div class="modal-footer">
-                        <a id="createvm-modal-done-btn" class="btn btn-danger btn-ok btn-wide hide" href="{% url 'hosting:virtual_machines' %}">{% trans "OK" %}</a>
+                        <a id="createvm-modal-done-btn" class="btn btn-success btn-ok btn-wide hide" href="{% url 'hosting:virtual_machines' %}">{% trans "OK" %}</a>
                         <button id="createvm-modal-close-btn" type="button" class="btn btn-danger btn-ok btn-wide hide" data-dismiss="modal" aria-label="create-vm-close">{% trans "Close" %}</button>
                     </div>
                 </div>

From df67fa3333c77976ae823641413ecd28c33f5018 Mon Sep 17 00:00:00 2001
From: Arvind Tiwari <tiwariav@gmail.com>
Date: Thu, 28 Sep 2017 02:39:55 +0530
Subject: [PATCH 2/3] period added

---
 hosting/templates/hosting/order_detail.html | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/hosting/templates/hosting/order_detail.html b/hosting/templates/hosting/order_detail.html
index 59b0bcd6..462593f8 100644
--- a/hosting/templates/hosting/order_detail.html
+++ b/hosting/templates/hosting/order_detail.html
@@ -98,14 +98,12 @@
                 </p>
                 <div class="row">
                     <div class="col-sm-6">
-                        {% comment %}
                         <p>
-                            <span>{% trans "Period" %}</span>
-                            <span class="pull-right">{{}}</span>
+                            <span>{% trans "Period" %}: </span>
+                            <span>{{ vm.created_at|date:'Y/m/d' }} - {% if vm.terminated_at %}{{ vm.terminated_at|date:'Y/m/d' }}{% else %}{% now 'Y/m/d' %}{% endif %}</span>
                         </p>
-                        {% endcomment %}
                         <p>
-                            <span>{% trans "Cores" %}</span>
+                            <span>{% trans "Cores" %}: </span>
                             {% if vm.cores %}
                                 <span class="pull-right">{{vm.cores|floatformat}}</span>
                             {% else %}
@@ -113,11 +111,11 @@
                             {% endif %}
                         </p>
                         <p>
-                            <span>{% trans "Memory" %}</span>
+                            <span>{% trans "Memory" %}: </span>
                             <span class="pull-right">{{vm.memory}} GB</span>
                         </p>
                         <p>
-                            <span>{% trans "Disk space" %}</span>
+                            <span>{% trans "Disk space" %}: </span>
                             <span class="pull-right">{{vm.disk_size}} GB</span>
                         </p>
                         <p>

From 3ba1f191a302d4226ad44a054846ac580e4d9547 Mon Sep 17 00:00:00 2001
From: Arvind Tiwari <tiwariav@gmail.com>
Date: Thu, 28 Sep 2017 02:47:58 +0530
Subject: [PATCH 3/3] show period if dates exist

---
 hosting/templates/hosting/order_detail.html | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/hosting/templates/hosting/order_detail.html b/hosting/templates/hosting/order_detail.html
index 462593f8..dc8de901 100644
--- a/hosting/templates/hosting/order_detail.html
+++ b/hosting/templates/hosting/order_detail.html
@@ -98,10 +98,12 @@
                 </p>
                 <div class="row">
                     <div class="col-sm-6">
-                        <p>
-                            <span>{% trans "Period" %}: </span>
-                            <span>{{ vm.created_at|date:'Y/m/d' }} - {% if vm.terminated_at %}{{ vm.terminated_at|date:'Y/m/d' }}{% else %}{% now 'Y/m/d' %}{% endif %}</span>
-                        </p>
+                        {% if vm.created_at %}
+                            <p>
+                                <span>{% trans "Period" %}: </span>
+                                <span>{{ vm.created_at|date:'Y/m/d' }} - {% if vm.terminated_at %}{{ vm.terminated_at|date:'Y/m/d' }}{% else %}{% now 'Y/m/d' %}{% endif %}</span>
+                            </p>
+                        {% endif %}
                         <p>
                             <span>{% trans "Cores" %}: </span>
                             {% if vm.cores %}