From 86c4e7b4083435cbe14cff3642b42e2ded9ff26d Mon Sep 17 00:00:00 2001 From: deaspo Date: Wed, 5 Jul 2017 01:53:01 +0300 Subject: [PATCH 01/32] Task: Improve credit card section - letting the user know that they're not making any payment there but on the next page Signed-off-by: deaspo --- hosting/templates/hosting/payment.html | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/hosting/templates/hosting/payment.html b/hosting/templates/hosting/payment.html index a09061bb..d934acef 100644 --- a/hosting/templates/hosting/payment.html +++ b/hosting/templates/hosting/payment.html @@ -52,6 +52,10 @@

{%trans "Payment Details"%}

+
+

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

+
+
{% if credit_card_data.last4 %}
@@ -59,10 +63,10 @@
Last 4: *****{{credit_card_data.last4}}
Type: {{credit_card_data.cc_brand}}
-
+
-
{% else %} @@ -89,7 +93,7 @@ placeholder="{%trans "Valid Card Number"%}" required autofocus data-stripe="number" />
-
+
@@ -112,8 +116,12 @@
-->
-
- +
+
+

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

+
+
+

{%trans "Billing Address"%}

@@ -74,11 +74,11 @@
-
-
- -
-
+
+
+ +
+
@@ -117,12 +117,15 @@
-->

-
+

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

-
- -
+
+
+ +
+
+
- - - - - - - - {% endblock %} \ No newline at end of file From fd0e689562d563bfde9ba9d934b5eb98b25f71fb Mon Sep 17 00:00:00 2001 From: Karthik Rao Date: Thu, 6 Jul 2017 20:38:22 +0530 Subject: [PATCH 05/32] Correct the indentation in the html template files of dcl. --- .../templates/datacenterlight/base.html | 102 ++++++------ .../templates/datacenterlight/index.html | 60 +++---- .../datacenterlight/order_detail.html | 152 +++++++++--------- .../templates/datacenterlight/pricing.html | 128 +++++++-------- .../templates/datacenterlight/success.html | 26 +-- .../datacenterlight/whydatacenterlight.html | 14 +- 6 files changed, 241 insertions(+), 241 deletions(-) diff --git a/datacenterlight/templates/datacenterlight/base.html b/datacenterlight/templates/datacenterlight/base.html index 2c3f0e5d..3eab31b3 100644 --- a/datacenterlight/templates/datacenterlight/base.html +++ b/datacenterlight/templates/datacenterlight/base.html @@ -3,65 +3,65 @@ - + - - - - - + + + + + - Data Center Light - - {% block title %}VM hosting made in Switzerland{% endblock %} - - + Data Center Light - + {% block title %}VM hosting made in Switzerland{% endblock %} + + - - - - - - - + + + + + + + - - + + - - - - - {% include "google_analytics.html" %} - - + + + + + {% include "google_analytics.html" %} + + - + - - {% include "datacenterlight/includes/_navbar.html" %} - - - {% block content %} - {% endblock %} - - {% include "datacenterlight/includes/_footer.html" %} - - - - + + {% include "datacenterlight/includes/_navbar.html" %} - + {% block content %} + {% endblock %} - - - - - - - - + {% include "datacenterlight/includes/_footer.html" %} + + + + + + + + + + + + + + + + diff --git a/datacenterlight/templates/datacenterlight/index.html b/datacenterlight/templates/datacenterlight/index.html index 822858ae..90ad26cd 100755 --- a/datacenterlight/templates/datacenterlight/index.html +++ b/datacenterlight/templates/datacenterlight/index.html @@ -112,7 +112,7 @@

{% trans "Reliable and light" %}

-

{% trans "Our VMs are located in Switzerland, with reliable power supply and fast internet connection. Our VM costs less thanks to our featherlight infrastructure." %}

+

{% trans "Our VMs are located in Switzerland, with reliable power supply and fast internet connection. Our VM costs less thanks to our featherlight infrastructure." %}

@@ -194,36 +194,36 @@ -
-
- - -
-
- {% for message in messages %} - {% if 'name' in message.tags %} -
  • - {{ message|safe }} -
- {% endif %} - {% endfor %} -
+
+
+ +
-
-
- - -
-
- {% for message in messages %} - {% if 'email' in message.tags %} -
  • - {{ message|safe }} -
- {% endif %} - {% endfor %} -
+
+ {% for message in messages %} + {% if 'name' in message.tags %} +
  • + {{ message|safe }} +
+ {% endif %} + {% endfor %}
+
+
+
+ + +
+
+ {% for message in messages %} + {% if 'email' in message.tags %} +
  • + {{ message|safe }} +
+ {% endif %} + {% endfor %} +
+
@@ -278,4 +278,4 @@
- {% endblock %} +{% endblock %} diff --git a/datacenterlight/templates/datacenterlight/order_detail.html b/datacenterlight/templates/datacenterlight/order_detail.html index 273074cf..da95161c 100644 --- a/datacenterlight/templates/datacenterlight/order_detail.html +++ b/datacenterlight/templates/datacenterlight/order_detail.html @@ -4,94 +4,94 @@ {% load custom_tags %} {% block content %} -
- {% if messages %} -
-
-
-
- {% for message in messages %} - {{ message }} - {% endfor %} -
-
-
- {% endif %} - {% if not error %} -
-
-
-

{% trans "Confirm Order"%}

-
-
+
+ {% if messages %}
-
-
-

{% trans "Billed To:"%}

- {% with request.session.billing_address_data as billing_address %} - {{request.session.user.name}}
{{billing_address|get_value_from_dict:'street_address'}}, {{billing_address|get_value_from_dict:'postal_code'}}
- {{billing_address|get_value_from_dict:'city'}}, {{billing_address|get_value_from_dict:'country'}}. - {% endwith %} -
-
-
-
- {% trans "Date"%}:
- {% now "Y-m-d H:i" %}

-
- +
+
+
+ {% for message in messages %} + {{ message }} + {% endfor %} +
+ {% endif %} + {% if not error %}
-
-
- {% trans "Payment Method:"%}
- {{cc_brand}} {% trans "ending" %} **** {{cc_last4}}
- {{request.session.user.email}} -
+
+
+

{% trans "Confirm Order"%}

+
+
+
+
+
+

{% trans "Billed To:"%}

+ {% with request.session.billing_address_data as billing_address %} + {{request.session.user.name}}
{{billing_address|get_value_from_dict:'street_address'}}, {{billing_address|get_value_from_dict:'postal_code'}}
+ {{billing_address|get_value_from_dict:'city'}}, {{billing_address|get_value_from_dict:'country'}}. + {% endwith %} +
+
+
+
+ {% trans "Date"%}:
+ {% now "Y-m-d H:i" %}

+
+ +
+
+
+
+
+ {% trans "Payment Method:"%}
+ {{cc_brand}} {% trans "ending" %} **** {{cc_last4}}
+ {{request.session.user.email}} +
+
+
-
-
- -
-
-

{% trans "Order summary"%}

-
-
- {% with request.session.specs as vm %} -

{% trans "Cores"%} {{vm.cpu}}

+ +
+
+

{% trans "Order summary"%}

-

{% trans "Memory"%} {{vm.memory}} GB

-
-

{% trans "Disk space"%} {{vm.disk_size}} GB

-
-

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

-
-

{% trans "Total"%}

{{vm.price}} CHF

- {% endwith %} +
+ {% with request.session.specs as vm %} +

{% trans "Cores"%} {{vm.cpu}}

+
+

{% trans "Memory"%} {{vm.memory}} GB

+
+

{% trans "Disk space"%} {{vm.disk_size}} GB

+
+

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

+
+

{% trans "Total"%}

{{vm.price}} CHF

+ {% endwith %} +
+
+
+ {% csrf_token %} +
+ +
+
+
-
-
- {% csrf_token %} -
- -
-
-
+ {% endif %}
- {% endif %} -
- + {%endblock%} diff --git a/datacenterlight/templates/datacenterlight/pricing.html b/datacenterlight/templates/datacenterlight/pricing.html index bfda4054..0724a6ce 100644 --- a/datacenterlight/templates/datacenterlight/pricing.html +++ b/datacenterlight/templates/datacenterlight/pricing.html @@ -13,73 +13,73 @@
- -
-
- {% csrf_token %} - -
-

{% trans "VM hosting" %}

-
-
- 15 - CHF -
-

{% trans "VAT included" %}

-
-
-
-
-

{% trans "Hosted in Switzerland" %}

-
-
- - - Core - -
-
- - - GB RAM - -
-
- - - {% trans "GB Storage (SSD)" %} - -
+ +
+ + {% csrf_token %} - - -
- - +
+

{% trans "VM hosting" %}

+
+
+ 15 + CHF +
+

{% trans "VAT included" %}

+
- - - - - -
- +
+
+

{% trans "Hosted in Switzerland" %}

+
+
+ + + Core + +
+
+ + + GB RAM + +
+
+ + + {% trans "GB Storage (SSD)" %} + +
- -
+ + +
+ + +
+ + + + + +
+ + + +
diff --git a/datacenterlight/templates/datacenterlight/success.html b/datacenterlight/templates/datacenterlight/success.html index 4cbee12a..82738352 100644 --- a/datacenterlight/templates/datacenterlight/success.html +++ b/datacenterlight/templates/datacenterlight/success.html @@ -14,21 +14,21 @@
- + }; + diff --git a/datacenterlight/templates/datacenterlight/whydatacenterlight.html b/datacenterlight/templates/datacenterlight/whydatacenterlight.html index fa85721c..47ac6ddb 100644 --- a/datacenterlight/templates/datacenterlight/whydatacenterlight.html +++ b/datacenterlight/templates/datacenterlight/whydatacenterlight.html @@ -213,9 +213,9 @@
{% for message in messages %} {% if 'name' in message.tags %} -
  • - {{ message|safe }} -
+
  • + {{ message|safe }} +
{% endif %} {% endfor %}
@@ -228,9 +228,9 @@
{% for message in messages %} {% if 'email' in message.tags %} -
  • - {{ message|safe }} -
+
  • + {{ message|safe }} +
{% endif %} {% endfor %}
@@ -251,4 +251,4 @@ - {% endblock %} +{% endblock %} From e298f8629045b77b77d51256227809cdee002de7 Mon Sep 17 00:00:00 2001 From: PCoder Date: Sat, 8 Jul 2017 00:12:10 +0530 Subject: [PATCH 06/32] Removed button outline when inactive --- datacenterlight/static/datacenterlight/css/landing-page.css | 1 + 1 file changed, 1 insertion(+) diff --git a/datacenterlight/static/datacenterlight/css/landing-page.css b/datacenterlight/static/datacenterlight/css/landing-page.css index c9fd76aa..cdd88e30 100755 --- a/datacenterlight/static/datacenterlight/css/landing-page.css +++ b/datacenterlight/static/datacenterlight/css/landing-page.css @@ -826,6 +826,7 @@ tech-sub-sec h2 { margin-top: 20px; font-size: 20px; width: 200px; + border: none; } .price-calc-section .card .select-configuration select{ outline: none; From e90d0faa9e187b7ae8c5ef67f34fd1071e3584eb Mon Sep 17 00:00:00 2001 From: Polycarp Okock Date: Fri, 7 Jul 2017 22:19:59 +0300 Subject: [PATCH 07/32] Fixing missing warning text and alignment Fixed the missing warning text and alignment for {% if credit_card_data.last4 %} --- hosting/templates/hosting/payment.html | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/hosting/templates/hosting/payment.html b/hosting/templates/hosting/payment.html index d934acef..af3660a0 100644 --- a/hosting/templates/hosting/payment.html +++ b/hosting/templates/hosting/payment.html @@ -64,11 +64,17 @@
Type: {{credit_card_data.cc_brand}}
-
-
+
{% else %} From efd90f8ddd2deb61969248f3a6c7f5e216a2fb78 Mon Sep 17 00:00:00 2001 From: Polycarp Okock Date: Sat, 8 Jul 2017 00:50:41 +0300 Subject: [PATCH 08/32] Removed the extra btn --- hosting/templates/hosting/payment.html | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/hosting/templates/hosting/payment.html b/hosting/templates/hosting/payment.html index 12d3baea..f5780427 100644 --- a/hosting/templates/hosting/payment.html +++ b/hosting/templates/hosting/payment.html @@ -73,12 +73,7 @@
-
+
{% else %} From 37de810cc39cdc0279c87b31553f2c2a753acbd9 Mon Sep 17 00:00:00 2001 From: Polycarp Okock Date: Sat, 8 Jul 2017 01:39:53 +0300 Subject: [PATCH 09/32] Fixed the alignment issue --- hosting/templates/hosting/payment.html | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/hosting/templates/hosting/payment.html b/hosting/templates/hosting/payment.html index f5780427..4f291fe8 100644 --- a/hosting/templates/hosting/payment.html +++ b/hosting/templates/hosting/payment.html @@ -123,12 +123,14 @@
-->

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

-
- -
+
+
+ +
+