From 11108a4d590311a39230e542feee1cbdef41210c Mon Sep 17 00:00:00 2001 From: PCoder Date: Sun, 9 Jul 2017 13:43:30 +0530 Subject: [PATCH 1/2] Refactored calculator form --- .../datacenterlight/calculator_form.html | 89 +++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100644 datacenterlight/templates/datacenterlight/calculator_form.html diff --git a/datacenterlight/templates/datacenterlight/calculator_form.html b/datacenterlight/templates/datacenterlight/calculator_form.html new file mode 100644 index 00000000..65c19c9b --- /dev/null +++ b/datacenterlight/templates/datacenterlight/calculator_form.html @@ -0,0 +1,89 @@ +{% load staticfiles i18n%} +
+ {% csrf_token %} +
+

{% trans "VM hosting" %}

+
+
+ 15 + CHF/{% trans "month" %} +
+

{% trans "VAT included" %}

+
+
+
+
+

{% trans "Hosted in Switzerland" %}

+
+
+
+ + + Core + +
+
+
+
+
+ + + GB RAM + +
+
+
+
+
+ + + {% trans "GB Storage (SSD)" %} + +
+
+
+
+ + +
+ + +
+
+ + +
+
+ {% 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 %} +
+
+
+ +
From 87fb40400b7c1a965b6daf0b88a0efd7278a57cf Mon Sep 17 00:00:00 2001 From: PCoder Date: Sun, 9 Jul 2017 13:44:22 +0530 Subject: [PATCH 2/2] Refactored calculator form code and disabled the Order Now button by default --- .../templates/datacenterlight/index.html | 90 +------ .../datacenterlight/whydatacenterlight.html | 247 ++++++------------ 2 files changed, 77 insertions(+), 260 deletions(-) diff --git a/datacenterlight/templates/datacenterlight/index.html b/datacenterlight/templates/datacenterlight/index.html index 90ad26cd..f37faf08 100755 --- a/datacenterlight/templates/datacenterlight/index.html +++ b/datacenterlight/templates/datacenterlight/index.html @@ -1,6 +1,5 @@ {% extends "datacenterlight/base.html" %} {% load staticfiles i18n%} -{% get_current_language as LANGUAGE_CODE %} {% block content %} @@ -139,94 +138,7 @@
-
- {% csrf_token %} -
-

{% trans "VM hosting" %}

-
-
- 15 - CHF/{% trans "month" %} -
-

{% trans "VAT included" %}

-
-
-
-
-

{% trans "Hosted in Switzerland" %}

-
-
-
- - - Core - -
-
-
-
-
- - - GB RAM - -
-
-
-
-
- - - {% trans "GB Storage (SSD)" %} - -
-
-
-
- - -
- - -
-
- - -
-
- {% 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 %} -
-
-
- -
+ {% include "datacenterlight/calculator_form.html" %}
diff --git a/datacenterlight/templates/datacenterlight/whydatacenterlight.html b/datacenterlight/templates/datacenterlight/whydatacenterlight.html index 47ac6ddb..e4354bb7 100644 --- a/datacenterlight/templates/datacenterlight/whydatacenterlight.html +++ b/datacenterlight/templates/datacenterlight/whydatacenterlight.html @@ -1,22 +1,19 @@ {% extends "datacenterlight/base.html" %} {% load staticfiles i18n%} -{% get_current_language as LANGUAGE_CODE %} {% block content %} - -
-
-
-
-
-
-

{% trans "Why Data Center Light?" %}

+
+
+
+
+
+

{% trans "Why Data Center Light?" %}

-
-
-
+
+
+
@@ -35,39 +32,39 @@
-
- Devuan - {% trans "Our services run on" %} -
-
- Prometheus - {% trans "Our monitoring" %} -
-
- Ceph - {% trans "Our storage layer" %} -
-
- Django - {% trans "Our web frontend" %} -
-
- Opennebula - {% trans "Our cloud" %} -
-
- Cdist by ungleich - {% trans "Our configuration management system" %} -
-
- Python - {% trans "Our awesome juice" %} -
-
- Tayga - {% trans "Our NAT64 gateway" %} -
- +
+ Devuan + {% trans "Our services run on" %} +
+
+ Prometheus + {% trans "Our monitoring" %} +
+
+ Ceph + {% trans "Our storage layer" %} +
+
+ Django + {% trans "Our web frontend" %} +
+
+ Opennebula + {% trans "Our cloud" %} +
+
+ Cdist by ungleich + {% trans "Our configuration management system" %} +
+
+ Python + {% trans "Our awesome juice" %} +
+
+ Tayga + {% trans "Our NAT64 gateway" %} +
+
@@ -77,16 +74,16 @@
-
-
- Opennebula -
-
- Cdist byu ngleich -
-
- Prometheus -
+
+
+ Opennebula +
+
+ Cdist byu ngleich +
+
+ Prometheus +
@@ -102,33 +99,30 @@
-
-
-

{% trans "We bring the future to you." %}

-
-
-

{% blocktrans %} Data Center Light uses the most modern technologies out there.
- Your VM needs only IPv6. Data Center Light provides
transparent two-way IPv6/IPv4 translation. - {% endblocktrans %}

-
-
- 100% IPv6 -
-
-
-
-
- 100% SSD SSD -
-
-
-

{% blocktrans %} No more spinning metal plates! Data Center Light uses only SSDs. We keep things faster and lighter. {% endblocktrans %}

-
-
+
+
+

{% trans "We bring the future to you." %}

+
+
+

{% blocktrans %} Data Center Light uses the most modern technologies out there.
+ Your VM needs only IPv6. Data Center Light provides
transparent two-way IPv6/IPv4 translation. + {% endblocktrans %}

+
+
+ 100% IPv6 +
+
+
+
+
+ 100% SSD SSD +
+
+
+

{% blocktrans %} No more spinning metal plates! Data Center Light uses only SSDs. We keep things faster and lighter. {% endblocktrans %}

+
+
- - -
@@ -150,94 +144,7 @@
-
- {% csrf_token %} -
-

{% trans "VM hosting" %}

-
-
- 15 - CHF/{% trans "month" %} -
-

{% trans "VAT included" %}

-
-
-
-
-

{% trans "Hosted in Switzerland" %}

-
-
-
- - - Core - -
-
-
-
-
- - - GB RAM - -
-
-
-
-
- - - {% trans "GB Storage (SSD)" %} - -
-
-
-
- - -
- - -
-
- - -
-
- {% 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 %} -
-
-
- -
+ {% include "datacenterlight/calculator_form.html" %}
@@ -249,6 +156,4 @@
- - {% endblock %}