From 66d0df7196adb3410af5a9c14751ca136a682433 Mon Sep 17 00:00:00 2001 From: Karthik Rao Date: Wed, 5 Jul 2017 17:09:03 +0530 Subject: [PATCH 1/3] Insert missing body end tag to dcl's base.html --- datacenterlight/templates/datacenterlight/base.html | 1 + 1 file changed, 1 insertion(+) diff --git a/datacenterlight/templates/datacenterlight/base.html b/datacenterlight/templates/datacenterlight/base.html index 2c3f0e5d..91422353 100644 --- a/datacenterlight/templates/datacenterlight/base.html +++ b/datacenterlight/templates/datacenterlight/base.html @@ -64,4 +64,5 @@ + From 3a673bdbac5b9da2147d829ae21bad870e7c72c2 Mon Sep 17 00:00:00 2001 From: Karthik Rao Date: Wed, 5 Jul 2017 21:03:54 +0530 Subject: [PATCH 2/3] Remove repeated script imports from dcl's success.html --- datacenterlight/templates/datacenterlight/success.html | 8 -------- 1 file changed, 8 deletions(-) diff --git a/datacenterlight/templates/datacenterlight/success.html b/datacenterlight/templates/datacenterlight/success.html index 4cbee12a..15592201 100644 --- a/datacenterlight/templates/datacenterlight/success.html +++ b/datacenterlight/templates/datacenterlight/success.html @@ -12,7 +12,6 @@ - - - - - - - - {% 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 3/3] 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 %}