From b9d32afc67746914cd3664003fa3526e896bd515 Mon Sep 17 00:00:00 2001
From: Mondi Geetha <mondi.geetha@gmail.com>
Date: Mon, 3 Jul 2017 22:32:34 +0530
Subject: [PATCH 1/3] Changed some styles for modal popup

---
 hosting/static/hosting/css/commons.css | 68 +++++++++++++++++++++++++-
 1 file changed, 67 insertions(+), 1 deletion(-)

diff --git a/hosting/static/hosting/css/commons.css b/hosting/static/hosting/css/commons.css
index 78bfd827..74d154d1 100644
--- a/hosting/static/hosting/css/commons.css
+++ b/hosting/static/hosting/css/commons.css
@@ -57,4 +57,70 @@
 	    width: 90%;
 	}
 }
-
+/***********Styles for Model********************/
+.modal-content {
+    border-radius: 0px;
+    font-family: 'Lato', sans-serif;
+    width: 100%;
+	float: left;
+}
+.close {
+    font-size: 50px;
+    font-weight: 300;
+    }
+.modal-header {
+    border-bottom: 0px solid #e5e5e5;
+    padding: 0px 15px;
+    width: 100%;
+	float: left;
+	}
+.modal-body {
+    text-align: center;
+    width: 100%;
+	float: left;
+	padding: 0px 30px 15px 30px;
+}
+.modal-body .modal-icon i {
+    font-size: 50px;
+    font-weight: 100;
+    color: #999;
+}
+.modal-title {
+    margin: 0;
+    line-height: 1.42857143;
+    font-size: 22px;
+    padding: 20px 0;
+    font-family: 'Lato', sans-serif;
+}
+.modal-footer {
+    border-top: 0px solid #e5e5e5;
+    width: 100%;
+	float: left;
+	text-align: center;
+	padding: 30px 15px;
+}
+@media (min-width: 1300px) {
+    .modal-dialog {
+    top: 30%;
+    width: 25%;
+	}
+}
+@media (max-width: 1299px) {
+    .modal-dialog {
+    top: 20%;
+    width: 43%;
+	}
+}
+@media (max-width: 900px) {
+    .modal-dialog {
+    top: 20%;
+    width: 50%;
+	}
+}
+@media (max-width: 767px) {
+    .modal-dialog {
+    top: 30%;
+    width: 90%;
+    margin: 0 auto !important;
+	}
+}

From 49ae9adcb849a30c28142fa4790a1e8bf8545926 Mon Sep 17 00:00:00 2001
From: Mondi Geetha <mondi.geetha@gmail.com>
Date: Mon, 3 Jul 2017 22:34:39 +0530
Subject: [PATCH 2/3] Added icons for modals

---
 hosting/templates/hosting/orders.html                 |  3 ++-
 hosting/templates/hosting/user_keys.html              |  1 +
 hosting/templates/hosting/virtual_machine_detail.html | 11 ++++++++---
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/hosting/templates/hosting/orders.html b/hosting/templates/hosting/orders.html
index 99aab23e..7adc4cd3 100644
--- a/hosting/templates/hosting/orders.html
+++ b/hosting/templates/hosting/orders.html
@@ -52,6 +52,7 @@
                                             </button>
                                         </div>
                                         <div class="modal-body">
+                                         <div class="modal-icon"><i class="fa fa-question" aria-hidden="true"></i></div>
                                             <h4 class="modal-title" id="ModalLabel">{% trans "Do You want to delete your order?"%}</h4>
 
                                             <form method="post"
@@ -62,7 +63,7 @@
                                                             data-dismiss="modal">
                                                         {% trans "Close"%}
                                                     </button>
-                                                    <button type="submit" class="btn btn-primary">{% trans "Delete"%}
+                                                    <button type="submit" class="btn btn-danger btn-ok">{% trans "Delete"%}
                                                     </button>
                                                 </div>
                                             </form>
diff --git a/hosting/templates/hosting/user_keys.html b/hosting/templates/hosting/user_keys.html
index 1dc45e54..30525798 100644
--- a/hosting/templates/hosting/user_keys.html
+++ b/hosting/templates/hosting/user_keys.html
@@ -53,6 +53,7 @@
                     </button>
                 </div>
                 <div class="modal-body">
+                 <div class="modal-icon"><i class="fa fa-question" aria-hidden="true"></i></div>
                     <h4 class="modal-title" id="ModalLabel">{% trans "Do You want to delete this key?"%}</h4>
 
                     <form method="post" action="{% url 'hosting:delete_ssh_key' user_key.id %}">
diff --git a/hosting/templates/hosting/virtual_machine_detail.html b/hosting/templates/hosting/virtual_machine_detail.html
index 441d6260..07dbfae6 100644
--- a/hosting/templates/hosting/virtual_machine_detail.html
+++ b/hosting/templates/hosting/virtual_machine_detail.html
@@ -159,10 +159,15 @@
 									<div class="modal fade" id="confirm-cancel" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
 									    <div class="modal-dialog">
 									        <div class="modal-content">
-									            <div class="modal-header">
-									                {% trans "Terminate your Virtual Machine"%}
-									            </div>
+												<div class="modal-header">
+													<button type="button" class="close" data-dismiss="modal"
+															aria-label="Confirm"><span
+															aria-hidden="true">&times;</span>
+													</button>
+												</div>
 									            <div class="modal-body">
+													<div class="modal-icon"><i class="fa fa-question" aria-hidden="true"></i></div>
+													<h4 class="modal-title" id="ModalLabel">{% trans "Terminate your Virtual Machine"%}</h4>
 									                {% trans "Are you sure do you want to cancel your Virtual Machine "%} {{virtual_machine.name}} ?
 									            </div>
 									            <div class="modal-footer">

From 8aa7ffa2d3e3357b46dfca78c96aca26c805b215 Mon Sep 17 00:00:00 2001
From: Mondi Geetha <mondi.geetha@gmail.com>
Date: Tue, 4 Jul 2017 00:56:49 +0530
Subject: [PATCH 3/3] Added Heading to Modals and styles

---
 hosting/static/hosting/css/commons.css                |  8 ++++++--
 hosting/templates/hosting/orders.html                 |  8 ++++----
 hosting/templates/hosting/user_keys.html              | 10 +++++-----
 hosting/templates/hosting/virtual_machine_detail.html |  4 ++--
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/hosting/static/hosting/css/commons.css b/hosting/static/hosting/css/commons.css
index 74d154d1..568fc867 100644
--- a/hosting/static/hosting/css/commons.css
+++ b/hosting/static/hosting/css/commons.css
@@ -88,10 +88,14 @@
 .modal-title {
     margin: 0;
     line-height: 1.42857143;
-    font-size: 22px;
-    padding: 20px 0;
+    font-size: 25px;
+    padding: 0;
     font-family: 'Lato', sans-serif;
 }
+.modal-text {
+    padding-top: 20px;
+    font-size: 16px;
+}
 .modal-footer {
     border-top: 0px solid #e5e5e5;
     width: 100%;
diff --git a/hosting/templates/hosting/orders.html b/hosting/templates/hosting/orders.html
index 7adc4cd3..afe8f297 100644
--- a/hosting/templates/hosting/orders.html
+++ b/hosting/templates/hosting/orders.html
@@ -53,16 +53,16 @@
                                         </div>
                                         <div class="modal-body">
                                          <div class="modal-icon"><i class="fa fa-question" aria-hidden="true"></i></div>
-                                            <h4 class="modal-title" id="ModalLabel">{% trans "Do You want to delete your order?"%}</h4>
-
+                                            <h4 class="modal-title" id="ModalLabel">{% trans "Cancel Order"%}</h4>
+                                               <p class="modal-text">{% trans "Do you want to delete your order?"%}</p>
                                             <form method="post"
                                                   action="{% url 'hosting:delete_order' order.id %}">
                                                 {% csrf_token %}
                                                 <div class="modal-footer">
-                                                    <button type="button" class="btn btn-default"
+                                                    <!--button type="button" class="btn btn-default"
                                                             data-dismiss="modal">
                                                         {% trans "Close"%}
-                                                    </button>
+                                                    </button-->
                                                     <button type="submit" class="btn btn-danger btn-ok">{% trans "Delete"%}
                                                     </button>
                                                 </div>
diff --git a/hosting/templates/hosting/user_keys.html b/hosting/templates/hosting/user_keys.html
index 30525798..f4db83d2 100644
--- a/hosting/templates/hosting/user_keys.html
+++ b/hosting/templates/hosting/user_keys.html
@@ -54,16 +54,16 @@
                 </div>
                 <div class="modal-body">
                  <div class="modal-icon"><i class="fa fa-question" aria-hidden="true"></i></div>
-                    <h4 class="modal-title" id="ModalLabel">{% trans "Do You want to delete this key?"%}</h4>
-
+                  <h4 class="modal-title" id="ModalLabel">{% trans "Delete SSH Key"%}</h4>
+                     <p class="modal-text">{% trans "Do You want to delete this key?"%}</p>
                     <form method="post" action="{% url 'hosting:delete_ssh_key' user_key.id %}">
                         {% csrf_token %}
                         <div class="modal-footer">
-                            <button type="button" class="btn btn-default"
+                            <!--button type="button" class="btn btn-default"
                                     data-dismiss="modal">
                                 {% trans "Close"%}
-                            </button>
-                            <button type="submit" class="btn btn-primary">{% trans "Delete"%}
+                            </button-->
+                            <button type="submit" class="btn btn-danger">{% trans "Delete"%}
                             </button>
                         </div>
                     </form>
diff --git a/hosting/templates/hosting/virtual_machine_detail.html b/hosting/templates/hosting/virtual_machine_detail.html
index 07dbfae6..fdedac30 100644
--- a/hosting/templates/hosting/virtual_machine_detail.html
+++ b/hosting/templates/hosting/virtual_machine_detail.html
@@ -168,10 +168,10 @@
 									            <div class="modal-body">
 													<div class="modal-icon"><i class="fa fa-question" aria-hidden="true"></i></div>
 													<h4 class="modal-title" id="ModalLabel">{% trans "Terminate your Virtual Machine"%}</h4>
-									                {% trans "Are you sure do you want to cancel your Virtual Machine "%} {{virtual_machine.name}} ?
+									                <p class="modal-text">{% trans "Are you sure do you want to cancel your Virtual Machine "%} {{virtual_machine.name}} ?</p>
 									            </div>
 									            <div class="modal-footer">
-									                <button type="button" class="btn btn-default" data-dismiss="modal">{% trans "Cancel"%}</button>
+									                <!--button type="button" class="btn btn-default" data-dismiss="modal">{% trans "Cancel"%}</button-->
 									                <a class="btn btn-danger btn-ok">OK</a>
 									            </div>
 									        </div>