From 929e7ead1c0c9cdc9e9213e572a612ae03caba64 Mon Sep 17 00:00:00 2001 From: PCoder Date: Wed, 22 Aug 2018 22:36:17 +0200 Subject: [PATCH 01/11] Add vm-terminate-warning style --- hosting/static/hosting/css/virtual-machine.css | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/hosting/static/hosting/css/virtual-machine.css b/hosting/static/hosting/css/virtual-machine.css index 1c50776d..5255061c 100644 --- a/hosting/static/hosting/css/virtual-machine.css +++ b/hosting/static/hosting/css/virtual-machine.css @@ -183,6 +183,13 @@ margin-top: 25px; } +.vm-terminate-warning { + letter-spacing: 0.6px; + font-size: 12px; + font-weight: 400; + color: #373636; +} + .vm-contact-us { margin: 25px 0 30px; /* text-align: center; */ From 7e790e702740f25ae66e6ff94316f157918b83e7 Mon Sep 17 00:00:00 2001 From: PCoder Date: Wed, 22 Aug 2018 22:36:29 +0200 Subject: [PATCH 02/11] Add warning div --- hosting/templates/hosting/virtual_machine_detail.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hosting/templates/hosting/virtual_machine_detail.html b/hosting/templates/hosting/virtual_machine_detail.html index 68894851..7ee26211 100644 --- a/hosting/templates/hosting/virtual_machine_detail.html +++ b/hosting/templates/hosting/virtual_machine_detail.html @@ -72,6 +72,10 @@ {% trans "Sorry, there was an unexpected error. Kindly retry." %} {% endif %} +
+

{% trans "Attention:" %}

+

{% trans "terminating VM can not be reverted." %}

+
From 1e5cf082735dfacbc72a9163c10966d4942896e6 Mon Sep 17 00:00:00 2001 From: PCoder Date: Wed, 22 Aug 2018 22:47:49 +0200 Subject: [PATCH 03/11] Move the warning to the bottom --- hosting/templates/hosting/virtual_machine_detail.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hosting/templates/hosting/virtual_machine_detail.html b/hosting/templates/hosting/virtual_machine_detail.html index 7ee26211..6af9fb94 100644 --- a/hosting/templates/hosting/virtual_machine_detail.html +++ b/hosting/templates/hosting/virtual_machine_detail.html @@ -72,12 +72,12 @@ {% trans "Sorry, there was an unexpected error. Kindly retry." %} {% endif %} -
-

{% trans "Attention:" %}

-

{% trans "terminating VM can not be reverted." %}

-
+
+

{% trans "Attention:" %}

+

{% trans "terminating VM can not be reverted." %}

+
From 07837c8752329ab6e7e2854511303b42eb19c84f Mon Sep 17 00:00:00 2001 From: PCoder Date: Wed, 22 Aug 2018 22:51:22 +0200 Subject: [PATCH 04/11] Reduce bottom padding --- hosting/static/hosting/css/virtual-machine.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosting/static/hosting/css/virtual-machine.css b/hosting/static/hosting/css/virtual-machine.css index 5255061c..440b38a2 100644 --- a/hosting/static/hosting/css/virtual-machine.css +++ b/hosting/static/hosting/css/virtual-machine.css @@ -142,7 +142,7 @@ } .vm-vmid { - padding: 50px 0 70px; + padding: 50px 0 35px; text-align: center; } From b7ff51962417022339a53c327f5984f7f473880e Mon Sep 17 00:00:00 2001 From: PCoder Date: Wed, 22 Aug 2018 22:54:49 +0200 Subject: [PATCH 05/11] Reduce bottom padding further by 2px --- hosting/static/hosting/css/virtual-machine.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosting/static/hosting/css/virtual-machine.css b/hosting/static/hosting/css/virtual-machine.css index 440b38a2..fcbaa301 100644 --- a/hosting/static/hosting/css/virtual-machine.css +++ b/hosting/static/hosting/css/virtual-machine.css @@ -142,7 +142,7 @@ } .vm-vmid { - padding: 50px 0 35px; + padding: 50px 0 33px; text-align: center; } From 4425aa7c88735a3c4b484b321225b527d849a12a Mon Sep 17 00:00:00 2001 From: PCoder Date: Wed, 22 Aug 2018 22:57:32 +0200 Subject: [PATCH 06/11] Change modal text --- hosting/templates/hosting/virtual_machine_detail.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosting/templates/hosting/virtual_machine_detail.html b/hosting/templates/hosting/virtual_machine_detail.html index 6af9fb94..0dfc2cbf 100644 --- a/hosting/templates/hosting/virtual_machine_detail.html +++ b/hosting/templates/hosting/virtual_machine_detail.html @@ -109,7 +109,7 @@
-

{% trans "Do you want to cancel your Virtual Machine" %} ?

+

{% trans "Terminated VM can not be revived and will not be refunded. Do you want to terminate your VM?" %} ?

{{virtual_machine.name}}

From 29172a9df7f544b2ae946cb6eef155630a500086 Mon Sep 17 00:00:00 2001 From: PCoder Date: Wed, 22 Aug 2018 23:06:20 +0200 Subject: [PATCH 07/11] Use a separate class for warning block --- hosting/static/hosting/css/virtual-machine.css | 6 +++++- hosting/templates/hosting/virtual_machine_detail.html | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/hosting/static/hosting/css/virtual-machine.css b/hosting/static/hosting/css/virtual-machine.css index fcbaa301..d3f17d64 100644 --- a/hosting/static/hosting/css/virtual-machine.css +++ b/hosting/static/hosting/css/virtual-machine.css @@ -142,10 +142,14 @@ } .vm-vmid { - padding: 50px 0 33px; + padding: 50px 0 70px; text-align: center; } +.vm-vmid-with-warning { + padding: 50px 0 33px !important; +} + .vm-vmid .alert { margin-top: 15px; margin-bottom: -60px; diff --git a/hosting/templates/hosting/virtual_machine_detail.html b/hosting/templates/hosting/virtual_machine_detail.html index 0dfc2cbf..a549aebf 100644 --- a/hosting/templates/hosting/virtual_machine_detail.html +++ b/hosting/templates/hosting/virtual_machine_detail.html @@ -51,7 +51,7 @@

{% trans "Status" %}

-
+
{% trans "Your VM is" %}
{% if virtual_machine.state == 'PENDING' %} From af78631ec86f1bccf4d7902e3b65d1ca2b4b072a Mon Sep 17 00:00:00 2001 From: PCoder Date: Wed, 22 Aug 2018 23:13:49 +0200 Subject: [PATCH 08/11] Update hosting's django.po --- hosting/locale/de/LC_MESSAGES/django.po | 32 ++++++++++++++++--------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po index 95515355..ac324ccd 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: 2018-07-05 23:15+0000\n" +"POT-Creation-Date: 2018-08-22 21:11+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -290,9 +290,8 @@ msgid "" "You are not making any payment yet. After placing your order, you will be " "taken to the Submit Payment Page." msgstr "" -"Es wird noch keine Bezahlung vorgenommen. Die Bezahlung wird erst " -"ausgelöst, nachdem Du die Bestellung auf der nächsten Seite bestätigt " -"hast." +"Es wird noch keine Bezahlung vorgenommen. Die Bezahlung wird erst ausgelöst, " +"nachdem Du die Bestellung auf der nächsten Seite bestätigt hast." msgid "SUBMIT" msgstr "ABSENDEN" @@ -469,9 +468,9 @@ msgid "" "database." msgstr "" "Bitte wähle eine der zuvor genutzten Kreditkarten oder gib Deine " -"Kreditkartendetails unten an. Die Bezahlung wird über " -"Stripe abgewickelt. " -"Wir speichern Deine Kreditkartendetails nicht in unserer Datenbank." +"Kreditkartendetails unten an. Die Bezahlung wird über Stripe abgewickelt. Wir speichern Deine " +"Kreditkartendetails nicht in unserer Datenbank." msgid "" "Please fill in your credit card information below. We are using Date: Wed, 22 Aug 2018 23:16:26 +0200 Subject: [PATCH 09/11] Remove an unnecessary question mark --- hosting/templates/hosting/virtual_machine_detail.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosting/templates/hosting/virtual_machine_detail.html b/hosting/templates/hosting/virtual_machine_detail.html index a549aebf..060a21be 100644 --- a/hosting/templates/hosting/virtual_machine_detail.html +++ b/hosting/templates/hosting/virtual_machine_detail.html @@ -109,7 +109,7 @@
-

{% trans "Terminated VM can not be revived and will not be refunded. Do you want to terminate your VM?" %} ?

+

{% trans "Terminated VM can not be revived and will not be refunded. Do you want to terminate your VM?" %}

{{virtual_machine.name}}

From e1263ce9b39c807e06b87c9c976cc6bc94290bb9 Mon Sep 17 00:00:00 2001 From: PCoder Date: Thu, 23 Aug 2018 19:40:16 +0200 Subject: [PATCH 10/11] Add DE translation fo #5487 --- hosting/locale/de/LC_MESSAGES/django.po | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po index ac324ccd..a76067bd 100644 --- a/hosting/locale/de/LC_MESSAGES/django.po +++ b/hosting/locale/de/LC_MESSAGES/django.po @@ -631,10 +631,10 @@ msgstr "" "Versuche es doch bitte noch einmal." msgid "Attention:" -msgstr "" +msgstr "Achtung:" msgid "terminating VM can not be reverted." -msgstr "" +msgstr "Terminierung kann nicht rückgängig gemacht werden." msgid "Something doesn't work?" msgstr "Etwas funktioniert nicht?" @@ -652,6 +652,8 @@ msgid "" "Terminated VM can not be revived and will not be refunded. Do you want to " "terminate your VM?" msgstr "" +"Terminierte VMs können nicht wiederhergestellt oder erstattet werden. " +"Möchtest du die VM terminieren?" #, python-format msgid "" From d7f171d710714ba225cc33f43d52de9217010637 Mon Sep 17 00:00:00 2001 From: PCoder Date: Fri, 24 Aug 2018 11:07:50 +0200 Subject: [PATCH 11/11] Change DE translation (beenden instead of terminieren) --- hosting/locale/de/LC_MESSAGES/django.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po index a76067bd..e5cd16f2 100644 --- a/hosting/locale/de/LC_MESSAGES/django.po +++ b/hosting/locale/de/LC_MESSAGES/django.po @@ -634,7 +634,7 @@ msgid "Attention:" msgstr "Achtung:" msgid "terminating VM can not be reverted." -msgstr "Terminierung kann nicht rückgängig gemacht werden." +msgstr "Das Beenden kann nicht rückgängig gemacht werden." msgid "Something doesn't work?" msgstr "Etwas funktioniert nicht?" @@ -652,8 +652,8 @@ msgid "" "Terminated VM can not be revived and will not be refunded. Do you want to " "terminate your VM?" msgstr "" -"Terminierte VMs können nicht wiederhergestellt oder erstattet werden. " -"Möchtest du die VM terminieren?" +"Beendete VMs können nicht wiederhergestellt oder erstattet werden. " +"Möchtest du die VM beenden?" #, python-format msgid ""