From b9f232ac0a111f0dd74626ca1a1187fdf09b6d84 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Sat, 9 Dec 2017 05:17:27 +0530 Subject: [PATCH 1/8] unlgiech logo alignment fix --- ungleich_page/static/ungleich_page/css/agency.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ungleich_page/static/ungleich_page/css/agency.css b/ungleich_page/static/ungleich_page/css/agency.css index 1a27a4e1..c99f2af9 100755 --- a/ungleich_page/static/ungleich_page/css/agency.css +++ b/ungleich_page/static/ungleich_page/css/agency.css @@ -280,7 +280,10 @@ fieldset[disabled] .btn-xl.active { } .navbar-default .navbar-brand { - padding: 8px; + padding: 4px 8px 12px; + } + .navbar-default.navbar-shrink .navbar-brand { + padding: 6px 8px 10px; } } From 6515195af548df9e5cd26cbfbd03e94faf879b3a Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Sat, 9 Dec 2017 05:19:07 +0530 Subject: [PATCH 2/8] digitalglarus logo alignment fix --- digitalglarus/static/digitalglarus/css/agency.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/digitalglarus/static/digitalglarus/css/agency.css b/digitalglarus/static/digitalglarus/css/agency.css index 4ac531c2..7e9b0c11 100755 --- a/digitalglarus/static/digitalglarus/css/agency.css +++ b/digitalglarus/static/digitalglarus/css/agency.css @@ -235,7 +235,7 @@ fieldset[disabled] .btn-xl.active { .navbar-default .navbar-brand { font-family: "Helvetica Neue", Helvetica, Arial, cursive; color: #a1cfd7; - padding-top: 10px; + padding-top: 11px; } .navbar-default .navbar-brand:hover, From 8d64915d71dd2b2ff1d2258764802146fb4467e8 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Mon, 11 Dec 2017 00:47:55 +0530 Subject: [PATCH 3/8] invoice footer added --- hosting/static/hosting/css/order.css | 19 ++++++++- hosting/templates/hosting/order_detail.html | 9 +++-- .../templates/hosting/virtual_machines.html | 40 +++++++++---------- hosting/urls.py | 3 +- 4 files changed, 44 insertions(+), 27 deletions(-) diff --git a/hosting/static/hosting/css/order.css b/hosting/static/hosting/css/order.css index 8e9226e2..734566a5 100644 --- a/hosting/static/hosting/css/order.css +++ b/hosting/static/hosting/css/order.css @@ -7,7 +7,7 @@ @media(min-width: 768px) { .order-detail-container { - padding: 30px; + padding: 30px 30px 20px; } } @@ -53,7 +53,7 @@ } .order-detail-container .order-details { - margin-bottom: 30px; + margin-bottom: 15px; } .order-detail-container .order-details strong { @@ -90,3 +90,18 @@ width: 16px; } } + +.order_detail_footer { + font-size: 9px; + letter-spacing: 1px; + color: #333333; +} + +.order_detail_footer strong { + font-size: 11px; +} + + +#virtual_machine_create_form { + padding: 15px 0; +} \ No newline at end of file diff --git a/hosting/templates/hosting/order_detail.html b/hosting/templates/hosting/order_detail.html index fe200f6e..6ea4f36f 100644 --- a/hosting/templates/hosting/order_detail.html +++ b/hosting/templates/hosting/order_detail.html @@ -135,9 +135,7 @@ - {% if not order %} -
- {% endif %} +
{% if not order %} {% block submit_btn %} @@ -155,6 +153,11 @@ {% endblock submit_btn %} + {% else %} +
+ ungleich glarus ag  Bahnhotstrasse 1, 8783 Linthal, Switzerland
+ www.datacenterlight.ch  |  info@datacenterlight.ch +
{% endif %} {% endif %} diff --git a/hosting/templates/hosting/virtual_machines.html b/hosting/templates/hosting/virtual_machines.html index 6329cc10..467d9d39 100644 --- a/hosting/templates/hosting/virtual_machines.html +++ b/hosting/templates/hosting/virtual_machines.html @@ -39,27 +39,25 @@ {% for vm in vms %} - - {{vm.vm_id}} - {% if vm.ipv6 %} - {{vm.ipv4}} - {{vm.ipv6}} - {% endif %} - - - {% if vm.state == 'ACTIVE' %} - {{vm.state|title}} - {% elif vm.state == 'FAILED' %} - {{vm.state|title}} - {% else %} - {{vm.state|title}} - {% endif %} - - - - {% trans "View Detail" %} - - + + {{vm.vm_id}} + {% if vm.ipv4 %}{{vm.ipv4}}{% endif %} + {% if vm.ipv6 %}{{vm.ipv6}}{% endif %} + + + {% if vm.state == 'ACTIVE' %} + {{vm.state|title}} + {% elif vm.state == 'FAILED' %} + {{vm.state|title}} + {% else %} + {{vm.state|title}} + {% endif %} + + + + {% trans "View Detail" %} + + {% endfor %} diff --git a/hosting/urls.py b/hosting/urls.py index b00a199c..2112c493 100644 --- a/hosting/urls.py +++ b/hosting/urls.py @@ -8,7 +8,8 @@ from .views import ( MarkAsReadNotificationView, PasswordResetView, PasswordResetConfirmView, HostingPricingView, CreateVirtualMachinesView, HostingBillListView, HostingBillDetailView, SSHKeyDeleteView, SSHKeyCreateView, SSHKeyListView, - SSHKeyChoiceView, DashboardView, SettingsView, ResendActivationEmailView) + SSHKeyChoiceView, DashboardView, SettingsView, ResendActivationEmailView +) urlpatterns = [ From 54185792cf499e33b287a2a928e3c46884e77051 Mon Sep 17 00:00:00 2001 From: PCoder Date: Tue, 12 Dec 2017 20:48:47 +0100 Subject: [PATCH 4/8] Add resend activation link in the landing payment page --- datacenterlight/templates/datacenterlight/landing_payment.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datacenterlight/templates/datacenterlight/landing_payment.html b/datacenterlight/templates/datacenterlight/landing_payment.html index d195690b..447662cc 100644 --- a/datacenterlight/templates/datacenterlight/landing_payment.html +++ b/datacenterlight/templates/datacenterlight/landing_payment.html @@ -39,7 +39,7 @@

{% trans "Don't have an account yet?" %}
{% trans "You can sign up by filling in the information below." %}
- {% trans "Forgot password?" %} + {% trans "Forgot password?" %} or {% trans "Resend activation link" %}?

{% endif %} From 56962d5fdf05eccf32f1689a449db260f3e4e657 Mon Sep 17 00:00:00 2001 From: PCoder Date: Tue, 12 Dec 2017 20:58:02 +0100 Subject: [PATCH 5/8] Use target=_blank for links in landing payment page --- datacenterlight/templates/datacenterlight/landing_payment.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datacenterlight/templates/datacenterlight/landing_payment.html b/datacenterlight/templates/datacenterlight/landing_payment.html index 447662cc..d64de46c 100644 --- a/datacenterlight/templates/datacenterlight/landing_payment.html +++ b/datacenterlight/templates/datacenterlight/landing_payment.html @@ -39,7 +39,7 @@

{% trans "Don't have an account yet?" %}
{% trans "You can sign up by filling in the information below." %}
- {% trans "Forgot password?" %} or {% trans "Resend activation link" %}? + {% trans "Forgot password?" %} or {% trans "Resend activation link" %}?

{% endif %} From a339f65170e123e488ab46a94163a08ff3b6b37f Mon Sep 17 00:00:00 2001 From: PCoder Date: Tue, 12 Dec 2017 21:02:18 +0100 Subject: [PATCH 6/8] Correct _target to target and blank to _blank --- datacenterlight/templates/datacenterlight/landing_payment.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datacenterlight/templates/datacenterlight/landing_payment.html b/datacenterlight/templates/datacenterlight/landing_payment.html index d64de46c..f2f75e9c 100644 --- a/datacenterlight/templates/datacenterlight/landing_payment.html +++ b/datacenterlight/templates/datacenterlight/landing_payment.html @@ -39,7 +39,7 @@

{% trans "Don't have an account yet?" %}
{% trans "You can sign up by filling in the information below." %}
- {% trans "Forgot password?" %} or {% trans "Resend activation link" %}? + {% trans "Forgot password?" %} or {% trans "Resend activation link" %}?

{% endif %} From 546d7fe5ebcede27bc089d232ae67f7ce49a333f Mon Sep 17 00:00:00 2001 From: PCoder Date: Tue, 12 Dec 2017 21:31:13 +0100 Subject: [PATCH 7/8] Update Changelog --- Changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Changelog b/Changelog index ad39c20d..4cfa2564 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,5 @@ +Next: + * #3911: [dcl] Integrate resend activation link into dcl landing payment page 1.2.13: 2017-12-09 * [cms] Introduce UngleichHeaderBackgroundImageAndTextSliderPlugin that allows to have scrolling images and texts * [cms] Remove

tag for ungleich cms customer item template From f4fb2e5d1384701b530f872f5aa27a477b503fde Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Wed, 13 Dec 2017 23:42:17 +0530 Subject: [PATCH 8/8] Update Changelog --- Changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/Changelog b/Changelog index 4cfa2564..6b8b1370 100644 --- a/Changelog +++ b/Changelog @@ -1,5 +1,6 @@ Next: * #3911: [dcl] Integrate resend activation link into dcl landing payment page + * #3972: [hosting] Add ungleich company info to invoice footer 1.2.13: 2017-12-09 * [cms] Introduce UngleichHeaderBackgroundImageAndTextSliderPlugin that allows to have scrolling images and texts * [cms] Remove

tag for ungleich cms customer item template