From 43300c72269faa80983c38aa43a20ccd3f1f4d4f Mon Sep 17 00:00:00 2001
From: Arvind Tiwari <tiwariav@gmail.com>
Date: Mon, 18 Sep 2017 23:21:04 +0530
Subject: [PATCH] translations added, modal fixed

---
 hosting/locale/de/LC_MESSAGES/django.po       | 20 +++++++++------
 .../hosting/js/virtual_machine_detail.js      |  1 -
 .../hosting/virtual_machine_detail.html       | 25 +++++++++++--------
 3 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po
index 1c0f3faa..ca78a381 100644
--- a/hosting/locale/de/LC_MESSAGES/django.po
+++ b/hosting/locale/de/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-14 12:27+0000\n"
+"POT-Creation-Date: 2017-09-18 23:16+0530\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -575,6 +575,15 @@ msgstr "Bist Du sicher, dass Du Deine virtuelle Maschine beenden willst"
 msgid "OK"
 msgstr ""
 
+msgid "Your Virtual Machine"
+msgstr "Deine Maschinen Detail"
+
+msgid "was successfully terminated!"
+msgstr "wurde erfolgreich beendet!"
+
+msgid "Close"
+msgstr "Schliessen"
+
 msgid "Virtual Machines"
 msgstr "Virtuelle Maschinen"
 
@@ -645,12 +654,12 @@ msgstr "Kontaktiere den Data Center Light Support."
 msgid "Error terminating VM"
 msgstr "Fehler beenden VM"
 
-msgid "Virtual Machine Cancellation"
-msgstr "VM Kündigung"
-
 msgid "Terminated"
 msgstr "Beendet"
 
+msgid "Virtual Machine Cancellation"
+msgstr "VM Kündigung"
+
 #~ msgid "VM %(VM_ID)s terminated successfully"
 #~ msgstr "VM %(VM_ID)s erfolgreich beendet"
 
@@ -702,9 +711,6 @@ msgstr "Beendet"
 #~ msgid "Ipv6"
 #~ msgstr "IPv6"
 
-#~ msgid "Close"
-#~ msgstr "Schliessen"
-
 #~ msgid "Cancel"
 #~ msgstr "Beenden"
 
diff --git a/hosting/static/hosting/js/virtual_machine_detail.js b/hosting/static/hosting/js/virtual_machine_detail.js
index 711b486b..e611246b 100644
--- a/hosting/static/hosting/js/virtual_machine_detail.js
+++ b/hosting/static/hosting/js/virtual_machine_detail.js
@@ -40,7 +40,6 @@ function VMTerminateFail($container, data, text) {
 
 
 $(document).ready(function() {
-
     $('#confirm-cancel').on('click', '.btn-ok', function(e) {
         var url = $('#virtual_machine_cancel_form').attr('action');
         var $container = $('#terminate-VM');
diff --git a/hosting/templates/hosting/virtual_machine_detail.html b/hosting/templates/hosting/virtual_machine_detail.html
index 9d77c31d..08872c1e 100644
--- a/hosting/templates/hosting/virtual_machine_detail.html
+++ b/hosting/templates/hosting/virtual_machine_detail.html
@@ -96,24 +96,24 @@
 	</div>
 	<!-- Cancel Modal -->
 	<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-dialog">
+      <div class="modal-content">
 				<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-body">
 					<div class="modal-icon"><i class="fa fa-ban" aria-hidden="true"></i></div>
 					<h4 class="modal-title" id="ModalLabel">{% trans "Terminate your Virtual Machine" %}</h4>
 					<div class="modal-text">
 						<p>{% trans "Do you want to cancel your Virtual Machine" %} ?</p>
 						<p><strong>{{virtual_machine.name}}</strong></p>
 					</div>
-		            <div class="modal-footer">
-		                <a class="btn btn-danger btn-ok btn-wide">{% trans "OK" %}</a>
-		            </div>
-	            </div>
-	        </div>
-	    </div>
+          <div class="modal-footer">
+              <a class="btn btn-danger btn-ok btn-wide">{% trans "OK" %}</a>
+          </div>
+        </div>
+      </div>
+    </div>
 	</div>
 	<!-- / Cancel Modal -->
 	<!-- Success Modal -->
@@ -123,10 +123,13 @@
 				<div class="modal-header">
 				</div>
         <div class="modal-body">
-					<div class="modal-icon"><i class="fa fa-ban" aria-hidden="true"></i></div>
+					<div class="modal-icon"><i class="fa fa-check" aria-hidden="true"></i></div>
 					<h4 class="modal-title" id="ModalLabel">{% trans "Your Virtual Machine" %} {{vm.id}} {% trans "was successfully terminated!" %}</h4>
+					<div class="modal-text">
+						<p><strong>{{virtual_machine.name}}</strong></p>
+					</div>
           <div class="modal-footer">
-            <a href="{% url 'hosting:virtual_machines' %}"	class="btn btn-danger btn-wide">{% trans "Close" %}</a>
+            <a href="{% url 'hosting:virtual_machines' %}"	class="btn btn-success btn-wide">{% trans "Close" %}</a>
           </div>
         </div>
       </div>