diff --git a/datacenterlight/templates/datacenterlight/landing_payment.html b/datacenterlight/templates/datacenterlight/landing_payment.html index 5db88738..c7ada779 100644 --- a/datacenterlight/templates/datacenterlight/landing_payment.html +++ b/datacenterlight/templates/datacenterlight/landing_payment.html @@ -43,23 +43,6 @@ {% endif %} -
-
-

{%trans "Your Order" %}

-
-
-

{% trans "Cores"%} {{request.session.specs.cpu|floatformat}}

-
-

{% trans "Memory"%} {{request.session.specs.memory|floatformat}} GB

-
-

{% trans "Disk space"%} {{request.session.specs.disk_size|floatformat}} GB

-
-

{% trans "Configuration"%} {{request.session.template.name}}

-
-

{%trans "Total" %}  ({%trans "including VAT" %}) {{request.session.specs.price}} CHF/{% trans "Month" %}

-
-
-
{% if not request.user.is_authenticated %} @@ -81,6 +64,23 @@
+
+
+

{%trans "Your Order" %}

+
+
+

{% trans "Cores"%} {{request.session.specs.cpu|floatformat}}

+
+

{% trans "Memory"%} {{request.session.specs.memory|floatformat}} GB

+
+

{% trans "Disk space"%} {{request.session.specs.disk_size|floatformat}} GB

+
+

{% trans "Configuration"%} {{request.session.template.name}}

+
+

{%trans "Total" %}  ({%trans "including VAT" %}) {{request.session.specs.price}} CHF/{% trans "Month" %}

+
+
+

{%trans "Credit Card"%}

diff --git a/datacenterlight/views.py b/datacenterlight/views.py index c3ded2dd..e0dc44bb 100644 --- a/datacenterlight/views.py +++ b/datacenterlight/views.py @@ -410,7 +410,6 @@ class PaymentOrderView(FormView): @cache_control(no_cache=True, must_revalidate=True, no_store=True) def get(self, request, *args, **kwargs): # user is no longer added to session on the index page - # if 'specs' not in request.session or 'user' not in request.session: if 'specs' not in request.session: return HttpResponseRedirect(reverse('datacenterlight:index')) return self.render_to_response(self.get_context_data()) diff --git a/hosting/static/hosting/css/payment.css b/hosting/static/hosting/css/payment.css index 265098a7..b1b0460d 100644 --- a/hosting/static/hosting/css/payment.css +++ b/hosting/static/hosting/css/payment.css @@ -92,15 +92,22 @@ position: relative; padding: 0 30px; } + .dcl-payment-box:nth-child(2) { + order: 1; + } + .dcl-payment-box:nth-child(4) { + order: 2; + } .dcl-payment-section { padding: 15px 10px; margin-bottom: 0; border-bottom-width: 5px; } - .dcl-payment-box:nth-child(n+3) .dcl-payment-section { + .dcl-payment-box:nth-child(2n) .dcl-payment-section { border-bottom: none; } - .dcl-payment-box:nth-child(2n+1):after { + .dcl-payment-box:nth-child(1):after, + .dcl-payment-box:nth-child(2):after { content: ' '; display: block; background: #eee;