diff --git a/Changelog b/Changelog index 95b7dab8..7e174401 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,14 @@ +1.0.19: 2017-07-09 + * [blog] Added a space between "Posted on" and the "Date" + * [datacenterlight, digitalglarus] Introduced Google Analytics for DCL and digitalglarus.ch + * [datacenterlight] Fixed calculator error message positioning + * [digitalglarus] Fixed favicon for digitalglarus + * [all] Introduced PEP8 code standards using flake8 + * [all] DEBUG is set to False on production + * [all] Using memcached as cache provider on production + * [datacenterlight] Removed Order Now button outline in the order form + * [datacenterlight] Refactored html pages, fixed missing body tag, removed some duplicate script imports + * [datacenterlight] Introduced Why Data Center Light page 1.0.18: 2017-07-02 * [datacenterlight] Introduced the new flow. Landing page -> Payment -> Order confirmation -> Success * [datacenterlight] Fixed issue showing local time to the user in order confirmation page, vm pages (like ssh keys) diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.po b/datacenterlight/locale/de/LC_MESSAGES/django.po index a0c9a470..7585c0cc 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-07-02 23:08+0530\n" +"POT-Creation-Date: 2017-07-09 15:21+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -42,6 +42,71 @@ msgstr "" "Vielen dank für Ihre Anmeldung. Sie erhalten in kürze eine Bestätigungsmail " "von unserem Team" +#: templates/datacenterlight/calculator_form.html:5 +#: templates/datacenterlight/pricing.html:22 +msgid "VM hosting" +msgstr "" + +#: templates/datacenterlight/calculator_form.html:9 +msgid "month" +msgstr "Monat" + +#: templates/datacenterlight/calculator_form.html:11 +#: templates/datacenterlight/pricing.html:28 +msgid "VAT included" +msgstr "MwSt. inklusive" + +#: templates/datacenterlight/calculator_form.html:16 +#: templates/datacenterlight/pricing.html:33 +msgid "Hosted in Switzerland" +msgstr "Standort: Schweiz" + +#: templates/datacenterlight/calculator_form.html:21 +msgid "Please enter a value greater than or equal to 1." +msgstr "Bitte gib einen Wert größer oder gleich 1 ein." + +#: templates/datacenterlight/calculator_form.html:30 +msgid "Please enter a value greater than or equal to 2." +msgstr "Bitte gib einen Wert größer oder gleich 2 ein." + +#: templates/datacenterlight/calculator_form.html:39 +msgid "Please enter a value greater than or equal to 10." +msgstr "Bitte gib einen Wert größer oder gleich 10 ein" + +#: templates/datacenterlight/calculator_form.html:40 +#: templates/datacenterlight/pricing.html:50 +msgid "GB Storage (SSD)" +msgstr "GB Storage (SSD)" + +#: templates/datacenterlight/calculator_form.html:59 +msgid "Name" +msgstr "" + +#: templates/datacenterlight/calculator_form.html:60 +msgid "Your Name" +msgstr "Dein Name" + +#: templates/datacenterlight/calculator_form.html:60 +msgid "Please enter your name" +msgstr "Bitte gib Deinen Namen ein" + +#: templates/datacenterlight/calculator_form.html:74 +msgid "Email" +msgstr "E-Mail-Adresse" + +#: templates/datacenterlight/calculator_form.html:75 +msgid "Your Email" +msgstr "Deine E-Mail" + +#: templates/datacenterlight/calculator_form.html:75 +msgid "Please enter a valid email address" +msgstr "Bitte gib eine gültige E-Mailadresse ein" + +#: templates/datacenterlight/calculator_form.html:88 +#: templates/datacenterlight/pricing.html:79 +msgid "Order Now!" +msgstr "Bestelle jetzt!" + #: templates/datacenterlight/emails/request_access_confirmation.html:99 #: templates/datacenterlight/emails/request_access_confirmation.txt:99 msgid "Thank you for your request." @@ -129,27 +194,28 @@ msgstr "" #: templates/datacenterlight/includes/_footer.html:11 #: templates/datacenterlight/includes/_footer.html:31 #: templates/datacenterlight/includes/_navbar.html:27 -#: templates/datacenterlight/index.html:20 -#: templates/datacenterlight/index.html:47 +#: templates/datacenterlight/includes/_navbar.html:28 +#: templates/datacenterlight/index.html:19 +#: templates/datacenterlight/index.html:46 msgid "Highlights" msgstr "" #: templates/datacenterlight/includes/_footer.html:14 #: templates/datacenterlight/includes/_footer.html:34 #: templates/datacenterlight/includes/_navbar.html:30 -#: templates/datacenterlight/index.html:86 +#: templates/datacenterlight/index.html:85 msgid "Scale out" msgstr "Skalierung" #: templates/datacenterlight/includes/_footer.html:17 #: templates/datacenterlight/includes/_footer.html:37 -#: templates/datacenterlight/includes/_navbar.html:33 -#: templates/datacenterlight/index.html:112 +#: templates/datacenterlight/includes/_navbar.html:31 +#: templates/datacenterlight/index.html:111 msgid "Reliable and light" msgstr "Zuverlässig und leicht" #: templates/datacenterlight/includes/_footer.html:20 -#: templates/datacenterlight/includes/_navbar.html:36 +#: templates/datacenterlight/includes/_navbar.html:32 msgid "Order VM" msgstr "VM bestellen" @@ -167,28 +233,33 @@ msgstr "Home" msgid "Pricing" msgstr "Preise" -#: templates/datacenterlight/index.html:16 +#: templates/datacenterlight/includes/_navbar.html:36 +#: templates/datacenterlight/whydatacenterlight.html:12 +msgid "Why Data Center Light?" +msgstr "Warum Data Center Light?" + +#: templates/datacenterlight/index.html:15 msgid "Finally, an affordable VM hosting in Switzerland!" msgstr "Endlich: bezahlbares VM Hosting in der Schweiz" -#: templates/datacenterlight/index.html:23 +#: templates/datacenterlight/index.html:22 msgid "I want it!" msgstr "Das will ich haben!" -#: templates/datacenterlight/index.html:53 +#: templates/datacenterlight/index.html:52 msgid "" "Reuses existing factory halls instead of building a new expensive building." msgstr "" "Verwendet ehemalige Fabrikhallen anstatt ein neues, teures Gebäude zu " "errichten.
" -#: templates/datacenterlight/index.html:58 +#: templates/datacenterlight/index.html:57 msgid "Only wants you to pay for what you actually need." msgstr "" "Möchte, dass du nur bezahlst, was du auch wirklich brauchst: Wähle deine " "Ressourcen individuell aus!
" -#: templates/datacenterlight/index.html:62 +#: templates/datacenterlight/index.html:61 msgid "" "Is creative, using a modern and alternative design for a data center in " "order to make it more sustainable and affordable at the same time." @@ -197,7 +268,7 @@ msgstr "" "macht um Nachhaltigkeit zu fördern und somit erschwingliche Preise bieten zu " "können.
" -#: templates/datacenterlight/index.html:66 +#: templates/datacenterlight/index.html:65 msgid "" "Cuts down the costs for you by using FOSS (Free Open Source Software) " "exclusively, wherefore we can save money from paying licenses." @@ -206,7 +277,7 @@ msgstr "" "mit FOSS (Free Open Source Software) arbeitet und wir daher auf " "Lizenzgebühren verzichten können.
" -#: templates/datacenterlight/index.html:89 +#: templates/datacenterlight/index.html:88 msgid "" "We don't use special hardware. We use commodity hardware: we buy computers " "that you buy. Just many more and put them in a cozy home for computers " @@ -216,7 +287,7 @@ msgstr "" "erschwingliche Systeme. Bei grösserer Auslastung werden mehr " "Standardkomponenten hinzugekauft und skalieren so das Datencenter." -#: templates/datacenterlight/index.html:115 +#: templates/datacenterlight/index.html:114 msgid "" "Our VMs are located in Switzerland, with reliable power supply and fast " "internet connection. Our VM costs less thanks to our featherlight " @@ -226,91 +297,26 @@ msgstr "" "Energieversorgung, sowie schneller Internetverbindung ausgestattet. Unser " "Angebot ist aufgrund unserer leichten Infrastruktur überaus kostengünstig." -#: templates/datacenterlight/index.html:133 +#: templates/datacenterlight/index.html:132 #: templates/datacenterlight/pricing.html:86 msgid "Simple and affordable: Try our virtual machine with featherlight price." msgstr "" "Einfach und bezahlbar: Teste nun unsere virtuellen Maschinen mit " "federleichten Preisen." -#: templates/datacenterlight/index.html:134 +#: templates/datacenterlight/index.html:133 msgid "Affordable VM hosting based in Switzerland" msgstr "Bezahlbares VM Hosting in der Schweiz" -#: templates/datacenterlight/index.html:145 -#: templates/datacenterlight/pricing.html:22 -msgid "VM hosting" -msgstr "" - -#: templates/datacenterlight/index.html:149 -msgid "month" -msgstr "Monat" - -#: templates/datacenterlight/index.html:151 -#: templates/datacenterlight/pricing.html:28 -msgid "VAT included" -msgstr "MwSt. inklusive" - -#: templates/datacenterlight/index.html:156 -#: templates/datacenterlight/pricing.html:33 -msgid "Hosted in Switzerland" -msgstr "Standort: Schweiz" - -#: templates/datacenterlight/index.html:161 -msgid "Please enter a value greater than or equal to 1." -msgstr "Bitte gib einen Wert größer oder gleich 1 ein." - -#: templates/datacenterlight/index.html:170 -msgid "Please enter a value greater than or equal to 2." -msgstr "Bitte gib einen Wert größer oder gleich 2 ein." - -#: templates/datacenterlight/index.html:179 -msgid "Please enter a value greater than or equal to 10." -msgstr "Bitte gib einen Wert größer oder gleich 10 ein" - -#: templates/datacenterlight/index.html:180 -#: templates/datacenterlight/pricing.html:50 -msgid "GB Storage (SSD)" -msgstr "GB Storage (SSD)" - -#: templates/datacenterlight/index.html:199 -msgid "Name" -msgstr "" - -#: templates/datacenterlight/index.html:200 -msgid "Your Name" -msgstr "Dein Name" - -#: templates/datacenterlight/index.html:200 -msgid "Please enter your name" -msgstr "Bitte gib Deinen Namen ein" - -#: templates/datacenterlight/index.html:214 -msgid "Email" -msgstr "E-Mail-Adresse" - -#: templates/datacenterlight/index.html:215 -msgid "Your Email" -msgstr "Deine E-Mail" - -#: templates/datacenterlight/index.html:215 -msgid "Please enter a valid email address" -msgstr "Bitte gib eine gültige E-Mailadresse ein" - -#: templates/datacenterlight/index.html:228 -#: templates/datacenterlight/pricing.html:79 -msgid "Order Now!" -msgstr "Bestelle jetzt!" - -#: templates/datacenterlight/index.html:254 +#: templates/datacenterlight/index.html:166 msgid "Switzerland " msgstr "Schweiz" -#: templates/datacenterlight/index.html:271 +#: templates/datacenterlight/index.html:183 msgid "Questions?" msgstr "Fragen?" -#: templates/datacenterlight/index.html:271 +#: templates/datacenterlight/index.html:183 msgid "Contact us!" msgstr "Kontaktiere uns!" @@ -392,11 +398,106 @@ msgstr "" msgid "as soon as possible!" msgstr "" -#: views.py:234 +#: templates/datacenterlight/whydatacenterlight.html:26 +msgid "Tech Stack" +msgstr "Tech Stack" + +#: templates/datacenterlight/whydatacenterlight.html:29 +msgid "We are seriously open source." +msgstr "Wir sind vollends opensource." + +#: templates/datacenterlight/whydatacenterlight.html:30 +msgid "" +" Our full software stack is open source – We don't use anything that isn't " +"open source.
Yes, we are that cool. " +msgstr "" +"Unser gesamter Softwaresstack ist Open-Source – Wir verwenden nichts, das " +"nicht Open-Source ist.
Yep, so cool sind wir." + +#: templates/datacenterlight/whydatacenterlight.html:37 +msgid "Our services run on" +msgstr "Unsere Dienste läuft auf" + +#: templates/datacenterlight/whydatacenterlight.html:41 +msgid "Our monitoring" +msgstr "Unser Monitoring" + +#: templates/datacenterlight/whydatacenterlight.html:45 +msgid "Our storage layer" +msgstr "Unser Storage-Layer" + +#: templates/datacenterlight/whydatacenterlight.html:49 +msgid "Our web frontend" +msgstr "Unser Web-Frontend" + +#: templates/datacenterlight/whydatacenterlight.html:53 +msgid "Our cloud" +msgstr "Unsere Cloud" + +#: templates/datacenterlight/whydatacenterlight.html:57 +msgid "Our configuration management system" +msgstr "Unser Konfigurationsmanagementsystem" + +#: templates/datacenterlight/whydatacenterlight.html:61 +msgid "Our awesome juice" +msgstr "Unser Treibstoff" + +#: templates/datacenterlight/whydatacenterlight.html:65 +msgid "Our NAT64 gateway" +msgstr "Unser NAT64 Gateway" + +#: templates/datacenterlight/whydatacenterlight.html:90 +msgid "We believe in giving back to the FOSS community." +msgstr "Wir unterstützen die FOSS Community." + +#: templates/datacenterlight/whydatacenterlight.html:91 +msgid "" +"Data Center Light is the child of free and open source software (FOSS) " +"movement.
We grew up with it, live by it, and believe in it.
The " +"more we work on our data center,
the more we contribute back to the FOSS " +"community." +msgstr "" +"Data Center Light ist ein Teil der Free und Opens Source Software (FOSS) " +"Bewegung.
Wir sind damit gross geworden, leben damit und glauben daran." +"
Je weiter wir mit unserem Data Center Light vorankommen, desto mehr " +"können wir etwas an die FOSS Community zurückgeben." + +#: templates/datacenterlight/whydatacenterlight.html:104 +msgid "We bring the future to you." +msgstr "Wir bringen die Zukunft zu dir." + +#: templates/datacenterlight/whydatacenterlight.html:107 +msgid "" +" Data Center Light uses the most modern technologies out there.
\n" +" Your VM needs only IPv6. Data Center Light " +"provides
transparent two-way IPv6/IPv4 translation.\n" +" " +msgstr "" +"Data Center Light verwendet die zur Zeit modernsten Technologien.
Deine " +"VM läuft mit IPv6. Data Center Light bietet eine transparente IPv6/IPv4-" +"Zweiweglösung." + +#: templates/datacenterlight/whydatacenterlight.html:122 +msgid "" +" No more spinning metal plates! Data Center Light uses only SSDs. We keep " +"things faster and lighter. " +msgstr "" +"Keine drehenden Metallplatten mehr! Data Center Light verwendet " +"ausschliesslich SSDs. Wir halten die Dinge schnell, leicht und effizient." + +#: templates/datacenterlight/whydatacenterlight.html:138 +msgid "Starting from only 15CHF per month. Try now." +msgstr "Unser Angebot beginnt bei 15 CHF pro Monat. Probier's jetzt aus!" + +#: templates/datacenterlight/whydatacenterlight.html:139 +msgid "Actions speak louder than words. Let's do it, try our VM now." +msgstr "Tagen sagen mehr als Worte – Teste jetzt unsere VM!" + +#: views.py:235 msgid "is not a proper name" msgstr "ist kein gültiger Name" -#: views.py:241 +#: views.py:242 msgid "is not a proper email" msgstr "ist keine gültige E-Mailadresse" diff --git a/datacenterlight/static/datacenterlight/css/landing-page.css b/datacenterlight/static/datacenterlight/css/landing-page.css index c9fd76aa..077faef7 100755 --- a/datacenterlight/static/datacenterlight/css/landing-page.css +++ b/datacenterlight/static/datacenterlight/css/landing-page.css @@ -640,6 +640,9 @@ tech-sub-sec h2 { .btm-space{ padding-bottom: 8px; } +.btm-space-tayga{ + padding-bottom: 12px; +} .percent-text { font-size: 50px; color: #999; @@ -826,6 +829,7 @@ tech-sub-sec h2 { margin-top: 20px; font-size: 20px; width: 200px; + border: none; } .price-calc-section .card .select-configuration select{ outline: none; diff --git a/datacenterlight/static/datacenterlight/img/tayga.png b/datacenterlight/static/datacenterlight/img/tayga.png index 07b9e092..fb2a7429 100644 Binary files a/datacenterlight/static/datacenterlight/img/tayga.png and b/datacenterlight/static/datacenterlight/img/tayga.png differ diff --git a/datacenterlight/templates/datacenterlight/base.html b/datacenterlight/templates/datacenterlight/base.html index 2c3f0e5d..fc69a2d5 100644 --- a/datacenterlight/templates/datacenterlight/base.html +++ b/datacenterlight/templates/datacenterlight/base.html @@ -3,65 +3,66 @@ - + - - - - - + + + + + - 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/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 %} +
+
+
+ +
diff --git a/datacenterlight/templates/datacenterlight/index.html b/datacenterlight/templates/datacenterlight/index.html index 822858ae..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 %} @@ -112,7 +111,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." %}

@@ -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" %}
@@ -278,4 +190,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..ff553f3c 100644 --- a/datacenterlight/templates/datacenterlight/success.html +++ b/datacenterlight/templates/datacenterlight/success.html @@ -12,29 +12,21 @@
- - - - - - - - + var hash = window.location.hash.substr(1); + console.log(hash); + if (hash == 'requestform'){ + $('#reques-success-message').modal('show'); + } + }; + {% endblock %} \ No newline at end of file diff --git a/datacenterlight/templates/datacenterlight/whydatacenterlight.html b/datacenterlight/templates/datacenterlight/whydatacenterlight.html index fa85721c..3cd10074 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,21 +74,21 @@
-
-
- Opennebula -
-
- Cdist byu ngleich -
-
- Prometheus -
+
+
+ Opennebula +
+
+ Cdist byu ngleich +
+
+ Prometheus +

{% trans "We believe in giving back to the FOSS community." %}

-

{% blocktrans %}Data Center Light is the child of free and open source software (FOSS).
We grew up with it, live by it, and believe in it.
The more we work on our data center,
the more we contribute back to the FOSS community.{% endblocktrans %}

+

{% blocktrans %}Data Center Light is the child of free and open source software (FOSS) movement.
We grew up with it, live by it, and believe in it.
The more we work on our data center,
the more we contribute back to the FOSS community.{% endblocktrans %}

@@ -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 %} +{% endblock %} diff --git a/dynamicweb/settings/base.py b/dynamicweb/settings/base.py index 0df9031f..56c1e589 100644 --- a/dynamicweb/settings/base.py +++ b/dynamicweb/settings/base.py @@ -146,7 +146,6 @@ TEMPLATES = [ { 'BACKEND': 'django.template.backends.django.DjangoTemplates', 'DIRS': [os.path.join(PROJECT_DIR, 'cms_templates/'), - os.path.join(PROJECT_DIR, 'templates'), os.path.join(PROJECT_DIR, 'cms_templates/djangocms_blog/'), os.path.join(PROJECT_DIR, 'membership'), os.path.join(PROJECT_DIR, 'hosting/templates/'), @@ -154,8 +153,8 @@ TEMPLATES = [ os.path.join(PROJECT_DIR, 'ungleich/templates/djangocms_blog/'), os.path.join(PROJECT_DIR, 'ungleich/templates/cms/ungleichch'), os.path.join(PROJECT_DIR, 'ungleich/templates/ungleich'), - os.path.join(PROJECT_DIR, 'ungleich_page/templates/ungleich_page') - + os.path.join(PROJECT_DIR, 'ungleich_page/templates/ungleich_page'), + os.path.join(PROJECT_DIR, 'templates/analytics'), ], 'APP_DIRS': True, 'OPTIONS': { diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po index b3cc6c0b..89257629 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-07-01 02:09+0530\n" +"POT-Creation-Date: 2017-07-11 00:02+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,11 +18,11 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: forms.py:28 +#: forms.py:25 msgid "Your account is not activated yet." msgstr "Dein Account wurde noch nicht aktiviert." -#: forms.py:65 +#: forms.py:62 msgid "Paste here your public key" msgstr "Fügen Sie Ihren public key ein" @@ -185,20 +185,14 @@ msgid "New Virtual Machine" msgstr "Neue virtuelle Maschine" #: templates/hosting/create_virtual_machine.html:28 -#, fuzzy -#| msgid "Select VM Template:" msgid "Step 1. Select VM Template:" msgstr "Wähle eine Vorlage" #: templates/hosting/create_virtual_machine.html:42 -#, fuzzy -#| msgid "Select VM Configuration:" msgid "Step2. Select VM Configuration" msgstr "Wähle eine Konfiguration" #: templates/hosting/create_virtual_machine.html:59 -#, fuzzy -#| msgid "Pricing" msgid "Price " msgstr "Preis" @@ -239,7 +233,7 @@ msgid "Don't have an account yet ? " msgstr "Besitzt du kein Benutzerkonto?" #: templates/hosting/login.html:37 templates/hosting/signup.html.py:13 -#: templates/hosting/signup.html:21 views.py:223 +#: templates/hosting/signup.html:21 views.py:219 msgid "Sign up" msgstr "Registrieren" @@ -369,28 +363,31 @@ msgid "Billing Address" msgstr "Rechnungsadresse" #: templates/hosting/payment.html:52 -msgid "Payment Details" -msgstr "Rechnungsdetails" +msgid "Credit Card" +msgstr "Kreditkarte" -#: templates/hosting/payment.html:65 -msgid "Submit Payment" -msgstr "Betrag überweisen" +#: templates/hosting/payment.html:56 +msgid "" +"Please fill in your credit card information below. We are using Stripe for payment and do not " +"store your information in our database." +msgstr "" +"Bitte füll deine Kreditkarteninformationen unten aus. Wir nutzen Stripe für die Bezahlung und " +"speichern keine Informationen in unserer Datenbank." -#: templates/hosting/payment.html:84 -msgid "CARD NUMBER" -msgstr "Kreditkartennummer" +#: templates/hosting/payment.html:71 templates/hosting/payment.html.py:96 +msgid "" +"You are not making any payment yet. After submitting your card information, " +"you will be taken to the Confirm Order Page." +msgstr "" +"Es wird noch keine Bezahlung vorgenommen. Nach der Eingabe deiner " +"Kreditkateninformationen wirst du auf die Bestellbestätigungsseite " +"weitergeleitet." -#: templates/hosting/payment.html:89 -msgid "Valid Card Number" -msgstr "Gültige Kreditkartennummer" - -#: templates/hosting/payment.html:98 -msgid "EXPIRATION DATE" -msgstr "Ablaufdatum" - -#: templates/hosting/payment.html:109 -msgid "CV CODE" -msgstr "CV Code" +#: templates/hosting/payment.html:76 templates/hosting/payment.html.py:100 +msgid "Submit" +msgstr "Absenden" #: templates/hosting/reset_password.html:15 msgid "Reset your password" @@ -431,14 +428,10 @@ msgid "Created at" msgstr "Erstellt am" #: templates/hosting/user_keys.html:43 -#, fuzzy -#| msgid "Delete" msgid "Delete Key" msgstr "Löschen" #: templates/hosting/user_keys.html:56 -#, fuzzy -#| msgid "Do You want do delete your order?" msgid "Do You want to delete this key?" msgstr "Möchtest Du den Schlüssel löschen?" @@ -502,11 +495,11 @@ msgstr "IPv4" msgid "Ipv6" msgstr "IPv6" -#: views.py:213 views.py:232 +#: views.py:207 views.py:229 msgid "login" msgstr "einloggen" -#: views.py:217 +#: views.py:212 msgid "" "Thank you for signing up. We have sent an email to you. Please follow the " "instructions in it to activate your account. Once activated, you can login " @@ -516,32 +509,58 @@ msgstr "" "den Anweisungen um deinen Account zu aktivieren. Danach kannst du dich über " "diesen" -#: views.py:218 views.py:243 +#: views.py:214 views.py:240 msgid "Go back to" msgstr "Zurück" -#: views.py:233 +#: views.py:230 msgid "Account activation" msgstr "Accountaktivierung" -#: views.py:236 +#: views.py:233 msgid "Your account has been activated." msgstr "Dein Account wurde aktiviert." -#: views.py:237 +#: views.py:234 msgid "You can now" msgstr "Du kannst dich nun" -#: views.py:242 +#: views.py:239 msgid "Sorry. Your request is invalid." msgstr "Entschuldigung, deine Anfrage ist ungültig." -#: views.py:760 +#: views.py:756 msgid "" "We could not find the requested VM. Please " "contact Data Center Light Support." msgstr "" +#~ msgid "Payment Details" +#~ msgstr "Rechnungsdetails" + +#~ msgid "Place Order" +#~ msgstr "Bestelle" + +#~ msgid "" +#~ "You are not making any payment yet. After placing your order, you will be " +#~ "taken to the Submit Payment Page." +#~ msgstr "" +#~ "Es wird noch keine Bezahlung vorgenommen. Nach der Eingabe deiner " +#~ "Kreditkateninformationen wirst du auf die Bestellbestätigungsseite " +#~ "weitergeleitet." + +#~ msgid "CARD NUMBER" +#~ msgstr "Kreditkartennummer" + +#~ msgid "Valid Card Number" +#~ msgstr "Gültige Kreditkartennummer" + +#~ msgid "EXPIRATION DATE" +#~ msgstr "Ablaufdatum" + +#~ msgid "CV CODE" +#~ msgstr "CV Code" + #~ msgid "Home" #~ msgstr "Home" diff --git a/hosting/templates/hosting/payment.html b/hosting/templates/hosting/payment.html index c193378c..faacee82 100644 --- a/hosting/templates/hosting/payment.html +++ b/hosting/templates/hosting/payment.html @@ -49,9 +49,13 @@
-

{%trans "Payment Details"%}

+

{%trans "Credit Card"%}

+
+

{% 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 %}
@@ -60,61 +64,42 @@
Type: {{credit_card_data.cc_brand}}
-
- -
+ +
+
+
{% trans "You are not making any payment yet. After submitting your card information, you will be taken to the Confirm Order Page." %}

+
+
+
+ +
+
+
{% else %}
-
+
- - -
-
- -
+
+
+

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

+
+
+
+ +
+