From 0ed104cd5673be960973492eed047dc9298e7ab5 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Thu, 7 Sep 2017 19:56:34 +0530 Subject: [PATCH] logged in user --- .../locale/de/LC_MESSAGES/django.po | 69 +++--- .../datacenterlight/calculator_form.html | 2 + .../datacenterlight/landing_payment.html | 209 +++++++++--------- hosting/locale/de/LC_MESSAGES/django.po | 2 +- hosting/static/hosting/css/landing-page.css | 2 +- hosting/static/hosting/css/payment.css | 28 ++- 6 files changed, 183 insertions(+), 129 deletions(-) diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.po b/datacenterlight/locale/de/LC_MESSAGES/django.po index 4417b5a3..8b191bab 100644 --- a/datacenterlight/locale/de/LC_MESSAGES/django.po +++ b/datacenterlight/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-07 02:52+0530\n" +"POT-Creation-Date: 2017-09-07 19:54+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -61,24 +61,6 @@ msgstr "Bitte gib einen Wert von 10 bis 200 ein." msgid "GB Storage (SSD)" msgstr "GB Storage (SSD)" -msgid "Name" -msgstr "" - -msgid "Your Name" -msgstr "Dein Name" - -msgid "Please enter your name." -msgstr "Bitte gib Deinen Namen ein." - -msgid "Email" -msgstr "E-Mail-Adresse" - -msgid "Your Email" -msgstr "Deine E-Mail" - -msgid "Please enter a valid email address." -msgstr "Bitte gib eine gültige E-Mailadresse ein." - msgid "Continue" msgstr "Weiter" @@ -91,6 +73,18 @@ msgstr "Vielen Dank für Deine Nachricht." msgid "Get in touch with us!" msgstr "Sende uns eine Nachricht." +msgid "Name" +msgstr "" + +msgid "Please enter your name." +msgstr "Bitte gib Deinen Namen ein." + +msgid "Email" +msgstr "E-Mail-Adresse" + +msgid "Please enter a valid email address." +msgstr "Bitte gib eine gültige E-Mailadresse ein." + msgid "Message" msgstr "Nachricht" @@ -260,6 +254,13 @@ msgstr "Kontaktiere uns" msgid "Switzerland " msgstr "Schweiz " +msgid "Welcome back" +msgstr "" + +msgid "" +"Review your billing address and card details and proceed to make payment." +msgstr "" + msgid "Log in" msgstr "" @@ -307,6 +308,11 @@ msgstr "Monat" msgid "Sign up" msgstr "" +#, fuzzy +#| msgid "Billing Address" +msgid "Billing Address" +msgstr "Rechnungsadresse" + #, fuzzy #| msgid "Billing Address" msgid "Email Address" @@ -315,14 +321,21 @@ msgstr "Rechnungsadresse" msgid "Credit Card" msgstr "Kreditkarte" +#, fuzzy +#| msgid "" +#| "\n" +#| " Please fill in your credit card " +#| "information below. We are using Stripe for payment and do not store\n" +#| " your information in our database.\n" +#| " " msgid "" "\n" -" Please fill in your credit card information " -"below. We are using Stripe for payment and do not store\n" -" your information in our database.\n" -" " +" Please fill in your credit card information below. " +"We are using Stripe for " +"payment and do not store your information in our database.\n" +" " msgstr "" "\n" "Bitte füll Deine Kreditkarteninformationen unten aus. Wir nutzen Ipv6 Only
--> + {% comment %}
@@ -118,6 +119,7 @@ {% endfor %}
+ {% endcomment %} diff --git a/datacenterlight/templates/datacenterlight/landing_payment.html b/datacenterlight/templates/datacenterlight/landing_payment.html index 5799c7ab..afb797b8 100644 --- a/datacenterlight/templates/datacenterlight/landing_payment.html +++ b/datacenterlight/templates/datacenterlight/landing_payment.html @@ -16,23 +16,31 @@
-

{%trans "Log in" %}

-
-

{% blocktrans %}Already signed up?
By logging in you can retrieve saved billing information.{% endblocktrans %}

-
- {% for field in login_form %} - {% csrf_token %} - {% bootstrap_field field show_label=False type='fields'%} - {% endfor %} -
- + {% if request.user.is_authenticated %} +
+

{% trans "Welcome back" %} {{request.user.name}}!

+

{% trans "Review your billing address and card details and proceed to make payment." %}

- -

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

+ {% else %} +

{%trans "Log in" %}

+
+

{% blocktrans %}Already signed up?
By logging in you can retrieve saved billing information.{% endblocktrans %}

+
+ {% for field in login_form %} + {% csrf_token %} + {% bootstrap_field field show_label=False type='fields'%} + {% endfor %} + +
+ +
+
+

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

+ {% endif %}
@@ -54,17 +62,23 @@
-

{%trans "Sign up"%}

+ {% if not request.user.is_authenticated %} +

{%trans "Sign up"%}

+ {% else %} +

{%trans "Billing Address"%}

+ {% endif %}
-
- - -
-
- - -
+ {% if not request.user.is_authenticated %} +
+ + +
+
+ + +
+ {% endif %} {% for field in form %} {% csrf_token %} {% bootstrap_field field show_label=False type='fields'%} @@ -76,28 +90,70 @@

{%trans "Credit Card"%}

+

+ {% blocktrans %} + Please fill in your credit card information below. We are using Stripe for payment and do not store your information in our database. + {% endblocktrans %} +

-
-

- {% blocktrans %} - Please fill in your credit card information below. We are using Stripe for payment and do not store - your information in our database. - {% endblocktrans %} -

-
-
-
- {% if credit_card_data.last4 %} - -
Credit Card
-
Last 4: *****{{credit_card_data.last4}}
-
Type: {{credit_card_data.cc_brand}}
- - + {% if credit_card_data.last4 %} +
+
Credit Card
+
Last 4: *****{{credit_card_data.last4}}
+
Type: {{credit_card_data.cc_brand}}
+ +
+ {% if not messages and not form.non_field_errors %} +

+ {% trans "You are not making any payment yet. After submitting your card information, you will be taken to the Confirm Order Page." %} +

+ {% endif %} +
+ {% for message in messages %} + {% if 'failed_payment' or 'make_charge_error' in message.tags %} +
  • +

    {{ message|safe }}

    +
+ {% endif %} + {% endfor %} + {% for error in form.non_field_errors %} +

+ {{ error|escape }} +

+ {% endfor %} +
+
+ +
+ {% else %} +
+ +
+
+
+ +
+
+
+
+ +
+
+
+ +
+
+
+
+ + +
+
+
+
{% if not messages and not form.non_field_errors %} -

- {% trans "You are not making any payment yet. After submitting your card information, you will be taken to the Confirm Order Page." %} +

+ {% trans "You are not making any payment yet. After placing your order, you will be taken to the Submit Payment Page." %}

{% endif %}
@@ -108,6 +164,7 @@ {% endif %} {% endfor %} + {% for error in form.non_field_errors %}

{{ error|escape }} @@ -115,64 +172,14 @@ {% endfor %}

- +
- {% else %} - - -
-
-
- -
-
-
-
- -
-
-
- -
-
-
-
- - -
-
-
- - {% if not messages and not form.non_field_errors %} -

- {% trans "You are not making any payment yet. After placing your order, you will be taken to the Submit Payment Page." %} -

- {% endif %} -
- {% for message in messages %} - {% if 'failed_payment' or 'make_charge_error' in message.tags %} -
  • -

    {{ message|safe }}

    -
- {% endif %} - {% endfor %} - {% for error in form.non_field_errors %} -

- {{ error|escape }} -

- {% endfor %} -
-
- -
- -
-

-
-
- {% endif %} -
+
+

+
+ + {% endif %}
diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po index c6f1ad53..515380ee 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-07 02:50+0530\n" +"POT-Creation-Date: 2017-09-07 19:54+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/hosting/static/hosting/css/landing-page.css b/hosting/static/hosting/css/landing-page.css index 4e8c2529..fc87244d 100644 --- a/hosting/static/hosting/css/landing-page.css +++ b/hosting/static/hosting/css/landing-page.css @@ -667,7 +667,7 @@ a.unlink:hover { #card-errors { clear: both; - padding: 0 0 10px; + padding: 0 5px 10px; color: #eb4d5c; } diff --git a/hosting/static/hosting/css/payment.css b/hosting/static/hosting/css/payment.css index 3d814a59..265098a7 100644 --- a/hosting/static/hosting/css/payment.css +++ b/hosting/static/hosting/css/payment.css @@ -48,13 +48,39 @@ } .dcl-payment-section p { padding: 0 5px; + font-weight: 400; } .dcl-payment-section .card-warning-content { padding: 8px 10px; + font-weight: 300; } .dcl-payment-order strong{ font-size: 17px; } +.dcl-payment-order p { + font-weight: 300; +} +.dcl-payment-section .form-group { + margin-bottom: 10px; +} +.dcl-payment-section .form-control { + box-shadow: none; + padding: 6px 12px; + height: 32px; +} +.dcl-payment-user { + height: 100%; + display: flex; + flex-direction: column; + justify-content: center; +} + +.dcl-payment-user h4 { + font-weight: 600; + padding-left: 5px; + font-size: 17px; +} + @media (min-width: 768px) { .dcl-payment-grid { display: flex; @@ -67,7 +93,7 @@ padding: 0 30px; } .dcl-payment-section { - padding: 30px 10px; + padding: 15px 10px; margin-bottom: 0; border-bottom-width: 5px; }