From 55836482934a78dc28f81ca76c08da87ec352a27 Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Tue, 6 Jun 2017 01:43:43 +0530 Subject: [PATCH 01/25] Changed the url for 'Order Now!' button on dcl's index page. It is now datacenterlight/order instead of datacenterlight/pricing --- datacenterlight/urls.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datacenterlight/urls.py b/datacenterlight/urls.py index 9c3c84fb..60dfcb82 100644 --- a/datacenterlight/urls.py +++ b/datacenterlight/urls.py @@ -7,6 +7,6 @@ urlpatterns = [ url(r'^/?$', IndexView.as_view(), name='index'), url(r'^/beta-program/?$', BetaProgramView.as_view(), name='beta'), url(r'^/landing/?$', LandingProgramView.as_view(), name='landing'), - url(r'^/pricing/?$', PricingView.as_view(), name='pricing'), + url(r'^/order/?$', PricingView.as_view(), name='pricing'), url(r'^/beta_access?$', BetaAccessView.as_view(), name='beta_access'), ] From 2ead42bd1abc4aec69a633092be5141069479c3d Mon Sep 17 00:00:00 2001 From: Henry Bravo Date: Mon, 5 Jun 2017 15:35:48 -0500 Subject: [PATCH 02/25] Add input fields (email, name) in Calculator (Pricing page) and Sucess page --- .../locale/de/LC_MESSAGES/django.mo | Bin 4037 -> 4165 bytes .../locale/de/LC_MESSAGES/django.po | 37 +++-- .../datacenterlight/css/landing-page.css | 32 ++++- .../templates/datacenterlight/pricing.html | 12 +- .../templates/datacenterlight/success.html | 134 ++++++++++++++++++ datacenterlight/urls.py | 3 +- datacenterlight/views.py | 3 + 7 files changed, 206 insertions(+), 15 deletions(-) create mode 100644 datacenterlight/templates/datacenterlight/success.html diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.mo b/datacenterlight/locale/de/LC_MESSAGES/django.mo index 8f4d30cd34bb8896e79ae7ba48b8cf312815cf33..60da107cbaf6e3917d7c2ab95d50e9e88cd3b6aa 100644 GIT binary patch delta 931 zcmX}qO=uHA6u|LG(~qPzwZ@Mc+uDh>mujQ^l130E+CoJM1#3OnLq3Ld>1HFzMp1+y zc<4z5Pxa`>P3R$Fy(vmO^y)O|9v@;me!>p?f?c?U7x5>KVX{@J9$Z2G)LkCC@E&&J19Wf=!x(Dw_oHp9 zrqY{EhO0X{wS0DV)YM_Tef@!sj@S>v#gU@Hj?E@&eDI zeC|g_&F|rHRen5?pKANON~wszwXe!~f*comKKiDKBxI*#)BBo;7@Wk>;1 zTnll8h!Jv)GUR$>9Q5&uXKJYfJh|5YLylF3bUozF{09f&{YYg+t!j{RW zh>)Y!L_aY=aGR>$A6y8Il*)Nij_Y)_tX-2S>RXm=>s-lkGdWk^E>-nSE2B*@W7+j= z`=3DPsnL^DdTi?S_(Z)B>J9`_k9)d?>+9jZ)}_2%4Y05d5kW8cwMk%uV}e?ZrL%8mu+VBGU>GC=&PojwVb@Xt^OtwY54~k Ci*(@t delta 836 zcmZwFOGs346vy#%XPj|n)N!)3d|x%go-$*jASmS&0H! z$tDx(U<;o*JUkI5d_$I2=HKH@T*gQE4=1sMr*LbZP=$X(?Z6^Fz*W41akfkId8Bz8 zLNzqzo!(60J0@OXB_3lrR?yxyHY3HGQx+yl;AOsNQ0v=p4ttTD_7hdm3O3*`)K2}y z9^ApZ=(VKH?s4-Nf8zp@+os7bpW!&ZMK&g=UhjyGrHRnPFAy49e}&++ux6r$P?s7y z9*yb{s|xjkF4WoCQ1u$Bz9qN|FBBYf8bR$$BSEdf(AIKdL5G^)H8Gc{BkBnqk!ADl zaGzUv{o>`5xmmZZP#Cyw_x)6~5cR*t_ncJzcCN$Cc6H}E{f~*XQ+eL{zRyi1t^Rtl Kw#Xk%A2}!T$V_nn diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.po b/datacenterlight/locale/de/LC_MESSAGES/django.po index 45629dab..014a31d9 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-05-23 17:26-0500\n" +"POT-Creation-Date: 2017-06-05 15:23-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -67,6 +67,7 @@ msgstr "Vielen Dank!" #: templates/datacenterlight/index.html:62 #: templates/datacenterlight/pricing.html:62 +#: templates/datacenterlight/success.html:62 msgid "What is it" msgstr "Was ist es?" @@ -74,7 +75,8 @@ msgstr "Was ist es?" #: templates/datacenterlight/index.html:171 #: templates/datacenterlight/index.html:331 #: templates/datacenterlight/pricing.html:65 -#: templates/datacenterlight/pricing.html:188 +#: templates/datacenterlight/pricing.html:198 +#: templates/datacenterlight/success.html:65 msgid "Scale out" msgstr "Skalierung" @@ -82,19 +84,22 @@ msgstr "Skalierung" #: templates/datacenterlight/index.html:197 #: templates/datacenterlight/index.html:334 #: templates/datacenterlight/pricing.html:68 -#: templates/datacenterlight/pricing.html:191 +#: templates/datacenterlight/pricing.html:201 +#: templates/datacenterlight/success.html:68 msgid "Reliable and light" msgstr "Zuverlässig und leicht" #: templates/datacenterlight/index.html:71 #: templates/datacenterlight/pricing.html:71 +#: templates/datacenterlight/success.html:71 msgid "Buy VM" msgstr "VM Kaufen" #: templates/datacenterlight/index.html:74 #: templates/datacenterlight/index.html:341 #: templates/datacenterlight/pricing.html:74 -#: templates/datacenterlight/pricing.html:198 +#: templates/datacenterlight/pricing.html:208 +#: templates/datacenterlight/success.html:74 msgid "Contact" msgstr "Kontakt" @@ -112,7 +117,7 @@ msgstr "Das will ich haben!" #: templates/datacenterlight/index.html:142 #: templates/datacenterlight/index.html:328 -#: templates/datacenterlight/pricing.html:185 +#: templates/datacenterlight/pricing.html:195 msgid "How it works" msgstr "Wie es funktioniert" @@ -177,11 +182,13 @@ msgid "Based in Switzerland" msgstr "Standort des Datacenters ist in der Schweiz" #: templates/datacenterlight/index.html:243 -msgid "15 GB Storage (SSD)" +#, fuzzy +#| msgid "15 GB Storage (SSD)" +msgid "10 GB Storage (SSD)" msgstr "15 GB Storage (SSD)" #: templates/datacenterlight/index.html:246 -#: templates/datacenterlight/pricing.html:156 +#: templates/datacenterlight/pricing.html:166 msgid "Order Now!" msgstr "Bestelle jetzt!" @@ -202,12 +209,12 @@ msgid "Contact us!" msgstr "Kontaktiere uns!" #: templates/datacenterlight/index.html:324 -#: templates/datacenterlight/pricing.html:181 +#: templates/datacenterlight/pricing.html:191 msgid "Home" msgstr "Home" #: templates/datacenterlight/index.html:337 -#: templates/datacenterlight/pricing.html:194 +#: templates/datacenterlight/pricing.html:204 msgid "Pricing" msgstr "Preise" @@ -217,14 +224,22 @@ msgstr "Preise" msgid "Hosted in Switzerland" msgstr "Standort des Datacenters ist in der Schweiz" -#: templates/datacenterlight/pricing.html:136 +#: templates/datacenterlight/pricing.html:139 msgid "GB Storage (SSD)" msgstr "GB Storage (SSD)" -#: templates/datacenterlight/pricing.html:163 +#: templates/datacenterlight/pricing.html:173 msgid "Simple and affordable: Try our virtual machine with featherlight price." msgstr "" +#: templates/datacenterlight/success.html:101 +msgid "Thank you for order! Our team will contact you via email" +msgstr "Vielen Dank für die Bestellung. Unser Team setzt sich sobald wie möglich mit Ihnen via E-Mail in Verbindung." + +#: templates/datacenterlight/success.html:102 +msgid "as soon as possible!" +msgstr "" + #~ msgid "Buy Now!" #~ msgstr "Kaufe jetzt!" diff --git a/datacenterlight/static/datacenterlight/css/landing-page.css b/datacenterlight/static/datacenterlight/css/landing-page.css index 74671e1a..5c878fc7 100755 --- a/datacenterlight/static/datacenterlight/css/landing-page.css +++ b/datacenterlight/static/datacenterlight/css/landing-page.css @@ -243,6 +243,10 @@ h6 { align-items: center; position: relative; } +.intro-pricing.success-pricing{ + height: 100vh; + max-height: 100vh; +} .intro-pricing::before{ content: ""; position: absolute; @@ -631,12 +635,32 @@ h6 { height: 40px; width: 200px; text-align: center; - font-size: 18px; + font-size: 16px; + margin-left: 10px; } .price-calc-section .card .check-ip{ font-size: 18px; } - +.price-calc-section .card .description.input{ + justify-content: center; +} +.price-calc-section .card .description.input label{ + font-size: 15px; + font-weight: 800; + font-family: 'Montserrat-Regular'; + margin-bottom: 0; + width: 40px; +} +.price-calc-section .card .description.input input{ + width: 200px; + font-size: 14px; + text-align: left; + padding: 5px 10px; + border-radius: 4px; + border: 1px solid #d0d0d0; + background: #fff; + margin-left: 10px; +} .price-calc-section .card .check-ip input[type=checkbox]{ font-size: 17px; margin: 0 8px; @@ -735,6 +759,10 @@ h6 { left: 50%; transform: translate(-50%, 0); } + + .intro-pricing .intro-message .section-heading { + font-size: 30px; + } } diff --git a/datacenterlight/templates/datacenterlight/pricing.html b/datacenterlight/templates/datacenterlight/pricing.html index 1674f82e..e7b8811b 100644 --- a/datacenterlight/templates/datacenterlight/pricing.html +++ b/datacenterlight/templates/datacenterlight/pricing.html @@ -141,7 +141,8 @@ -
+
+ +
+
+ + +
diff --git a/datacenterlight/templates/datacenterlight/success.html b/datacenterlight/templates/datacenterlight/success.html new file mode 100644 index 00000000..ce53aa02 --- /dev/null +++ b/datacenterlight/templates/datacenterlight/success.html @@ -0,0 +1,134 @@ +{% load staticfiles i18n%} +{% get_current_language as LANGUAGE_CODE %} + + + + + + + + + + + + datacenterlight.ch - Featherlight Swiss VM + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+

{% trans "Thank you for order! Our team will contact you via email" %}

+ {% if LANGUAGE_CODE == 'en-us'%} +

{% trans "as soon as possible!" %}

+ {% endif %} +
+ +
+ + + + + + + + + + + + + diff --git a/datacenterlight/urls.py b/datacenterlight/urls.py index 9c3c84fb..8713165f 100644 --- a/datacenterlight/urls.py +++ b/datacenterlight/urls.py @@ -1,6 +1,6 @@ from django.conf.urls import url -from .views import IndexView, BetaProgramView, LandingProgramView, BetaAccessView, PricingView +from .views import IndexView, BetaProgramView, LandingProgramView, BetaAccessView, PricingView, SuccessView urlpatterns = [ @@ -8,5 +8,6 @@ urlpatterns = [ url(r'^/beta-program/?$', BetaProgramView.as_view(), name='beta'), url(r'^/landing/?$', LandingProgramView.as_view(), name='landing'), url(r'^/pricing/?$', PricingView.as_view(), name='pricing'), + url(r'^/pricing-success/?$', SuccessView.as_view(), name='success'), url(r'^/beta_access?$', BetaAccessView.as_view(), name='beta_access'), ] diff --git a/datacenterlight/views.py b/datacenterlight/views.py index b68f7408..24c2b4d5 100644 --- a/datacenterlight/views.py +++ b/datacenterlight/views.py @@ -14,6 +14,9 @@ from opennebula_api.serializers import VirtualMachineTemplateSerializer class LandingProgramView(TemplateView): template_name = "datacenterlight/landing.html" +class SuccessView(TemplateView): + template_name = "datacenterlight/success.html" + class PricingView(TemplateView): template_name = "datacenterlight/pricing.html" From 515cbff001617d2a98e0bab86f41ea9f37e1ee83 Mon Sep 17 00:00:00 2001 From: Henry Bravo Date: Mon, 5 Jun 2017 16:03:32 -0500 Subject: [PATCH 03/25] copy PricingView --- .../templates/datacenterlight/order.html | 253 +++++++++++------- .../templates/datacenterlight/pricing.html | 2 +- .../templates/datacenterlight/success.html | 2 +- datacenterlight/urls.py | 5 +- datacenterlight/views.py | 48 ++++ 5 files changed, 205 insertions(+), 105 deletions(-) diff --git a/datacenterlight/templates/datacenterlight/order.html b/datacenterlight/templates/datacenterlight/order.html index ab224172..61ab149a 100644 --- a/datacenterlight/templates/datacenterlight/order.html +++ b/datacenterlight/templates/datacenterlight/order.html @@ -1,5 +1,7 @@ +{% load staticfiles i18n%} +{% get_current_language as LANGUAGE_CODE %} - + @@ -9,19 +11,24 @@ - Rails Hosting.ch - Ruby on Rails as easy as possible + datacenterlight.ch - Featherlight Swiss VM - + - - + + - - - - + + + + + + + + + @@ -36,7 +43,7 @@ +
- - - -
-
-
 
- -
-

-

Order Now

-

 

- -
-   -
- - - -
- -

 

- -
-
-   -
- - - -
-

VM size sliders to be inserted

- - -
- - -
-
- - -
- - -

-
    - -
 
-
-
-
- +
+

{% trans "We are cutting down the costs significantly!" %}

- - +
- + +
+
+ +
+
+ {% csrf_token %} + +
+

{% trans "VM hosting" %}

+
+
+ 15 + CHF +
+
+
+

{% trans "Hosted in Switzerland" %}

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

{% trans "Simple and affordable: Try our virtual machine with featherlight price." %}

+ +
+

Our VMs are hosted in Glarus, Switzerland. WARNING: We are currently running in BETA mode, especially our website We hope you will not encounter any hiccups, but if you, please let us know at support@datacenterlight.ch

+
+
+
+ + +
- + + + + + - + + diff --git a/datacenterlight/templates/datacenterlight/pricing.html b/datacenterlight/templates/datacenterlight/pricing.html index e7b8811b..da13d5e1 100644 --- a/datacenterlight/templates/datacenterlight/pricing.html +++ b/datacenterlight/templates/datacenterlight/pricing.html @@ -1,7 +1,7 @@ {% load staticfiles i18n%} {% get_current_language as LANGUAGE_CODE %} - + diff --git a/datacenterlight/templates/datacenterlight/success.html b/datacenterlight/templates/datacenterlight/success.html index ce53aa02..bf7f982a 100644 --- a/datacenterlight/templates/datacenterlight/success.html +++ b/datacenterlight/templates/datacenterlight/success.html @@ -1,7 +1,7 @@ {% load staticfiles i18n%} {% get_current_language as LANGUAGE_CODE %} - + diff --git a/datacenterlight/urls.py b/datacenterlight/urls.py index 8713165f..c3f9f98d 100644 --- a/datacenterlight/urls.py +++ b/datacenterlight/urls.py @@ -1,6 +1,6 @@ from django.conf.urls import url -from .views import IndexView, BetaProgramView, LandingProgramView, BetaAccessView, PricingView, SuccessView +from .views import IndexView, BetaProgramView, LandingProgramView, BetaAccessView, PricingView, SuccessView, OrderView urlpatterns = [ @@ -8,6 +8,7 @@ urlpatterns = [ url(r'^/beta-program/?$', BetaProgramView.as_view(), name='beta'), url(r'^/landing/?$', LandingProgramView.as_view(), name='landing'), url(r'^/pricing/?$', PricingView.as_view(), name='pricing'), - url(r'^/pricing-success/?$', SuccessView.as_view(), name='success'), + url(r'^/order/?$', OrderView.as_view(), name='order'), + url(r'^/order-success/?$', SuccessView.as_view(), name='success'), url(r'^/beta_access?$', BetaAccessView.as_view(), name='beta_access'), ] diff --git a/datacenterlight/views.py b/datacenterlight/views.py index 24c2b4d5..e2673f8c 100644 --- a/datacenterlight/views.py +++ b/datacenterlight/views.py @@ -66,6 +66,54 @@ class PricingView(TemplateView): return redirect(reverse('hosting:payment')) +class OrderView(TemplateView): + template_name = "datacenterlight/order.html" + + def get(self, request, *args, **kwargs): + try: + manager = OpenNebulaManager() + templates = manager.get_templates() + + context = { + 'templates': VirtualMachineTemplateSerializer(templates, many=True).data, + } + except: + messages.error( request, + 'We could not load the VM templates due to a backend connection \ + error. Please try again in a few minutes' + ) + context = { + 'error' : 'connection' + } + + return render(request, self.template_name, context) + + + def post(self, request): + + cores = request.POST.get('cpu') + memory = request.POST.get('ram') + storage = request.POST.get('storage') + price = request.POST.get('total') + + template_id = int(request.POST.get('config')) + + manager = OpenNebulaManager() + template = manager.get_template(template_id) + + request.session['template'] = VirtualMachineTemplateSerializer(template).data + + if not request.user.is_authenticated(): + request.session['next'] = reverse('hosting:payment') + + request.session['specs'] = { + 'cpu':cores, + 'memory': memory, + 'disk_size': storage, + 'price': price, + } + + return redirect(reverse('hosting:payment')) class BetaAccessView(FormView): template_name = "datacenterlight/beta_access.html" From 4ad45dfd43c4292c1412498a57f0b74dbc22c03a Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Tue, 6 Jun 2017 02:55:07 +0530 Subject: [PATCH 04/25] Added notification email template --- .../emails/new_order_notification.html | 137 ++++++++++++++++++ .../emails/new_order_notification.txt | 137 ++++++++++++++++++ 2 files changed, 274 insertions(+) create mode 100644 datacenterlight/templates/datacenterlight/emails/new_order_notification.html create mode 100644 datacenterlight/templates/datacenterlight/emails/new_order_notification.txt diff --git a/datacenterlight/templates/datacenterlight/emails/new_order_notification.html b/datacenterlight/templates/datacenterlight/emails/new_order_notification.html new file mode 100644 index 00000000..5612b57a --- /dev/null +++ b/datacenterlight/templates/datacenterlight/emails/new_order_notification.html @@ -0,0 +1,137 @@ +{% load static from staticfiles %} + + + + + + +Oxygen Invoice + + + + + + + + + + + + + +
+
+ + +
+ +
+ + + +
+ logo + +
+
+ +
+
+
+
+ + + + + + + + + + +
+ We have received a new order. +
+

+

User details

+ Name: {{name}}
+ Email: {{email}}
+ +

VM details

+ Cores: {{cores}}
+ Memory: {{memory}}
+ Storage: {{storage}}
+ Price: {{price}}
+ Template: {{template_id}}
+ +

 
+
+
+
+ + +
Your data center light team
+
+
+
+ + + diff --git a/datacenterlight/templates/datacenterlight/emails/new_order_notification.txt b/datacenterlight/templates/datacenterlight/emails/new_order_notification.txt new file mode 100644 index 00000000..5612b57a --- /dev/null +++ b/datacenterlight/templates/datacenterlight/emails/new_order_notification.txt @@ -0,0 +1,137 @@ +{% load static from staticfiles %} + + + + + + +Oxygen Invoice + + + + + + + + + + + + + +
+
+ + +
+ +
+ + + +
+ logo + +
+
+ +
+
+
+
+ + + + + + + + + + +
+ We have received a new order. +
+

+

User details

+ Name: {{name}}
+ Email: {{email}}
+ +

VM details

+ Cores: {{cores}}
+ Memory: {{memory}}
+ Storage: {{storage}}
+ Price: {{price}}
+ Template: {{template_id}}
+ +

 
+
+
+
+ + +
Your data center light team
+
+
+
+ + + From d7625712f1baf733e09d1ce29112b650116e2cba Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Tue, 6 Jun 2017 03:02:57 +0530 Subject: [PATCH 05/25] Changed template variable name in email template for new order notification --- .../datacenterlight/emails/new_order_notification.html | 2 +- .../templates/datacenterlight/emails/new_order_notification.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/datacenterlight/templates/datacenterlight/emails/new_order_notification.html b/datacenterlight/templates/datacenterlight/emails/new_order_notification.html index 5612b57a..5f14c983 100644 --- a/datacenterlight/templates/datacenterlight/emails/new_order_notification.html +++ b/datacenterlight/templates/datacenterlight/emails/new_order_notification.html @@ -110,7 +110,7 @@ Memory: {{memory}}
Storage: {{storage}}
Price: {{price}}
- Template: {{template_id}}
+ Template: {{template}}

diff --git a/datacenterlight/templates/datacenterlight/emails/new_order_notification.txt b/datacenterlight/templates/datacenterlight/emails/new_order_notification.txt index 5612b57a..5f14c983 100644 --- a/datacenterlight/templates/datacenterlight/emails/new_order_notification.txt +++ b/datacenterlight/templates/datacenterlight/emails/new_order_notification.txt @@ -110,7 +110,7 @@ Memory: {{memory}}
Storage: {{storage}}
Price: {{price}}
- Template: {{template_id}}
+ Template: {{template}}

From b68f1169311e973b72dc1300403533e784c15d64 Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Tue, 6 Jun 2017 03:09:34 +0530 Subject: [PATCH 06/25] Added the logic to handle orders manually --- datacenterlight/views.py | 60 ++++++++++++++++++++++++++++++++-------- 1 file changed, 48 insertions(+), 12 deletions(-) diff --git a/datacenterlight/views.py b/datacenterlight/views.py index b68f7408..6a7f366c 100644 --- a/datacenterlight/views.py +++ b/datacenterlight/views.py @@ -7,6 +7,8 @@ from django.core.urlresolvers import reverse_lazy, reverse from utils.mailer import BaseEmail from django.shortcuts import render from django.shortcuts import redirect +from django import forms +from django.core.exceptions import ValidationError from opennebula_api.models import OpenNebulaManager from opennebula_api.serializers import VirtualMachineTemplateSerializer @@ -43,25 +45,59 @@ class PricingView(TemplateView): memory = request.POST.get('ram') storage = request.POST.get('storage') price = request.POST.get('total') - template_id = int(request.POST.get('config')) - manager = OpenNebulaManager() - template = manager.get_template(template_id) + vm_template_name = (manager.get_template(template_id)).get_name() + + name = request.POST.get('name') + email = request.POST.get('email') + name_field = forms.CharField() + email_field = forms.EmailField() + try: + name = name_field.clean(name) + except ValidationError as err: + messages.error( request, + '%(value) is not a proper name.'.format(name) + ) + context = { + 'error' : 'name' + } + return render(request, self.template_name, context) - request.session['template'] = VirtualMachineTemplateSerializer(template).data - - if not request.user.is_authenticated(): - request.session['next'] = reverse('hosting:payment') - - request.session['specs'] = { - 'cpu':cores, + try: + email = email_field.clean(email) + except ValidationError as err: + messages.error( request, + '%(value) is not a proper email.'.format(email) + ) + context = { + 'error' : 'email' + } + return render(request, self.template_name, context) + + # We have valid email and name of the customer, hence send an + # email to the admin + + context = { + 'name': name, + 'email': email, + 'cores': cores, 'memory': memory, - 'disk_size': storage, + 'storage': storage, 'price': price, + 'template': vm_template_name, } + email_data = { + 'subject': 'New Order Received', + 'to': 'info@ungleich.ch', + 'context': context, + 'template_name': 'new_order_notification', + 'template_path': 'datacenterlight/emails/' + } + email = BaseEmail(**email_data) + email.send() - return redirect(reverse('hosting:payment')) + return render(self.request, 'datacenterlight/success.html', {}) class BetaAccessView(FormView): From f4a81e909699b4dcafa1281bf127a2c509183e79 Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Tue, 6 Jun 2017 03:43:50 +0530 Subject: [PATCH 07/25] Fixed getting template name from template id --- .../locale/de/LC_MESSAGES/django.mo | Bin 4037 -> 4165 bytes .../locale/de/LC_MESSAGES/django.po | 37 ++- .../datacenterlight/css/landing-page.css | 32 ++- .../templates/datacenterlight/order.html | 253 +++++++++++------- .../templates/datacenterlight/pricing.html | 14 +- .../templates/datacenterlight/success.html | 134 ++++++++++ datacenterlight/urls.py | 1 + datacenterlight/views.py | 8 +- 8 files changed, 361 insertions(+), 118 deletions(-) create mode 100644 datacenterlight/templates/datacenterlight/success.html diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.mo b/datacenterlight/locale/de/LC_MESSAGES/django.mo index 8f4d30cd34bb8896e79ae7ba48b8cf312815cf33..60da107cbaf6e3917d7c2ab95d50e9e88cd3b6aa 100644 GIT binary patch delta 931 zcmX}qO=uHA6u|LG(~qPzwZ@Mc+uDh>mujQ^l130E+CoJM1#3OnLq3Ld>1HFzMp1+y zc<4z5Pxa`>P3R$Fy(vmO^y)O|9v@;me!>p?f?c?U7x5>KVX{@J9$Z2G)LkCC@E&&J19Wf=!x(Dw_oHp9 zrqY{EhO0X{wS0DV)YM_Tef@!sj@S>v#gU@Hj?E@&eDI zeC|g_&F|rHRen5?pKANON~wszwXe!~f*comKKiDKBxI*#)BBo;7@Wk>;1 zTnll8h!Jv)GUR$>9Q5&uXKJYfJh|5YLylF3bUozF{09f&{YYg+t!j{RW zh>)Y!L_aY=aGR>$A6y8Il*)Nij_Y)_tX-2S>RXm=>s-lkGdWk^E>-nSE2B*@W7+j= z`=3DPsnL^DdTi?S_(Z)B>J9`_k9)d?>+9jZ)}_2%4Y05d5kW8cwMk%uV}e?ZrL%8mu+VBGU>GC=&PojwVb@Xt^OtwY54~k Ci*(@t delta 836 zcmZwFOGs346vy#%XPj|n)N!)3d|x%go-$*jASmS&0H! z$tDx(U<;o*JUkI5d_$I2=HKH@T*gQE4=1sMr*LbZP=$X(?Z6^Fz*W41akfkId8Bz8 zLNzqzo!(60J0@OXB_3lrR?yxyHY3HGQx+yl;AOsNQ0v=p4ttTD_7hdm3O3*`)K2}y z9^ApZ=(VKH?s4-Nf8zp@+os7bpW!&ZMK&g=UhjyGrHRnPFAy49e}&++ux6r$P?s7y z9*yb{s|xjkF4WoCQ1u$Bz9qN|FBBYf8bR$$BSEdf(AIKdL5G^)H8Gc{BkBnqk!ADl zaGzUv{o>`5xmmZZP#Cyw_x)6~5cR*t_ncJzcCN$Cc6H}E{f~*XQ+eL{zRyi1t^Rtl Kw#Xk%A2}!T$V_nn diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.po b/datacenterlight/locale/de/LC_MESSAGES/django.po index 45629dab..014a31d9 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-05-23 17:26-0500\n" +"POT-Creation-Date: 2017-06-05 15:23-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -67,6 +67,7 @@ msgstr "Vielen Dank!" #: templates/datacenterlight/index.html:62 #: templates/datacenterlight/pricing.html:62 +#: templates/datacenterlight/success.html:62 msgid "What is it" msgstr "Was ist es?" @@ -74,7 +75,8 @@ msgstr "Was ist es?" #: templates/datacenterlight/index.html:171 #: templates/datacenterlight/index.html:331 #: templates/datacenterlight/pricing.html:65 -#: templates/datacenterlight/pricing.html:188 +#: templates/datacenterlight/pricing.html:198 +#: templates/datacenterlight/success.html:65 msgid "Scale out" msgstr "Skalierung" @@ -82,19 +84,22 @@ msgstr "Skalierung" #: templates/datacenterlight/index.html:197 #: templates/datacenterlight/index.html:334 #: templates/datacenterlight/pricing.html:68 -#: templates/datacenterlight/pricing.html:191 +#: templates/datacenterlight/pricing.html:201 +#: templates/datacenterlight/success.html:68 msgid "Reliable and light" msgstr "Zuverlässig und leicht" #: templates/datacenterlight/index.html:71 #: templates/datacenterlight/pricing.html:71 +#: templates/datacenterlight/success.html:71 msgid "Buy VM" msgstr "VM Kaufen" #: templates/datacenterlight/index.html:74 #: templates/datacenterlight/index.html:341 #: templates/datacenterlight/pricing.html:74 -#: templates/datacenterlight/pricing.html:198 +#: templates/datacenterlight/pricing.html:208 +#: templates/datacenterlight/success.html:74 msgid "Contact" msgstr "Kontakt" @@ -112,7 +117,7 @@ msgstr "Das will ich haben!" #: templates/datacenterlight/index.html:142 #: templates/datacenterlight/index.html:328 -#: templates/datacenterlight/pricing.html:185 +#: templates/datacenterlight/pricing.html:195 msgid "How it works" msgstr "Wie es funktioniert" @@ -177,11 +182,13 @@ msgid "Based in Switzerland" msgstr "Standort des Datacenters ist in der Schweiz" #: templates/datacenterlight/index.html:243 -msgid "15 GB Storage (SSD)" +#, fuzzy +#| msgid "15 GB Storage (SSD)" +msgid "10 GB Storage (SSD)" msgstr "15 GB Storage (SSD)" #: templates/datacenterlight/index.html:246 -#: templates/datacenterlight/pricing.html:156 +#: templates/datacenterlight/pricing.html:166 msgid "Order Now!" msgstr "Bestelle jetzt!" @@ -202,12 +209,12 @@ msgid "Contact us!" msgstr "Kontaktiere uns!" #: templates/datacenterlight/index.html:324 -#: templates/datacenterlight/pricing.html:181 +#: templates/datacenterlight/pricing.html:191 msgid "Home" msgstr "Home" #: templates/datacenterlight/index.html:337 -#: templates/datacenterlight/pricing.html:194 +#: templates/datacenterlight/pricing.html:204 msgid "Pricing" msgstr "Preise" @@ -217,14 +224,22 @@ msgstr "Preise" msgid "Hosted in Switzerland" msgstr "Standort des Datacenters ist in der Schweiz" -#: templates/datacenterlight/pricing.html:136 +#: templates/datacenterlight/pricing.html:139 msgid "GB Storage (SSD)" msgstr "GB Storage (SSD)" -#: templates/datacenterlight/pricing.html:163 +#: templates/datacenterlight/pricing.html:173 msgid "Simple and affordable: Try our virtual machine with featherlight price." msgstr "" +#: templates/datacenterlight/success.html:101 +msgid "Thank you for order! Our team will contact you via email" +msgstr "Vielen Dank für die Bestellung. Unser Team setzt sich sobald wie möglich mit Ihnen via E-Mail in Verbindung." + +#: templates/datacenterlight/success.html:102 +msgid "as soon as possible!" +msgstr "" + #~ msgid "Buy Now!" #~ msgstr "Kaufe jetzt!" diff --git a/datacenterlight/static/datacenterlight/css/landing-page.css b/datacenterlight/static/datacenterlight/css/landing-page.css index 74671e1a..5c878fc7 100755 --- a/datacenterlight/static/datacenterlight/css/landing-page.css +++ b/datacenterlight/static/datacenterlight/css/landing-page.css @@ -243,6 +243,10 @@ h6 { align-items: center; position: relative; } +.intro-pricing.success-pricing{ + height: 100vh; + max-height: 100vh; +} .intro-pricing::before{ content: ""; position: absolute; @@ -631,12 +635,32 @@ h6 { height: 40px; width: 200px; text-align: center; - font-size: 18px; + font-size: 16px; + margin-left: 10px; } .price-calc-section .card .check-ip{ font-size: 18px; } - +.price-calc-section .card .description.input{ + justify-content: center; +} +.price-calc-section .card .description.input label{ + font-size: 15px; + font-weight: 800; + font-family: 'Montserrat-Regular'; + margin-bottom: 0; + width: 40px; +} +.price-calc-section .card .description.input input{ + width: 200px; + font-size: 14px; + text-align: left; + padding: 5px 10px; + border-radius: 4px; + border: 1px solid #d0d0d0; + background: #fff; + margin-left: 10px; +} .price-calc-section .card .check-ip input[type=checkbox]{ font-size: 17px; margin: 0 8px; @@ -735,6 +759,10 @@ h6 { left: 50%; transform: translate(-50%, 0); } + + .intro-pricing .intro-message .section-heading { + font-size: 30px; + } } diff --git a/datacenterlight/templates/datacenterlight/order.html b/datacenterlight/templates/datacenterlight/order.html index ab224172..61ab149a 100644 --- a/datacenterlight/templates/datacenterlight/order.html +++ b/datacenterlight/templates/datacenterlight/order.html @@ -1,5 +1,7 @@ +{% load staticfiles i18n%} +{% get_current_language as LANGUAGE_CODE %} - + @@ -9,19 +11,24 @@ - Rails Hosting.ch - Ruby on Rails as easy as possible + datacenterlight.ch - Featherlight Swiss VM - + - - + + - - - - + + + + + + + + + @@ -36,7 +43,7 @@ +
- - - -
-
-
 
- -
-

-

Order Now

-

 

- -
-   -
- - - -
- -

 

- -
-
-   -
- - - -
-

VM size sliders to be inserted

- - -
- - -
-
- - -
- - -

-
    - -
 
-
-
-
- +
+

{% trans "We are cutting down the costs significantly!" %}

- - +
- + +
+
+ +
+
+ {% csrf_token %} + +
+

{% trans "VM hosting" %}

+
+
+ 15 + CHF +
+
+
+

{% trans "Hosted in Switzerland" %}

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

{% trans "Simple and affordable: Try our virtual machine with featherlight price." %}

+ +
+

Our VMs are hosted in Glarus, Switzerland. WARNING: We are currently running in BETA mode, especially our website We hope you will not encounter any hiccups, but if you, please let us know at support@datacenterlight.ch

+
+
+
+ + +
- + + + + + - + + diff --git a/datacenterlight/templates/datacenterlight/pricing.html b/datacenterlight/templates/datacenterlight/pricing.html index 1674f82e..da13d5e1 100644 --- a/datacenterlight/templates/datacenterlight/pricing.html +++ b/datacenterlight/templates/datacenterlight/pricing.html @@ -1,7 +1,7 @@ {% load staticfiles i18n%} {% get_current_language as LANGUAGE_CODE %} - + @@ -141,7 +141,8 @@ -
+
+ +
+
+ + +
diff --git a/datacenterlight/templates/datacenterlight/success.html b/datacenterlight/templates/datacenterlight/success.html new file mode 100644 index 00000000..bf7f982a --- /dev/null +++ b/datacenterlight/templates/datacenterlight/success.html @@ -0,0 +1,134 @@ +{% load staticfiles i18n%} +{% get_current_language as LANGUAGE_CODE %} + + + + + + + + + + + + datacenterlight.ch - Featherlight Swiss VM + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+

{% trans "Thank you for order! Our team will contact you via email" %}

+ {% if LANGUAGE_CODE == 'en-us'%} +

{% trans "as soon as possible!" %}

+ {% endif %} +
+ +
+ + + + + + + + + + + + + diff --git a/datacenterlight/urls.py b/datacenterlight/urls.py index 60dfcb82..9545a8cf 100644 --- a/datacenterlight/urls.py +++ b/datacenterlight/urls.py @@ -8,5 +8,6 @@ urlpatterns = [ url(r'^/beta-program/?$', BetaProgramView.as_view(), name='beta'), url(r'^/landing/?$', LandingProgramView.as_view(), name='landing'), url(r'^/order/?$', PricingView.as_view(), name='pricing'), + url(r'^/order-success/?$', SuccessView.as_view(), name='success'), url(r'^/beta_access?$', BetaAccessView.as_view(), name='beta_access'), ] diff --git a/datacenterlight/views.py b/datacenterlight/views.py index 6a7f366c..bdc4a2e7 100644 --- a/datacenterlight/views.py +++ b/datacenterlight/views.py @@ -16,6 +16,9 @@ from opennebula_api.serializers import VirtualMachineTemplateSerializer class LandingProgramView(TemplateView): template_name = "datacenterlight/landing.html" +class SuccessView(TemplateView): + template_name = "datacenterlight/success.html" + class PricingView(TemplateView): template_name = "datacenterlight/pricing.html" @@ -47,7 +50,8 @@ class PricingView(TemplateView): price = request.POST.get('total') template_id = int(request.POST.get('config')) manager = OpenNebulaManager() - vm_template_name = (manager.get_template(template_id)).get_name() + template = manager.get_template(template_id) + template_data = VirtualMachineTemplateSerializer(template).data name = request.POST.get('name') email = request.POST.get('email') @@ -85,7 +89,7 @@ class PricingView(TemplateView): 'memory': memory, 'storage': storage, 'price': price, - 'template': vm_template_name, + 'template': template_data['name'], } email_data = { 'subject': 'New Order Received', From 474e0ddc952bc288b779d01f2f6d8e684ec703c3 Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Tue, 6 Jun 2017 04:22:03 +0530 Subject: [PATCH 08/25] Fixed a bug related to redirection to incorrect url on change of language. Still hardcoded (probably need a refactor of this) --- .../templates/datacenterlight/success.html | 8 +-- datacenterlight/views.py | 66 ++----------------- 2 files changed, 8 insertions(+), 66 deletions(-) diff --git a/datacenterlight/templates/datacenterlight/success.html b/datacenterlight/templates/datacenterlight/success.html index bf7f982a..44cb619b 100644 --- a/datacenterlight/templates/datacenterlight/success.html +++ b/datacenterlight/templates/datacenterlight/success.html @@ -76,14 +76,14 @@ diff --git a/datacenterlight/views.py b/datacenterlight/views.py index 002e912d..b8d3a3a7 100644 --- a/datacenterlight/views.py +++ b/datacenterlight/views.py @@ -60,24 +60,14 @@ class PricingView(TemplateView): try: name = name_field.clean(name) except ValidationError as err: - messages.error( request, - '%(value) is not a proper name.'.format(name) - ) - context = { - 'error' : 'name' - } - return render(request, self.template_name, context) + messages.add_message(self.request, messages.ERROR, '%(value) is not a proper name.'.format(name)) + return reverse('datacenterlight:order') try: email = email_field.clean(email) except ValidationError as err: - messages.error( request, - '%(value) is not a proper email.'.format(email) - ) - context = { - 'error' : 'email' - } - return render(request, self.template_name, context) + messages.add_message(self.request, messages.ERROR, '%(value) is not a proper email.'.format(email)) + return reverse('datacenterlight:order') # We have valid email and name of the customer, hence send an # email to the admin @@ -103,54 +93,6 @@ class PricingView(TemplateView): return render(self.request, 'datacenterlight/success.html', {}) -class OrderView(TemplateView): - template_name = "datacenterlight/order.html" - - def get(self, request, *args, **kwargs): - try: - manager = OpenNebulaManager() - templates = manager.get_templates() - - context = { - 'templates': VirtualMachineTemplateSerializer(templates, many=True).data, - } - except: - messages.error( request, - 'We could not load the VM templates due to a backend connection \ - error. Please try again in a few minutes' - ) - context = { - 'error' : 'connection' - } - - return render(request, self.template_name, context) - - - def post(self, request): - - cores = request.POST.get('cpu') - memory = request.POST.get('ram') - storage = request.POST.get('storage') - price = request.POST.get('total') - - template_id = int(request.POST.get('config')) - - manager = OpenNebulaManager() - template = manager.get_template(template_id) - - request.session['template'] = VirtualMachineTemplateSerializer(template).data - - if not request.user.is_authenticated(): - request.session['next'] = reverse('hosting:payment') - - request.session['specs'] = { - 'cpu':cores, - 'memory': memory, - 'disk_size': storage, - 'price': price, - } - - return redirect(reverse('hosting:payment')) class BetaAccessView(FormView): template_name = "datacenterlight/beta_access.html" From b54b46c08ba59188dccbd4d6a12c51c411319cfe Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Tue, 6 Jun 2017 04:23:15 +0530 Subject: [PATCH 09/25] Renamed success url to order_success for clarity. --- datacenterlight/urls.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datacenterlight/urls.py b/datacenterlight/urls.py index df029f62..8f35c007 100644 --- a/datacenterlight/urls.py +++ b/datacenterlight/urls.py @@ -8,6 +8,6 @@ urlpatterns = [ url(r'^/beta-program/?$', BetaProgramView.as_view(), name='beta'), url(r'^/landing/?$', LandingProgramView.as_view(), name='landing'), url(r'^/order/?$', PricingView.as_view(), name='pricing'), - url(r'^/order-success/?$', SuccessView.as_view(), name='success'), + url(r'^/order-success/?$', SuccessView.as_view(), name='order_success'), url(r'^/beta_access?$', BetaAccessView.as_view(), name='beta_access'), ] From 949f47d1240ee0c2190693c5edb0231843fba445 Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Tue, 6 Jun 2017 04:27:38 +0530 Subject: [PATCH 10/25] Added redirection instead of rendering a template for unsuccessful order submission. Also added base_url context parameter to order notification email template --- datacenterlight/views.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/datacenterlight/views.py b/datacenterlight/views.py index b8d3a3a7..33b3617b 100644 --- a/datacenterlight/views.py +++ b/datacenterlight/views.py @@ -61,18 +61,19 @@ class PricingView(TemplateView): name = name_field.clean(name) except ValidationError as err: messages.add_message(self.request, messages.ERROR, '%(value) is not a proper name.'.format(name)) - return reverse('datacenterlight:order') + return HttpResponseRedirect(reverse('datacenterlight:pricing')) try: email = email_field.clean(email) except ValidationError as err: messages.add_message(self.request, messages.ERROR, '%(value) is not a proper email.'.format(email)) - return reverse('datacenterlight:order') + return HttpResponseRedirect(reverse('datacenterlight:pricing')) # We have valid email and name of the customer, hence send an # email to the admin context = { + 'base_url': "{0}://{1}".format(self.request.scheme, self.request.get_host()), 'name': name, 'email': email, 'cores': cores, @@ -91,7 +92,7 @@ class PricingView(TemplateView): email = BaseEmail(**email_data) email.send() - return render(self.request, 'datacenterlight/success.html', {}) + return HttpResponseRedirect(reverse('datacenterlight:order_success')) class BetaAccessView(FormView): From 74c57a42db07ed05563edd6f0678e3976c2306a5 Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Tue, 6 Jun 2017 05:24:39 +0530 Subject: [PATCH 11/25] Added top margin style for error messages --- datacenterlight/static/datacenterlight/css/landing-page.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/datacenterlight/static/datacenterlight/css/landing-page.css b/datacenterlight/static/datacenterlight/css/landing-page.css index 5c878fc7..7303ed8b 100755 --- a/datacenterlight/static/datacenterlight/css/landing-page.css +++ b/datacenterlight/static/datacenterlight/css/landing-page.css @@ -874,3 +874,7 @@ a#forgotpassword { .form-300{ width: 300px; } + +.error-message-box{ + margin-top: 20px; +} From d31b05a2198447168c169e3efa4b0f3b9062cea6 Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Tue, 6 Jun 2017 05:26:02 +0530 Subject: [PATCH 12/25] Added jquery validation for the order form --- .../templates/datacenterlight/pricing.html | 67 ++++++++++++++----- 1 file changed, 49 insertions(+), 18 deletions(-) diff --git a/datacenterlight/templates/datacenterlight/pricing.html b/datacenterlight/templates/datacenterlight/pricing.html index da13d5e1..5d32e006 100644 --- a/datacenterlight/templates/datacenterlight/pricing.html +++ b/datacenterlight/templates/datacenterlight/pricing.html @@ -107,7 +107,7 @@
-
+ {% csrf_token %}
@@ -166,6 +166,9 @@ +
+
+
@@ -216,23 +219,51 @@ - - - + + + From b5f93e4ea7f7ab7d4de56d20341e1954f6e7ce76 Mon Sep 17 00:00:00 2001 From: Henry Bravo Date: Tue, 6 Jun 2017 10:33:36 -0500 Subject: [PATCH 13/25] align buttons --- .../static/datacenterlight/css/landing-page.css | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/datacenterlight/static/datacenterlight/css/landing-page.css b/datacenterlight/static/datacenterlight/css/landing-page.css index 5c878fc7..2452e993 100755 --- a/datacenterlight/static/datacenterlight/css/landing-page.css +++ b/datacenterlight/static/datacenterlight/css/landing-page.css @@ -594,17 +594,22 @@ h6 { border-bottom: 1px solid rgba(128, 128, 128, 0.3); position: relative; display: flex; - justify-content: center; + justify-content: space-around; align-items: center; } -.price-calc-section .card .description span{ - font-size: 20px; +.price-calc-section .card .description span { + font-size: 16px; margin-left: 4px; + margin-left: 0px; + /* justify-self: start; */ + width: 30%; + text-align: left; } .price-calc-section .card .description input{ font-size: 20px; text-align: center; + width: 60px; } .price-calc-section .card .description i{ color: #29427A; From 6f6277cc49b797e39780833c2caeae224d58d85e Mon Sep 17 00:00:00 2001 From: Henry Bravo Date: Tue, 6 Jun 2017 10:36:47 -0500 Subject: [PATCH 14/25] Mobile styles to calculator card --- .../datacenterlight/css/landing-page.css | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/datacenterlight/static/datacenterlight/css/landing-page.css b/datacenterlight/static/datacenterlight/css/landing-page.css index 2452e993..b0f3fc08 100755 --- a/datacenterlight/static/datacenterlight/css/landing-page.css +++ b/datacenterlight/static/datacenterlight/css/landing-page.css @@ -768,6 +768,42 @@ h6 { .intro-pricing .intro-message .section-heading { font-size: 30px; } + + .price-calc-section{ + flex-direction: column; + padding: 60px 10px !important; + } + .price-calc-section .card { + width: 90%; + } + .price-calc-section .text { + width: 80%; + text-align: center; + margin: 0 auto; + margin-top: 20px; + } + .price-calc-section .text .section-heading { + font-family: 'Lato-Black'; + font-size: 35px; + line-height: 35px; + padding-bottom: 15px; + text-align: center; + } + .price-calc-section .text .section-heading::before { + left: 50%; + transform: translate(-50%, 0); + } + .price-calc-section .text .description { + font-size: 18px; + text-align: center; + } + + .price-calc-section .card .description input { + font-size: 17px; + text-align: center; + width: 60px; + } + } @@ -785,6 +821,14 @@ h6 { .intro-message > h1 { font-size: 2em; } + .price-calc-section .text .section-heading { + font-size: 24px; + line-height: 25px; + } + .price-calc-section .card .description span { + font-size: 15px; + margin-left: 0px; + } } From 69001db65f9b9b5e49046ad93256878128f2f59a Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Wed, 7 Jun 2017 00:16:54 +0530 Subject: [PATCH 15/25] Reverted back to 'I want to have it' text for subscribe to newsletter text. Updated translation files. --- .../locale/de/LC_MESSAGES/django.mo | Bin 4165 -> 4105 bytes .../locale/de/LC_MESSAGES/django.po | 50 ++++++++++++------ .../templates/datacenterlight/index.html | 2 +- 3 files changed, 36 insertions(+), 16 deletions(-) diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.mo b/datacenterlight/locale/de/LC_MESSAGES/django.mo index 60da107cbaf6e3917d7c2ab95d50e9e88cd3b6aa..16cebe2d4a60b5c4fd122e4e73c1c42bfa7d389f 100644 GIT binary patch delta 662 zcmXZZ&x=w~6u|NGo~AZ0oz%?n*KkLO2qjFJA%vk85kUhXF|;aB5gjChl3Iz22nvFP z2|}h#Ou;N#2oIV?t&$>w7^q!f{R=IoO{=~K--E;Fp36J$oO|CV^Tdpv4r3xR_KWoJ zEgr?p5s?Kvg<~vX5Wjl+-%;yk7{@<&8U2BI{Z%|hzKQ3tff?LE{q8=N@nb-SQe^R$ zjW?L5i@xv$9sGgk@HciXk!Xma$OlYWz+Jq72Y3@tQ>+Jggp|lLJdQ80hI@Dx|9Sgo zoFP-QQKg%nU`o&t%E`b2Z#Polfesz-@TW2?>XnbM`qnTdE9X#(j5@l zjhS5{doYJxEaD)p_4hwuj`ara!*4i?e^Ad)r$zSSC7i}NJc28z_rAgkzQZ&4Gc6rC z#Uw|T*H}aS@E2zBH%{U|T=GQ98IhB$pOS4HKjJ)Y;%&UlVJ+kZazx(XD89$*xQ=Da zbGh!%W;-G@FY|0@N4NUk#}(EO@c<6d)(D=!?>L1tA-SPmq5|ewmr%c-!FxD|-6C2bAR01zxu_`7s;_xy%uno&=)hrQKFc5sjip2 z9k}9`7hG)Oz%03-ZI*-3*36AoJ-QP%>Q?uIR%o1UM@<{YHY_Du>DbFw&1CglW$N@q zbs~u}TYmB&TS`@$%_uf^TV~lVhNj(!BI|1AVm)xKVMA+LE&^w+{de25VdrfFVz*+! diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.po b/datacenterlight/locale/de/LC_MESSAGES/django.po index 014a31d9..2ef22e79 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-06-05 15:23-0500\n" +"POT-Creation-Date: 2017-06-06 23:53+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -66,6 +66,7 @@ msgid "Thank you!" msgstr "Vielen Dank!" #: templates/datacenterlight/index.html:62 +#: templates/datacenterlight/order.html:62 #: templates/datacenterlight/pricing.html:62 #: templates/datacenterlight/success.html:62 msgid "What is it" @@ -74,8 +75,10 @@ msgstr "Was ist es?" #: templates/datacenterlight/index.html:65 #: templates/datacenterlight/index.html:171 #: templates/datacenterlight/index.html:331 +#: templates/datacenterlight/order.html:65 +#: templates/datacenterlight/order.html:198 #: templates/datacenterlight/pricing.html:65 -#: templates/datacenterlight/pricing.html:198 +#: templates/datacenterlight/pricing.html:201 #: templates/datacenterlight/success.html:65 msgid "Scale out" msgstr "Skalierung" @@ -83,13 +86,16 @@ msgstr "Skalierung" #: templates/datacenterlight/index.html:68 #: templates/datacenterlight/index.html:197 #: templates/datacenterlight/index.html:334 +#: templates/datacenterlight/order.html:68 +#: templates/datacenterlight/order.html:201 #: templates/datacenterlight/pricing.html:68 -#: templates/datacenterlight/pricing.html:201 +#: templates/datacenterlight/pricing.html:204 #: templates/datacenterlight/success.html:68 msgid "Reliable and light" msgstr "Zuverlässig und leicht" #: templates/datacenterlight/index.html:71 +#: templates/datacenterlight/order.html:71 #: templates/datacenterlight/pricing.html:71 #: templates/datacenterlight/success.html:71 msgid "Buy VM" @@ -97,8 +103,10 @@ msgstr "VM Kaufen" #: templates/datacenterlight/index.html:74 #: templates/datacenterlight/index.html:341 +#: templates/datacenterlight/order.html:74 +#: templates/datacenterlight/order.html:208 #: templates/datacenterlight/pricing.html:74 -#: templates/datacenterlight/pricing.html:208 +#: templates/datacenterlight/pricing.html:211 #: templates/datacenterlight/success.html:74 msgid "Contact" msgstr "Kontakt" @@ -117,7 +125,8 @@ msgstr "Das will ich haben!" #: templates/datacenterlight/index.html:142 #: templates/datacenterlight/index.html:328 -#: templates/datacenterlight/pricing.html:195 +#: templates/datacenterlight/order.html:195 +#: templates/datacenterlight/pricing.html:198 msgid "How it works" msgstr "Wie es funktioniert" @@ -160,6 +169,7 @@ msgstr "" "Angebot ist aufgrund unserer leichten Infrastruktur überaus kostengünstig." #: templates/datacenterlight/index.html:218 +#: templates/datacenterlight/order.html:101 #: templates/datacenterlight/pricing.html:101 msgid "We are cutting down the costs significantly!" msgstr "Wir sorgen dafür, dass die Kosten für Sie signifikant abnehmen" @@ -173,6 +183,7 @@ msgid "More Info" msgstr "Weitere Informationen" #: templates/datacenterlight/index.html:227 +#: templates/datacenterlight/order.html:114 #: templates/datacenterlight/pricing.html:114 msgid "VM hosting" msgstr "" @@ -188,13 +199,15 @@ msgid "10 GB Storage (SSD)" msgstr "15 GB Storage (SSD)" #: templates/datacenterlight/index.html:246 +#: templates/datacenterlight/order.html:166 #: templates/datacenterlight/pricing.html:166 msgid "Order Now!" msgstr "Bestelle jetzt!" #: templates/datacenterlight/index.html:262 -msgid "Want to know more? Subscribe to our newsletter!" -msgstr "Willst du mehr wissen? Abonniere unseren Newsletter!" +#| msgid "I want to try!" +msgid "I want to have it!" +msgstr "Das möchte ich haben" #: templates/datacenterlight/index.html:289 msgid "Switzerland " @@ -209,43 +222,50 @@ msgid "Contact us!" msgstr "Kontaktiere uns!" #: templates/datacenterlight/index.html:324 -#: templates/datacenterlight/pricing.html:191 +#: templates/datacenterlight/order.html:191 +#: templates/datacenterlight/pricing.html:194 msgid "Home" msgstr "Home" #: templates/datacenterlight/index.html:337 -#: templates/datacenterlight/pricing.html:204 +#: templates/datacenterlight/order.html:204 +#: templates/datacenterlight/pricing.html:207 msgid "Pricing" msgstr "Preise" +#: templates/datacenterlight/order.html:122 #: templates/datacenterlight/pricing.html:122 #, fuzzy #| msgid "Based in Switzerland" msgid "Hosted in Switzerland" msgstr "Standort des Datacenters ist in der Schweiz" +#: templates/datacenterlight/order.html:139 #: templates/datacenterlight/pricing.html:139 msgid "GB Storage (SSD)" msgstr "GB Storage (SSD)" -#: templates/datacenterlight/pricing.html:173 +#: templates/datacenterlight/order.html:173 +#: templates/datacenterlight/pricing.html:176 msgid "Simple and affordable: Try our virtual machine with featherlight price." msgstr "" #: templates/datacenterlight/success.html:101 msgid "Thank you for order! Our team will contact you via email" -msgstr "Vielen Dank für die Bestellung. Unser Team setzt sich sobald wie möglich mit Ihnen via E-Mail in Verbindung." +msgstr "" +"Vielen Dank für die Bestellung. Unser Team setzt sich sobald wie möglich mit " +"Ihnen via E-Mail in Verbindung." -#: templates/datacenterlight/success.html:102 +#: templates/datacenterlight/success.html:103 msgid "as soon as possible!" msgstr "" +#~ msgid "Want to know more? Subscribe to our newsletter!" +#~ msgstr "Willst du mehr wissen? Abonniere unseren Newsletter!" + #~ msgid "Buy Now!" #~ msgstr "Kaufe jetzt!" -#~ msgid "I want to try!" -#~ msgstr "Das möchte ich haben" - #~ msgid "How it works:" #~ msgstr "Warum können wir diese Leistung so günstig anbieten:" diff --git a/datacenterlight/templates/datacenterlight/index.html b/datacenterlight/templates/datacenterlight/index.html index 89297926..5f02b9b6 100755 --- a/datacenterlight/templates/datacenterlight/index.html +++ b/datacenterlight/templates/datacenterlight/index.html @@ -259,7 +259,7 @@
-

{% trans "Want to know more? Subscribe to our newsletter!" %}

+

{% trans "I want to have it!" %}

From dcdb06d4f6dbf8e3c2afc4ae4c7c2a3eab735639 Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Wed, 7 Jun 2017 00:47:25 +0530 Subject: [PATCH 16/25] Added missing exlamation mark for german translation. Updated the translation --- .../locale/de/LC_MESSAGES/django.mo | Bin 4105 -> 5259 bytes .../locale/de/LC_MESSAGES/django.po | 189 ++++++++++-------- 2 files changed, 109 insertions(+), 80 deletions(-) diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.mo b/datacenterlight/locale/de/LC_MESSAGES/django.mo index 16cebe2d4a60b5c4fd122e4e73c1c42bfa7d389f..c6120665902b41b6141943d884ea79db954233d8 100644 GIT binary patch delta 2446 zcmZ{kPiz%M9LJ|p3N28T3MeZ6>Yv(5`=mkwK_irZwPFEzr9`9FdAqZ3hqpWXoSp4U z8})e-iSfdViFh#)^hS?)?6I zf4|u?^zKme%KFat1;!BOeVBfS5Kn?%+=dIr2P=f=1J8kvffvBLz@NZ_;8k!xxV=+| zF0cWv0^bDJfNz7(f@j<7pTQoi{{TmYXo_pNxdRUdRtkYzu@l??J_W7?kAu8n1~lNQ z_WClo8tdP{2?Tu=Jcsp8c;^6qz=ii+2G{duC3LH^(( zcrW-3SOzbHY;Xi0Gk1Z*;C}E^u-<;Y5idFOeh?Xo5wL~;XFyi+d%S!E`~}D4N1S|doS)uFT^I*?9A$q}=Kvt{ah%a}}26^xD zaZh`JO63Fb+#DP@JG~o|gL)8ii0jW|bAkNIig1TNg!w2Y8eBYp$%BJ|db!Lj{qh0P z^3jhgVR8uvF?q0x+)F&rr};^{9~{_@3pc|?Oe8HH#%!OwTv{=@jmGy;*(Fw16%Cfl z2Zk0_uNdvvc+fayNySn}qPRCQR;^u~hx<~eeA0%>4ejQYjim8gZ*^{NUFbB;qt?f^ zBT1uQ6t~lp;%H`RdNL(x6@|%--Q$t8SvtJj$}qtcCHTCdDyepgbV^=ktuii}Bbync zO_g2mJ2*8)apJ2IO$0QTWYmzxQQS=6Lz^J6v2;2y-YvRoZ$=Ex~8G}@C9h1&CGvN}?#M@puOyu>)^Im(c_ zqcp466YKW+5)Y9Ogwxf~mAnwfk+M@VriP9psw&4hx+L>LJaJ*3fJ|k*)Ovj7cbkr= zMj9yx3*xwXEmNtZG7Pp>bd}3GhVxuT89)VJRwA{VrtDnqV^&+2A=FrUp*E^89w_O; zb~IGC+EXR5thChnuxsE|f-w%mB9BVySzTv&`{@Oio`bf^Q+gJzIqg8-(4YH<0-MA) za}-mdG&Q!>FQzB+hCoplu64PNRXb_hw%t2+EF`OYJNo{sHDB*;cB~(ngwc^P->NiK z;t03p^`1km^WDR(J!=MAZ>%}f+y_xq1SL)>H}7&smG&bePMB1ow%n2pg>oBKo2y>- z!iLiGq+>dac0!jFO^S--eT!0}c`Ax~2)j~^`piR;7nOEsF09&yn%tiw$3k>Li6)mW zd7{f-p;qxcD@2tHH6g zsseJ&TWVeS7NMmSz=~7iS;jIXo1*`Ens5yk8^3BEJ`Tz4!qP#*h zRh$Ux7fNR_%E0MoF*1YFV+N@~5UMRL#<8-dzbGvoXl-Bn&)}_NLb8(J*8%@VjF}++ z)y*o4M739Qt?_l)6wZx`@+wr+ybPm?v^X~0GWgFS@1i7>A0WkfPZmcA0-*L3DD+RH zxK4O?%qk7VT3@f*+}hu}q3LtO2TO~VCQxj|9jnMk8A`cnWkVV9Hl&11?7S+f$K_i3 x#OW%&O!IRzi;gS;iF0wpw9aFJ@U^_hpTXZ1he@2&IH!qaZG0IleBL|L@h|*GYkB|x delta 1269 zcmZY7%Wq6k9Ki82v^s6Ibf`zY&eWSKssxFkO0-^)7Kw!9&h(hM=FYjyy`v#03*wQm zxDgR{NGvSK1Pg355o{#vBnW?iSg^73{mo2loXnZeIrrXkf9Ll*_v+%ydgM!@=7yrp zrO%{y$CO%*JIC-xi;q=m3D)Ce?8dFwhgC^who7(!zhgiCz?HbJMyZLILw@Qs zf8&)JQRf*naN!yz@D^Hpi1j$5wsLiwm!?1ApUvY$u9r>5-@>NnYW>=@4^gjM?$JcI3hcH&Ok~&inFn+xl*#dxPkd$+=O@VHGW3+pzaY} ze1tpk1yUHrk(a*}IhG_{S_@q^D}krc<@0Kn^KWAy*-DcSP}=kgYD!hff@A&Hq^!~; z+qvaY<&OfCGnE;8RCDO$RBlpwNme#2=P#Akav-x9NY)&uQk$b#ZEIfSfse9YlV?sx7PNz)}L{s7e z(c^gA5?>xk>OIAR4vmx7!>;G)v~NQv9qN;QQJ-)fZSs!mMK9tDx|3=!>)4#!>CnUG z|Hqv`2flAL9`l31O?jr&Qy<3a*66NP>sPNTy=-WXmA*EfjYY?sdZTYmi&}emHb43_ zoehn4(^(Qp85_l$ugp7O+|X2$Dde5d^{uh0#{{AAJfn}A@Kjj3Ffkr$?J-oL;AD)J zB$pj5W*nP|p0pIBbBSq(hFrN`URAW2PQA|t)MZfe4dfjDnNS_KK!qr;)dRe;`gX@F VCtG=YPU@TsU2?RYrCF0~>@VqI;YR=f diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.po b/datacenterlight/locale/de/LC_MESSAGES/django.po index db372410..4587137c 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-05-30 13:47+0000\n" +"POT-Creation-Date: 2017-06-07 00:44+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,23 +18,23 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: datacenterlight/templates/datacenterlight/beta_access.html:13 +#: templates/datacenterlight/beta_access.html:13 msgid "Enter name" msgstr "Name" -#: datacenterlight/templates/datacenterlight/beta_access.html:17 +#: templates/datacenterlight/beta_access.html:17 msgid "Enter email" msgstr "E-Mail-Adresse" -#: datacenterlight/templates/datacenterlight/beta_access.html:21 +#: templates/datacenterlight/beta_access.html:21 msgid "Request Newsletter" msgstr "Newsletter abonnieren" -#: datacenterlight/templates/datacenterlight/beta_success.html:9 +#: templates/datacenterlight/beta_success.html:9 msgid "Request Sent" msgstr "Anfrage verschickt" -#: datacenterlight/templates/datacenterlight/beta_success.html:12 +#: templates/datacenterlight/beta_success.html:12 msgid "" "Thank you for your subscription! You will receive a confirmation mail from " "our team" @@ -42,27 +42,27 @@ msgstr "" "Vielen dank für Ihre Anmeldung. Sie erhalten in kürze eine Bestätigungsmail " "von unserem Team" -#: datacenterlight/templates/datacenterlight/emails/request_access_confirmation.html:99 -#: datacenterlight/templates/datacenterlight/emails/request_access_confirmation.txt:99 +#: templates/datacenterlight/emails/request_access_confirmation.html:99 +#: templates/datacenterlight/emails/request_access_confirmation.txt:99 msgid "Thank you for your request." msgstr "Vielen Dank für Ihre Anfrage." -#: datacenterlight/templates/datacenterlight/emails/request_access_confirmation.html:104 -#: datacenterlight/templates/datacenterlight/emails/request_access_confirmation.txt:104 +#: templates/datacenterlight/emails/request_access_confirmation.html:104 +#: templates/datacenterlight/emails/request_access_confirmation.txt:104 msgid "You are one step away from being our beta tester!" msgstr "" "Sie sind nur noch einen Schritt davon entfernt, unser Beta-Tester zu werden!" -#: datacenterlight/templates/datacenterlight/emails/request_access_confirmation.html:105 -#: datacenterlight/templates/datacenterlight/emails/request_access_confirmation.txt:105 +#: templates/datacenterlight/emails/request_access_confirmation.html:105 +#: templates/datacenterlight/emails/request_access_confirmation.txt:105 msgid "" "Currently we are running our tests to make sure everything runs perfectly." msgstr "" "Momentan testen wir die Beta-Umgebung um sie für Ihren Gebrauch " "sicherzustellen." -#: datacenterlight/templates/datacenterlight/emails/request_access_confirmation.html:106 -#: datacenterlight/templates/datacenterlight/emails/request_access_confirmation.txt:106 +#: templates/datacenterlight/emails/request_access_confirmation.html:106 +#: templates/datacenterlight/emails/request_access_confirmation.txt:106 msgid "" "In the meantime, we would like to ask you a little patience
until our " "team contacts you with beta access." @@ -70,77 +70,88 @@ msgstr "" "Wir werden dann sobald als möglich Ihren Beta-Zugang erstellen und Sie " "daraufhin kontaktieren.Bis dahin bitten wir Sie um etwas Geduld." -#: datacenterlight/templates/datacenterlight/emails/request_access_confirmation.html:107 -#: datacenterlight/templates/datacenterlight/emails/request_access_confirmation.txt:107 +#: templates/datacenterlight/emails/request_access_confirmation.html:107 +#: templates/datacenterlight/emails/request_access_confirmation.txt:107 msgid "Thank you!" msgstr "Vielen Dank!" -#: datacenterlight/templates/datacenterlight/index.html:62 -#: datacenterlight/templates/datacenterlight/index.html:160 -#: datacenterlight/templates/datacenterlight/index.html:346 -#: datacenterlight/templates/datacenterlight/pricing.html:62 -#: datacenterlight/templates/datacenterlight/pricing.html:190 +#: templates/datacenterlight/index.html:62 +#: templates/datacenterlight/index.html:160 +#: templates/datacenterlight/index.html:345 +#: templates/datacenterlight/order.html:62 +#: templates/datacenterlight/pricing.html:62 +#: templates/datacenterlight/pricing.html:203 +#: templates/datacenterlight/success.html:62 msgid "What is it" msgstr "Was ist es?" -#: datacenterlight/templates/datacenterlight/index.html:65 -#: datacenterlight/templates/datacenterlight/index.html:189 -#: datacenterlight/templates/datacenterlight/index.html:349 -#: datacenterlight/templates/datacenterlight/pricing.html:65 -#: datacenterlight/templates/datacenterlight/pricing.html:193 +#: templates/datacenterlight/index.html:65 +#: templates/datacenterlight/index.html:189 +#: templates/datacenterlight/index.html:348 +#: templates/datacenterlight/order.html:65 +#: templates/datacenterlight/order.html:198 +#: templates/datacenterlight/pricing.html:65 +#: templates/datacenterlight/pricing.html:206 +#: templates/datacenterlight/success.html:65 msgid "Scale out" msgstr "Skalierung" -#: datacenterlight/templates/datacenterlight/index.html:68 -#: datacenterlight/templates/datacenterlight/index.html:215 -#: datacenterlight/templates/datacenterlight/index.html:352 -#: datacenterlight/templates/datacenterlight/pricing.html:68 -#: datacenterlight/templates/datacenterlight/pricing.html:196 +#: templates/datacenterlight/index.html:68 +#: templates/datacenterlight/index.html:215 +#: templates/datacenterlight/index.html:351 +#: templates/datacenterlight/order.html:68 +#: templates/datacenterlight/order.html:201 +#: templates/datacenterlight/pricing.html:68 +#: templates/datacenterlight/pricing.html:209 +#: templates/datacenterlight/success.html:68 msgid "Reliable and light" msgstr "Zuverlässig und leicht" -#: datacenterlight/templates/datacenterlight/index.html:71 +#: templates/datacenterlight/index.html:71 msgid "Order VM" msgstr "VM bestellen" -#: datacenterlight/templates/datacenterlight/index.html:74 -#: datacenterlight/templates/datacenterlight/index.html:359 -#: datacenterlight/templates/datacenterlight/pricing.html:74 -#: datacenterlight/templates/datacenterlight/pricing.html:203 +#: templates/datacenterlight/index.html:74 +#: templates/datacenterlight/index.html:358 +#: templates/datacenterlight/order.html:74 +#: templates/datacenterlight/order.html:208 +#: templates/datacenterlight/pricing.html:74 +#: templates/datacenterlight/pricing.html:216 +#: templates/datacenterlight/success.html:74 msgid "Contact" msgstr "Kontakt" -#: datacenterlight/templates/datacenterlight/index.html:127 +#: templates/datacenterlight/index.html:127 msgid "Finally, an affordable VM hosting in Switzerland!" msgstr "Endlich: bezahlbares VM Hosting in der Schweiz" -#: datacenterlight/templates/datacenterlight/index.html:131 +#: templates/datacenterlight/index.html:131 msgid "What is it?" msgstr "Was ist es?" -#: datacenterlight/templates/datacenterlight/index.html:134 +#: templates/datacenterlight/index.html:134 msgid "I want it!" msgstr "Das will ich haben!" -#: datacenterlight/templates/datacenterlight/index.html:165 +#: templates/datacenterlight/index.html:165 msgid "Reuse existing factory halls intead of building an expensive building." msgstr "" "Nachhaltigkeit: Wiederverwendung ehemaliger Fabrikhallen an Stelle der " "Errichtung eines neuen Gebäudes" -#: datacenterlight/templates/datacenterlight/index.html:168 +#: templates/datacenterlight/index.html:168 msgid "Being creative, using modern and alternative design for a datacenter." msgstr "" "Kreativität: Verwendung eines modernen und alternativen Designs für unser " "Datencenter" -#: datacenterlight/templates/datacenterlight/index.html:170 +#: templates/datacenterlight/index.html:170 msgid "Being open: Using FOSS exclusively, we can save money for licenses." msgstr "" "Offene Verfahrensweise: Die Benutzung eines eigenen Frameworks, FOSS, " "erspart Lizenzgebühren" -#: datacenterlight/templates/datacenterlight/index.html:192 +#: templates/datacenterlight/index.html:192 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 " @@ -150,7 +161,7 @@ msgstr "" "erschwingliche Systeme. Bei grösserer Auslastung werden mehr Standard " "komponenten hinzugekauft und skalieren so das Datencenter." -#: datacenterlight/templates/datacenterlight/index.html:218 +#: templates/datacenterlight/index.html:218 msgid "" "Our VMs are located in Switzerland, with reliable power supply and fast " "internet connection. Our VM costs less thanks to our featherlight " @@ -160,82 +171,93 @@ msgstr "" "Energieversorgung sowie schneller Internetverbindung ausgestattet. Unser " "Angebot ist aufgrund unserer leichten Infrastruktur überaus kostengünstig." -#: datacenterlight/templates/datacenterlight/index.html:236 -#: datacenterlight/templates/datacenterlight/pricing.html:106 +#: templates/datacenterlight/index.html:236 +#: templates/datacenterlight/order.html:101 +#: templates/datacenterlight/pricing.html:106 msgid "We are cutting down the costs significantly!" msgstr "Wir sorgen dafür, dass die Kosten für Sie signifikant abnehmen" -#: datacenterlight/templates/datacenterlight/index.html:237 +#: templates/datacenterlight/index.html:237 msgid "Affordable VM hosting based in Switzerland" msgstr "Bezahlbares VM Hosting in der Schweiz" -#: datacenterlight/templates/datacenterlight/index.html:238 -msgid "More Info" -msgstr "Weitere Informationen" - -#: datacenterlight/templates/datacenterlight/index.html:245 -#: datacenterlight/templates/datacenterlight/pricing.html:119 +#: templates/datacenterlight/index.html:244 +#: templates/datacenterlight/order.html:114 +#: templates/datacenterlight/pricing.html:119 msgid "VM hosting" msgstr "VM Hosting" -#: datacenterlight/templates/datacenterlight/index.html:252 +#: templates/datacenterlight/index.html:251 msgid "Based in Switzerland" msgstr "Standort des Datacenters ist in der Schweiz" -#: datacenterlight/templates/datacenterlight/index.html:261 +#: templates/datacenterlight/index.html:260 msgid "10 GB Storage (SSD)" msgstr "10 GB Storage (SSD)" -#: datacenterlight/templates/datacenterlight/index.html:264 -#: datacenterlight/templates/datacenterlight/pricing.html:161 +#: templates/datacenterlight/index.html:263 +#: templates/datacenterlight/order.html:166 +#: templates/datacenterlight/pricing.html:171 msgid "Order Now!" msgstr "Bestelle jetzt!" -#: datacenterlight/templates/datacenterlight/index.html:280 -msgid "Want to know more? Subscribe to our newsletter!" -msgstr "Willst du mehr wissen? Abonniere unseren Newsletter!" +#: templates/datacenterlight/index.html:279 +#| msgid "I want to try!" +msgid "I want to have it!" +msgstr "Das möchte ich haben!" -#: datacenterlight/templates/datacenterlight/index.html:307 +#: templates/datacenterlight/index.html:306 msgid "Switzerland " msgstr "Schweiz" -#: datacenterlight/templates/datacenterlight/index.html:324 +#: templates/datacenterlight/index.html:323 msgid "Questions?" msgstr "Fragen?" -#: datacenterlight/templates/datacenterlight/index.html:324 +#: templates/datacenterlight/index.html:323 msgid "Contact us!" msgstr "Kontaktiere uns!" -#: datacenterlight/templates/datacenterlight/index.html:342 -#: datacenterlight/templates/datacenterlight/pricing.html:186 +#: templates/datacenterlight/index.html:341 +#: templates/datacenterlight/order.html:191 +#: templates/datacenterlight/pricing.html:199 msgid "Home" msgstr "Home" -#: datacenterlight/templates/datacenterlight/index.html:355 -#: datacenterlight/templates/datacenterlight/pricing.html:199 +#: templates/datacenterlight/index.html:354 +#: templates/datacenterlight/order.html:204 +#: templates/datacenterlight/pricing.html:212 msgid "Pricing" msgstr "Preise" -#: datacenterlight/templates/datacenterlight/pricing.html:71 +#: templates/datacenterlight/order.html:71 +#: templates/datacenterlight/pricing.html:71 +#: templates/datacenterlight/success.html:71 msgid "Buy VM" msgstr "VM Kaufen" -#: datacenterlight/templates/datacenterlight/pricing.html:127 +#: templates/datacenterlight/order.html:122 +#: templates/datacenterlight/pricing.html:127 msgid "Hosted in Switzerland" msgstr "Standort des Datacenters ist in der Schweiz" -#: datacenterlight/templates/datacenterlight/pricing.html:144 +#: templates/datacenterlight/order.html:139 +#: templates/datacenterlight/pricing.html:144 msgid "GB Storage (SSD)" msgstr "GB Storage (SSD)" -#: datacenterlight/templates/datacenterlight/pricing.html:168 +#: templates/datacenterlight/order.html:173 +#: templates/datacenterlight/pricing.html:181 msgid "Simple and affordable: Try our virtual machine with featherlight price." msgstr "" "Simpel und bezahlbar: Testen Sie unsere virtuelen Machinen mit " "federleichten Preisen" -#: datacenterlight/templates/datacenterlight/pricing.html:171 +#: templates/datacenterlight/order.html:195 +msgid "How it works" +msgstr "Wie es funktioniert" + +#: templates/datacenterlight/pricing.html:184 msgid "" "Our VMs are hosted in Glarus, Switzerland, and our website is currently " "running in BETA mode. If you want more information that you did not find on " @@ -251,8 +273,21 @@ msgstr "" "uns unter support@datacenterlight.ch. Unser Team wird sich umgehend um dein " "Anliegen kümmern!" -#~ msgid "How it works" -#~ msgstr "Wie es funktioniert" +#: templates/datacenterlight/success.html:101 +#, fuzzy +#| msgid "Thank you, we will contact you as soon as possible" +msgid "Thank you for order! Our team will contact you via email" +msgstr "Vielen Dank, wir werden Sie sobald als möglich kontaktieren." + +#: templates/datacenterlight/success.html:103 +msgid "as soon as possible!" +msgstr "" + +#~ msgid "More Info" +#~ msgstr "Weitere Informationen" + +#~ msgid "Want to know more? Subscribe to our newsletter!" +#~ msgstr "Willst du mehr wissen? Abonniere unseren Newsletter!" #~ msgid "Our VMs are hosted in Glarus, Switzerland." #~ msgstr "Standort des Datacenters ist in der Schweiz" @@ -269,15 +304,9 @@ msgstr "" #~ msgid "Request Beta Access" #~ msgstr "Beantrage Beta-Zugang" -#~ msgid "Thank you, we will contact you as soon as possible" -#~ msgstr "Vielen Dank, wir werden Sie sobald als möglich kontaktieren." - #~ msgid "Buy Now!" #~ msgstr "Kaufe jetzt!" -#~ msgid "I want to try!" -#~ msgstr "Das möchte ich haben" - #~ msgid "Email address" #~ msgstr "E-Mail Adresse" From 6a3f4578db4b47a6a5d66160d39262e9712f2c4c Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Wed, 7 Jun 2017 00:59:19 +0530 Subject: [PATCH 17/25] Updated mo file to include the change for exclamation mark missing in german translation --- .../locale/de/LC_MESSAGES/django.mo | Bin 5259 -> 5317 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.mo b/datacenterlight/locale/de/LC_MESSAGES/django.mo index c6120665902b41b6141943d884ea79db954233d8..8ea1e8395b62af96a42607fbd4427bca2ecc6679 100644 GIT binary patch delta 935 zcmYk*Pe_zO7{~EPcXc=2E#0ilv|cT9*FS-mq9PDhlR`nUP?X3`)`UzCEfrmsx|m3N zSqi*GC@KUV7J{G-Ce@{zhdP)no$63{@FJ|x_qV=+1J8bD=AC)xnVENIBA+A4jga@H zQ5uPAV!XiYGJYuJhqCA~JB&-HF(0u4e`5#kU=*WXvtpb=AEvMrU*UCpA zJ_gGw46wenP`OISB|Lynu@h(V1I*U&1nn&LVGi}e9tO)HY{pTX$F$pjk%u~gc4Vj4 zgZD`A8R|s;@vxrtt&nXtVHo@I2HwKA$h)j0xVw`I)JauiFSg)8OrlOMh37Dh8u!WV zUqikB2Wnw2lVl|(k5Xx-@*Jah2)`j~+d6(H<3G4Tdxf{^j$fDWCbWRZXfLC#>?`VM zf8t%-L^f*!bl$`f^avZzxF_NEY z6Q>Bx-CwHQ1~-;3_7`Be~f9>pdSPGZs-i#?2I;ze`*()QQ` R=l<%uk+DQPvlC1e{|6a2SJMCh delta 893 zcmYk*Pe{{Y9LMqRnwxH!|7NqYmYObq&IQZE1WkfbVRR`GFWN4Vq7+`jn*$F{2|X+X zcS%s{q%;_M^H>*8opOhaM34?1f+V{2{>&fI1JCdEe4qWE=lTAg=h;W+wUaq$s8}(I zL%m9U<}vHT&2u~`t6sAZ=CKR6uo3t19-d$ddn(NQID?fqi|273A7ajpzhaR12PVui z_KQXx9Z{bdO-tfM?8j<+f*O#SbK5$8A=3|dK%8YZo$2%XvqWBC6Y(q55iOy%b_2(82l+^g&^e3_ z>H{(u!7QfnJ!(CFi2c`q5b52;2!6seY73*>G2po chEb|cIZV~&w-@u?Lr-zp_qM8-s+sfu1*r{7rT_o{ From 366f11be83c31a9a91b2e7f07dfd051ff4e4c26c Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Wed, 7 Jun 2017 01:07:47 +0530 Subject: [PATCH 18/25] Fixed an issue related to redirection to datacenterlight/order url --- datacenterlight/templates/datacenterlight/pricing.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/datacenterlight/templates/datacenterlight/pricing.html b/datacenterlight/templates/datacenterlight/pricing.html index 567a1408..d20bd897 100644 --- a/datacenterlight/templates/datacenterlight/pricing.html +++ b/datacenterlight/templates/datacenterlight/pricing.html @@ -85,9 +85,9 @@
{% if LANGUAGE_CODE == 'en-us'%} - Deutsch + Deutsch {% else %} - English + English {% endif %}
From c111ad13a831e83da957b8e46337569aaabf8f0a Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Wed, 7 Jun 2017 01:26:56 +0530 Subject: [PATCH 19/25] Updated translation text after completion of manual order. --- .../locale/de/LC_MESSAGES/django.mo | Bin 5317 -> 5501 bytes .../locale/de/LC_MESSAGES/django.po | 3 +-- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.mo b/datacenterlight/locale/de/LC_MESSAGES/django.mo index 8ea1e8395b62af96a42607fbd4427bca2ecc6679..dcbe82b35eb1a14e2673a0fb309fa5d9dab5b3b1 100644 GIT binary patch delta 962 zcmXZaOK1~87{Ku{4{g#^W6~I*RVLb2lWOsCP?3TtsWe(jiM1DlY?CEj-E1(~RO%(* zNkk74M1xci)RQ0>5cMR8Qc%ymlzQ;wtsp`!1^-`~h1uV{AK%Q^!7SkvbH@m*XBb49bD_rZ=-=&j8;vsTk z)x?`@^gBjbU!CHZ!*~hh8gAhnE@KY=A##qNxgm?qv*haa!FmaYp zkMJwv8RW3)1lI7~j1;=zcQ>KqjF{id1 SebubYTTVe{YkiLRJ^uk_6MS(1 delta 809 zcmXZaODIH97{KvwUdD{^8sq&aZ^omf2+7oVL=+(+5ygVo%4T9i#O6lXNeQJaW~EqA zDA`%CKo%A(NU>3){6FT_xxaJ1dmi68_xyOzivy2t>$>oGDH)V0lSmyNn|bl8bI-mo6*pC;uiF%YH+&py(+i})oT$$T!xm3MIswLf)N3F=Hu~gRQP|K$1 r0TxsA(cJZp>%*;)Op4}FNGYJO%HQ425AIufZNX~Cvm>~i@M-!5!7Wc> diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.po b/datacenterlight/locale/de/LC_MESSAGES/django.po index 4587137c..9130b637 100644 --- a/datacenterlight/locale/de/LC_MESSAGES/django.po +++ b/datacenterlight/locale/de/LC_MESSAGES/django.po @@ -274,10 +274,9 @@ msgstr "" "Anliegen kümmern!" #: templates/datacenterlight/success.html:101 -#, fuzzy #| msgid "Thank you, we will contact you as soon as possible" msgid "Thank you for order! Our team will contact you via email" -msgstr "Vielen Dank, wir werden Sie sobald als möglich kontaktieren." +msgstr "Vielen Dank für die Bestellung. Unser Team setzt sich sobald wie möglich mit Ihnen via E-Mail in Verbindung." #: templates/datacenterlight/success.html:103 msgid "as soon as possible!" From bef6b03872ea3f6182683488164f0529b47a51d0 Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Wed, 7 Jun 2017 01:35:05 +0530 Subject: [PATCH 20/25] Reverted pricing.html to what was before. We should create a new template for order. --- .../templates/datacenterlight/pricing.html | 83 +++++-------------- 1 file changed, 21 insertions(+), 62 deletions(-) diff --git a/datacenterlight/templates/datacenterlight/pricing.html b/datacenterlight/templates/datacenterlight/pricing.html index d20bd897..7c8e66a6 100644 --- a/datacenterlight/templates/datacenterlight/pricing.html +++ b/datacenterlight/templates/datacenterlight/pricing.html @@ -85,9 +85,9 @@
{% if LANGUAGE_CODE == 'en-us'%} - Deutsch + Deutsch {% else %} - English + English {% endif %}
@@ -112,7 +112,7 @@
-
+ {% csrf_token %}
@@ -146,8 +146,7 @@
-
- +
-
-
- - -
-
-
-
@@ -224,51 +211,23 @@ - - - + + + From 94bac7222c76b76706122c35d678ca82faac2f4d Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Wed, 7 Jun 2017 02:02:31 +0530 Subject: [PATCH 21/25] Made order and pricing distinct from each other. We use order for feature/manualorder and we leave pricing as it was before. --- .../templates/datacenterlight/order.html | 146 +++++++++++------- datacenterlight/urls.py | 5 +- datacenterlight/views.py | 54 ++++++- 3 files changed, 146 insertions(+), 59 deletions(-) diff --git a/datacenterlight/templates/datacenterlight/order.html b/datacenterlight/templates/datacenterlight/order.html index 61ab149a..d20bd897 100644 --- a/datacenterlight/templates/datacenterlight/order.html +++ b/datacenterlight/templates/datacenterlight/order.html @@ -74,19 +74,24 @@ {% trans "Contact" %} --> - +
+ @@ -95,20 +100,20 @@ -
+
-
-

{% trans "We are cutting down the costs significantly!" %}

-
- -
+
+

{% trans "We are cutting down the costs significantly!" %}

+
+ +
-
-
+
+
-
-
- {% csrf_token %} +
+ + {% csrf_token %}

{% trans "VM hosting" %}

@@ -134,7 +139,7 @@
- + {% trans "GB Storage (SSD)" %} @@ -143,16 +148,16 @@
- + {% for template in templates %} {% endfor %} - +
+ Ipv6 Only
+
-->
@@ -167,16 +172,19 @@
-
+
+
+
+
-
-

{% trans "Simple and affordable: Try our virtual machine with featherlight price." %}

+
+

{% trans "Simple and affordable: Try our virtual machine with featherlight price." %}

-
-

Our VMs are hosted in Glarus, Switzerland. WARNING: We are currently running in BETA mode, especially our website We hope you will not encounter any hiccups, but if you, please let us know at support@datacenterlight.ch

-
-
-
+
+

{% trans "Our VMs are hosted in Glarus, Switzerland, and our website is currently running in BETA mode. If you want more information that you did not find on our website, or if your order is more detailed, or if you encounter any technical hiccups, please contact us at support@datacenterlight.ch, our team will get in touch with you asap." %}

+
+
+
@@ -192,7 +200,7 @@
  • ⋅
  • - {% trans "How it works" %}
    • + {% trans "What is it" %}
  • ⋅
  • {% trans "Scale out" %}
    • @@ -216,23 +224,51 @@ - - - + + + diff --git a/datacenterlight/urls.py b/datacenterlight/urls.py index 8f35c007..f14e7186 100644 --- a/datacenterlight/urls.py +++ b/datacenterlight/urls.py @@ -1,13 +1,14 @@ from django.conf.urls import url -from .views import IndexView, BetaProgramView, LandingProgramView, BetaAccessView, PricingView, SuccessView +from .views import IndexView, BetaProgramView, LandingProgramView, BetaAccessView, PricingView, SuccessView, OrderView urlpatterns = [ url(r'^/?$', IndexView.as_view(), name='index'), url(r'^/beta-program/?$', BetaProgramView.as_view(), name='beta'), url(r'^/landing/?$', LandingProgramView.as_view(), name='landing'), - url(r'^/order/?$', PricingView.as_view(), name='pricing'), + url(r'^/pricing/?$', PricingView.as_view(), name='pricing'), + url(r'^/order/?$', OrderView.as_view(), name='order'), url(r'^/order-success/?$', SuccessView.as_view(), name='order_success'), url(r'^/beta_access?$', BetaAccessView.as_view(), name='beta_access'), ] diff --git a/datacenterlight/views.py b/datacenterlight/views.py index 0534e057..d7b6a3e5 100644 --- a/datacenterlight/views.py +++ b/datacenterlight/views.py @@ -22,6 +22,56 @@ class SuccessView(TemplateView): class PricingView(TemplateView): template_name = "datacenterlight/pricing.html" + def get(self, request, *args, **kwargs): + try: + manager = OpenNebulaManager() + templates = manager.get_templates() + + context = { + 'templates': VirtualMachineTemplateSerializer(templates, many=True).data, + } + except: + messages.error( request, + 'We have a temporary problem to connect to our backend. \ + Please try again in a few minutes' + ) + context = { + 'error' : 'connection' + } + + return render(request, self.template_name, context) + + + def post(self, request): + + cores = request.POST.get('cpu') + memory = request.POST.get('ram') + storage = request.POST.get('storage') + price = request.POST.get('total') + + template_id = int(request.POST.get('config')) + + manager = OpenNebulaManager() + template = manager.get_template(template_id) + + request.session['template'] = VirtualMachineTemplateSerializer(template).data + + if not request.user.is_authenticated(): + request.session['next'] = reverse('hosting:payment') + + request.session['specs'] = { + 'cpu':cores, + 'memory': memory, + 'disk_size': storage, + 'price': price, + } + + return redirect(reverse('hosting:payment')) + + +class OrderView(TemplateView): + template_name = "datacenterlight/order.html" + def get(self, request, *args, **kwargs): try: manager = OpenNebulaManager() @@ -60,13 +110,13 @@ class PricingView(TemplateView): name = name_field.clean(name) except ValidationError as err: messages.add_message(self.request, messages.ERROR, '%(value) is not a proper name.'.format(name)) - return HttpResponseRedirect(reverse('datacenterlight:pricing')) + return HttpResponseRedirect(reverse('datacenterlight:order')) try: email = email_field.clean(email) except ValidationError as err: messages.add_message(self.request, messages.ERROR, '%(value) is not a proper email.'.format(email)) - return HttpResponseRedirect(reverse('datacenterlight:pricing')) + return HttpResponseRedirect(reverse('datacenterlight:order')) # We have valid email and name of the customer, hence send an # email to the admin From 06f95dc5ed55d24f25328ac44956deb80aa664ba Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Wed, 7 Jun 2017 02:12:35 +0530 Subject: [PATCH 22/25] Made to take the user to /order on click of Order Now button --- datacenterlight/templates/datacenterlight/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datacenterlight/templates/datacenterlight/index.html b/datacenterlight/templates/datacenterlight/index.html index 9eb6372a..ee2a6ac8 100755 --- a/datacenterlight/templates/datacenterlight/index.html +++ b/datacenterlight/templates/datacenterlight/index.html @@ -260,7 +260,7 @@

    {% trans "10 GB Storage (SSD)" %}

    - {% trans "Order Now!" %} + {% trans "Order Now!" %} From d8ef935fae9b4dcdea39f1ad61385bee55d30338 Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Wed, 7 Jun 2017 02:13:21 +0530 Subject: [PATCH 23/25] Updated text on the button to Request Beta Access to go along the text alongside --- .../locale/de/LC_MESSAGES/django.mo | Bin 5501 -> 5453 bytes .../locale/de/LC_MESSAGES/django.po | 85 +++++++++++------- .../datacenterlight/beta_access.html | 2 +- 3 files changed, 53 insertions(+), 34 deletions(-) diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.mo b/datacenterlight/locale/de/LC_MESSAGES/django.mo index dcbe82b35eb1a14e2673a0fb309fa5d9dab5b3b1..53f38e0912200c0d0ea4b895c29c0b8796b2b8c6 100644 GIT binary patch delta 975 zcmXxjPe_zO7{~F)eRoS+*K*DN*`M8Vt6j^oL-y~`Dkd9th>${xc#~~|YQfZ7vUSQ+ z7b)l(1O{W2wgw;IT6~Cce2i!DscZklb+rFt zk6Fc{F|!SH97XzU5ZiGGHSiiH@ivz6p6jn+BkdI|khI6@PiUWGbtUkfhvwH%^H)$C zNieAy(|CsUt(!^{9g{eS6*u5L9;5vUJ21hZ3z$W{c*;4A2WZdWGpxG)>kQHfj3GO< zDZELdv#3Nm$Rfk~c8E$B4&z07V)WSWu2?ww;P31C`_4o~0(|+R@GL6u=NPB^|>26=Q))T4XX4>pa=k<+)2SjGk1iG?=K|0GoXB zdZFg(s{WU)uEGt5CF9iYwSi{qHQPc(+3g{6gvz!$;ZrB0FTRu5Pw>Ipu9>{oRoG1} zMd*^Ugo@5dB~9>UhX2$K+(+ys*m`&gVD1;Q*5H*l*AP@txfEoQm%M+OGGc82 delta 1023 zcmYk*O=uHA6u|MEY}3BYDs&-XI(58>IzAhi zN0a&G43$Ybrm+W~;(2`KKOpiOPtab+JvhQcMVvr=aXauW9-;jK7jY%H|A2=y6HkyG zOB<^!^e3j7UyifQA)G-yhPzn81)ReTO@H+Ti#qmB!u$-hG-$}0BZeY}n@Q77)84vg@{oy7!x$63^r_A{HB!;4rz z*6D9%KkC^3%kH4TN%|$}A2d~6eLta-?jm$`IYQH=MbG_j@iRk1k8FhCM-c1Tm@zta zklG-jhm|L^@HP7X)dA#-mA!;+^)PXWV2A$yG>pM7Cn;~y_||1!s5PyMYc*^2YQrl> zK8K>0?PlYS?Yef|v%1$p;lio$aW5Xr8R=5Rw(N#=bKa@Cm6}tr>#kSm{b*$V4YA5M OYL52Uj<=D#YWx8S%xGHx diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.po b/datacenterlight/locale/de/LC_MESSAGES/django.po index 9130b637..debe4a7a 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-06-07 00:44+0530\n" +"POT-Creation-Date: 2017-06-07 02:09+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -27,8 +27,8 @@ msgid "Enter email" msgstr "E-Mail-Adresse" #: templates/datacenterlight/beta_access.html:21 -msgid "Request Newsletter" -msgstr "Newsletter abonnieren" +msgid "Request Beta Access" +msgstr "Beantrage Beta-Zugang" #: templates/datacenterlight/beta_success.html:9 msgid "Request Sent" @@ -78,9 +78,12 @@ msgstr "Vielen Dank!" #: templates/datacenterlight/index.html:62 #: templates/datacenterlight/index.html:160 #: templates/datacenterlight/index.html:345 +#: templates/datacenterlight/new-order.html:62 +#: templates/datacenterlight/new-order.html:203 #: templates/datacenterlight/order.html:62 +#: templates/datacenterlight/order.html:203 #: templates/datacenterlight/pricing.html:62 -#: templates/datacenterlight/pricing.html:203 +#: templates/datacenterlight/pricing.html:190 #: templates/datacenterlight/success.html:62 msgid "What is it" msgstr "Was ist es?" @@ -88,10 +91,12 @@ msgstr "Was ist es?" #: templates/datacenterlight/index.html:65 #: templates/datacenterlight/index.html:189 #: templates/datacenterlight/index.html:348 +#: templates/datacenterlight/new-order.html:65 +#: templates/datacenterlight/new-order.html:206 #: templates/datacenterlight/order.html:65 -#: templates/datacenterlight/order.html:198 +#: templates/datacenterlight/order.html:206 #: templates/datacenterlight/pricing.html:65 -#: templates/datacenterlight/pricing.html:206 +#: templates/datacenterlight/pricing.html:193 #: templates/datacenterlight/success.html:65 msgid "Scale out" msgstr "Skalierung" @@ -99,10 +104,12 @@ msgstr "Skalierung" #: templates/datacenterlight/index.html:68 #: templates/datacenterlight/index.html:215 #: templates/datacenterlight/index.html:351 +#: templates/datacenterlight/new-order.html:68 +#: templates/datacenterlight/new-order.html:209 #: templates/datacenterlight/order.html:68 -#: templates/datacenterlight/order.html:201 +#: templates/datacenterlight/order.html:209 #: templates/datacenterlight/pricing.html:68 -#: templates/datacenterlight/pricing.html:209 +#: templates/datacenterlight/pricing.html:196 #: templates/datacenterlight/success.html:68 msgid "Reliable and light" msgstr "Zuverlässig und leicht" @@ -113,10 +120,12 @@ msgstr "VM bestellen" #: templates/datacenterlight/index.html:74 #: templates/datacenterlight/index.html:358 +#: templates/datacenterlight/new-order.html:74 +#: templates/datacenterlight/new-order.html:216 #: templates/datacenterlight/order.html:74 -#: templates/datacenterlight/order.html:208 +#: templates/datacenterlight/order.html:216 #: templates/datacenterlight/pricing.html:74 -#: templates/datacenterlight/pricing.html:216 +#: templates/datacenterlight/pricing.html:203 #: templates/datacenterlight/success.html:74 msgid "Contact" msgstr "Kontakt" @@ -172,7 +181,8 @@ msgstr "" "Angebot ist aufgrund unserer leichten Infrastruktur überaus kostengünstig." #: templates/datacenterlight/index.html:236 -#: templates/datacenterlight/order.html:101 +#: templates/datacenterlight/new-order.html:106 +#: templates/datacenterlight/order.html:106 #: templates/datacenterlight/pricing.html:106 msgid "We are cutting down the costs significantly!" msgstr "Wir sorgen dafür, dass die Kosten für Sie signifikant abnehmen" @@ -182,7 +192,8 @@ msgid "Affordable VM hosting based in Switzerland" msgstr "Bezahlbares VM Hosting in der Schweiz" #: templates/datacenterlight/index.html:244 -#: templates/datacenterlight/order.html:114 +#: templates/datacenterlight/new-order.html:119 +#: templates/datacenterlight/order.html:119 #: templates/datacenterlight/pricing.html:119 msgid "VM hosting" msgstr "VM Hosting" @@ -196,13 +207,13 @@ msgid "10 GB Storage (SSD)" msgstr "10 GB Storage (SSD)" #: templates/datacenterlight/index.html:263 -#: templates/datacenterlight/order.html:166 -#: templates/datacenterlight/pricing.html:171 +#: templates/datacenterlight/new-order.html:171 +#: templates/datacenterlight/order.html:171 +#: templates/datacenterlight/pricing.html:161 msgid "Order Now!" msgstr "Bestelle jetzt!" #: templates/datacenterlight/index.html:279 -#| msgid "I want to try!" msgid "I want to have it!" msgstr "Das möchte ich haben!" @@ -219,45 +230,49 @@ msgid "Contact us!" msgstr "Kontaktiere uns!" #: templates/datacenterlight/index.html:341 -#: templates/datacenterlight/order.html:191 -#: templates/datacenterlight/pricing.html:199 +#: templates/datacenterlight/new-order.html:199 +#: templates/datacenterlight/order.html:199 +#: templates/datacenterlight/pricing.html:186 msgid "Home" msgstr "Home" #: templates/datacenterlight/index.html:354 -#: templates/datacenterlight/order.html:204 -#: templates/datacenterlight/pricing.html:212 +#: templates/datacenterlight/new-order.html:212 +#: templates/datacenterlight/order.html:212 +#: templates/datacenterlight/pricing.html:199 msgid "Pricing" msgstr "Preise" +#: templates/datacenterlight/new-order.html:71 #: templates/datacenterlight/order.html:71 #: templates/datacenterlight/pricing.html:71 #: templates/datacenterlight/success.html:71 msgid "Buy VM" msgstr "VM Kaufen" -#: templates/datacenterlight/order.html:122 +#: templates/datacenterlight/new-order.html:127 +#: templates/datacenterlight/order.html:127 #: templates/datacenterlight/pricing.html:127 msgid "Hosted in Switzerland" msgstr "Standort des Datacenters ist in der Schweiz" -#: templates/datacenterlight/order.html:139 +#: templates/datacenterlight/new-order.html:144 +#: templates/datacenterlight/order.html:144 #: templates/datacenterlight/pricing.html:144 msgid "GB Storage (SSD)" msgstr "GB Storage (SSD)" -#: templates/datacenterlight/order.html:173 -#: templates/datacenterlight/pricing.html:181 +#: templates/datacenterlight/new-order.html:181 +#: templates/datacenterlight/order.html:181 +#: templates/datacenterlight/pricing.html:168 msgid "Simple and affordable: Try our virtual machine with featherlight price." msgstr "" "Simpel und bezahlbar: Testen Sie unsere virtuelen Machinen mit " "federleichten Preisen" -#: templates/datacenterlight/order.html:195 -msgid "How it works" -msgstr "Wie es funktioniert" - -#: templates/datacenterlight/pricing.html:184 +#: templates/datacenterlight/new-order.html:184 +#: templates/datacenterlight/order.html:184 +#: templates/datacenterlight/pricing.html:171 msgid "" "Our VMs are hosted in Glarus, Switzerland, and our website is currently " "running in BETA mode. If you want more information that you did not find on " @@ -274,14 +289,21 @@ msgstr "" "Anliegen kümmern!" #: templates/datacenterlight/success.html:101 -#| msgid "Thank you, we will contact you as soon as possible" msgid "Thank you for order! Our team will contact you via email" -msgstr "Vielen Dank für die Bestellung. Unser Team setzt sich sobald wie möglich mit Ihnen via E-Mail in Verbindung." +msgstr "" +"Vielen Dank für die Bestellung. Unser Team setzt sich sobald wie möglich mit " +"Ihnen via E-Mail in Verbindung." #: templates/datacenterlight/success.html:103 msgid "as soon as possible!" msgstr "" +#~ msgid "Request Newsletter" +#~ msgstr "Newsletter abonnieren" + +#~ msgid "How it works" +#~ msgstr "Wie es funktioniert" + #~ msgid "More Info" #~ msgstr "Weitere Informationen" @@ -300,9 +322,6 @@ msgstr "" #~ "davon nichts mitbekommen, falls doch melden Sie sich bitte via " #~ "support@datacenterlight.ch" -#~ msgid "Request Beta Access" -#~ msgstr "Beantrage Beta-Zugang" - #~ msgid "Buy Now!" #~ msgstr "Kaufe jetzt!" diff --git a/datacenterlight/templates/datacenterlight/beta_access.html b/datacenterlight/templates/datacenterlight/beta_access.html index 1552a1c0..c7a2f14e 100644 --- a/datacenterlight/templates/datacenterlight/beta_access.html +++ b/datacenterlight/templates/datacenterlight/beta_access.html @@ -18,7 +18,7 @@ {{ form.email.errors|striptags}} - +