From 313b2b2f576a741f3fa2e161ad24e1f1e02083d7 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Sat, 23 Sep 2017 23:47:25 +0530 Subject: [PATCH 1/8] fixed vreate vm error --- hosting/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosting/views.py b/hosting/views.py index d7c4c168..e0fe041e 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -17,7 +17,7 @@ from django.shortcuts import redirect, render from django.utils.http import urlsafe_base64_decode from django.utils.safestring import mark_safe from django.utils.translation import ugettext_lazy as _ -from django.utils.translation import ugettext +from django.utils.translation import ugettext, get_language from django.views.generic import ( View, CreateView, FormView, ListView, DetailView, DeleteView, TemplateView, UpdateView From f35c3dbc10f190182d57042553a9c00a36187795 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Tue, 26 Sep 2017 02:38:31 +0530 Subject: [PATCH 2/8] modal check icon thinner, terminate modal text smaller --- .../datacenterlight/css/landing-page.css | 17 +++++++++ .../datacenterlight/beta_success.html | 2 +- hosting/static/hosting/css/landing-page.css | 38 +++++++++++++++++++ .../hosting/js/virtual_machine_detail.js | 21 +++++----- hosting/templates/hosting/order_detail.html | 9 ++--- .../hosting/virtual_machine_detail.html | 7 ++-- hosting/views.py | 1 - 7 files changed, 74 insertions(+), 21 deletions(-) diff --git a/datacenterlight/static/datacenterlight/css/landing-page.css b/datacenterlight/static/datacenterlight/css/landing-page.css index 6537dd0d..d50a864d 100755 --- a/datacenterlight/static/datacenterlight/css/landing-page.css +++ b/datacenterlight/static/datacenterlight/css/landing-page.css @@ -1653,3 +1653,20 @@ a.list-group-item-danger.active:focus { .panel-danger > .panel-heading .badge { background-color: #eb4d5c; } + +.checkmark { + display: inline-block; +} +.checkmark:after { + /*Add another block-level blank space*/ + content: ''; + display: block; + /*Make it a small rectangle so the border will create an L-shape*/ + width: 25px; + height: 60px; + /*Add a white border on the bottom and left, creating that 'L' */ + border: solid #777; + border-width: 0 3px 3px 0; + /*Rotate the L 45 degrees to turn it into a checkmark*/ + transform: rotate(45deg); +} diff --git a/datacenterlight/templates/datacenterlight/beta_success.html b/datacenterlight/templates/datacenterlight/beta_success.html index 2512a05c..60df607c 100644 --- a/datacenterlight/templates/datacenterlight/beta_success.html +++ b/datacenterlight/templates/datacenterlight/beta_success.html @@ -8,7 +8,7 @@
-
+

{% trans "Request Sent" %}

{% trans "Thank you for your subscription! You will receive a confirmation mail from our team" %}

diff --git a/hosting/static/hosting/css/landing-page.css b/hosting/static/hosting/css/landing-page.css index ed8fb310..5275dd97 100644 --- a/hosting/static/hosting/css/landing-page.css +++ b/hosting/static/hosting/css/landing-page.css @@ -870,3 +870,41 @@ a.list-group-item-danger.active:focus { .panel-danger > .panel-heading .badge { background-color: #eb4d5c; } + +.checkmark { + display: inline-block; +} +.checkmark:after { + /*Add another block-level blank space*/ + content: ''; + display: block; + /*Make it a small rectangle so the border will create an L-shape*/ + width: 25px; + height: 60px; + /*Add a white border on the bottom and left, creating that 'L' */ + border: solid #777; + border-width: 0 3px 3px 0; + /*Rotate the L 45 degrees to turn it into a checkmark*/ + transform: rotate(45deg); +} + +.closemark { + display: inline-block; + width: 50px; + height: 50px; + position: relative; +} +.closemark:before, .closemark:after { + position: absolute; + left: 25px; + content: ' '; + height: 50px; + width: 2px; + background-color: #777; +} +.closemark:before { + transform: rotate(45deg); +} +.closemark:after { + transform: rotate(-45deg); +} diff --git a/hosting/static/hosting/js/virtual_machine_detail.js b/hosting/static/hosting/js/virtual_machine_detail.js index db2621c1..ca79df56 100644 --- a/hosting/static/hosting/js/virtual_machine_detail.js +++ b/hosting/static/hosting/js/virtual_machine_detail.js @@ -79,7 +79,6 @@ $(document).ready(function() { $('html,body').scrollTop(scrollmem); }); - $('.modal-text').removeClass('hide'); var create_vm_form = $('#virtual_machine_create_form'); create_vm_form.submit(function () { $('#btn-create-vm').prop('disabled', true); @@ -90,26 +89,28 @@ $(document).ready(function() { success: function (data) { if (data.status === true) { fa_icon = $('.modal-icon > .fa'); - fa_icon.attr('class', 'fa fa-check'); - $('.modal-header > .close').attr('class', 'close'); + fa_icon.attr('class', 'checkmark'); + // $('.modal-header > .close').removeClass('hidden'); $('#createvm-modal-title').text(data.msg_title); $('#createvm-modal-body').text(data.msg_body); - $('#createvm-modal').on('hidden.bs.modal', function () { - window.location = data.redirect; - }) + $('#createvm-modal-done-btn').removeClass('hide'); } }, error: function (xmlhttprequest, textstatus, message) { fa_icon = $('.modal-icon > .fa'); - fa_icon.attr('class', 'fa fa-times'); - $('.modal-header > .close').attr('class', 'close'); - $('.modal-text').addClass('hide'); + fa_icon.attr('class', 'fa fa-close'); + // $('.modal-header > .close').attr('class', 'close'); + // $('.modal-text').addClass('hide'); if (typeof(create_vm_error_message) !== 'undefined') { - $('#createvm-modal-title').text(create_vm_error_message); + $('#createvm-modal-text').text(create_vm_error_message); } $('#btn-create-vm').prop('disabled', false); + $('#createvm-modal-close-btn').removeClass('hide'); } }); return false; }); + $('#createvm-modal').on('hidden.bs.modal', function () { + $(this).find('.modal-footer .btn').addClass('hide'); + }) }); diff --git a/hosting/templates/hosting/order_detail.html b/hosting/templates/hosting/order_detail.html index 345632d2..699a2d37 100644 --- a/hosting/templates/hosting/order_detail.html +++ b/hosting/templates/hosting/order_detail.html @@ -160,22 +160,19 @@
-
{% trans "Processing..." %}
- +
{% trans "Hold tight, we are processing your request" %}
+ {% trans "OK" %} +
diff --git a/hosting/templates/hosting/virtual_machine_detail.html b/hosting/templates/hosting/virtual_machine_detail.html index 06d86032..0b882055 100644 --- a/hosting/templates/hosting/virtual_machine_detail.html +++ b/hosting/templates/hosting/virtual_machine_detail.html @@ -109,7 +109,7 @@

{{virtual_machine.name}}

- {% trans "OK" %} + {% trans "OK" %}
@@ -123,8 +123,9 @@
-
- +
+

+
{% blocktrans with machine_name=virtual_machine.name %}Your Virtual Machine {{machine_name}} is successfully terminated!{% endblocktrans %}
{% trans "OK" %}
diff --git a/hosting/views.py b/hosting/views.py index 1c007780..183d95c3 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -804,7 +804,6 @@ class OrdersHostingDetailView(LoginRequiredMixin, response = { 'status': True, - 'redirect': reverse('hosting:virtual_machines'), 'msg_title': str(_('Thank you for the order.')), 'msg_body': str(_('Your VM will be up and running in a few moments.' ' We will send you a confirmation email as soon as' From 42985c28f17c9eb316e48373252606dbb2dbabeb Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Tue, 26 Sep 2017 22:58:56 +0530 Subject: [PATCH 3/8] using data.redirect to set redirect path on success --- hosting/static/hosting/js/virtual_machine_detail.js | 6 +++--- hosting/views.py | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hosting/static/hosting/js/virtual_machine_detail.js b/hosting/static/hosting/js/virtual_machine_detail.js index ca79df56..01a58127 100644 --- a/hosting/static/hosting/js/virtual_machine_detail.js +++ b/hosting/static/hosting/js/virtual_machine_detail.js @@ -93,14 +93,14 @@ $(document).ready(function() { // $('.modal-header > .close').removeClass('hidden'); $('#createvm-modal-title').text(data.msg_title); $('#createvm-modal-body').text(data.msg_body); - $('#createvm-modal-done-btn').removeClass('hide'); + $('#createvm-modal-done-btn') + .attr('href', data.redirect) + .removeClass('hide'); } }, error: function (xmlhttprequest, textstatus, message) { fa_icon = $('.modal-icon > .fa'); fa_icon.attr('class', 'fa fa-close'); - // $('.modal-header > .close').attr('class', 'close'); - // $('.modal-text').addClass('hide'); if (typeof(create_vm_error_message) !== 'undefined') { $('#createvm-modal-text').text(create_vm_error_message); } diff --git a/hosting/views.py b/hosting/views.py index 183d95c3..1c007780 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -804,6 +804,7 @@ class OrdersHostingDetailView(LoginRequiredMixin, response = { 'status': True, + 'redirect': reverse('hosting:virtual_machines'), 'msg_title': str(_('Thank you for the order.')), 'msg_body': str(_('Your VM will be up and running in a few moments.' ' We will send you a confirmation email as soon as' From 6ef5d2f7778f9fac314786b6ed9cd884112c2973 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Wed, 27 Sep 2017 00:08:14 +0530 Subject: [PATCH 4/8] typo fix --- hosting/locale/de/LC_MESSAGES/django.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po index d6b65f95..03073bfb 100644 --- a/hosting/locale/de/LC_MESSAGES/django.po +++ b/hosting/locale/de/LC_MESSAGES/django.po @@ -385,7 +385,7 @@ msgid "Processing..." msgstr "Abarbeitung..." msgid "Hold tight, we are processing your request" -msgstr "Bitte warten - wir verbeiten Deine Anfrage gerade" +msgstr "Bitte warten - wir bearbeiten Deine Anfrage gerade" msgid "Some problem encountered. Please try again later." msgstr "Ein Problem ist aufgetreten. Bitte versuche es später noch einmal." From 96933d50c89358af8abc9d278ced87c8631dd5b7 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Wed, 27 Sep 2017 00:46:14 +0530 Subject: [PATCH 5/8] Update Changelog --- Changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/Changelog b/Changelog index f03a04ed..de602e8d 100644 --- a/Changelog +++ b/Changelog @@ -8,6 +8,7 @@ * #3777: [hosting] Create new VM calculator added like dcl landing * #3781: [hosting] Resend activation mail * #3806: [hosting] Fix can not create VMs after password reset + * #3812: [hosting] Modal check icon made thin and font-size fixed * Feature: [cms, blog] Added /cms prefix for all the django-cms generated urls * Bugfix: [dcl, hosting] added host to celery error mails * Bugfix: [ungleich] Fixed wrong subdomain digitalglarus.ungleich.ch From aceaecc748f25957f4b579e10ef5861fafbdce97 Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Wed, 27 Sep 2017 13:08:23 +0200 Subject: [PATCH 6/8] Add .gitconfig and .sql to .gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 46bfbf54..2222eddf 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,5 @@ secret-key .env *.mo *.log +.gitconfig +.sql From 172fffe7bedee6a275ecd1316109281f3df30ee5 Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Wed, 27 Sep 2017 13:13:16 +0200 Subject: [PATCH 7/8] .gitignore: change .sql to *.sql --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 2222eddf..3d466d50 100644 --- a/.gitignore +++ b/.gitignore @@ -37,4 +37,4 @@ secret-key *.mo *.log .gitconfig -.sql +*.sql From f1d273b9d0b8d9836737c7f5125312792dc25eb3 Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Wed, 27 Sep 2017 13:46:00 +0200 Subject: [PATCH 8/8] .gitignore: remove .gitconfig --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 3d466d50..cfef66a1 100644 --- a/.gitignore +++ b/.gitignore @@ -36,5 +36,4 @@ secret-key .env *.mo *.log -.gitconfig *.sql