diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.mo b/datacenterlight/locale/de/LC_MESSAGES/django.mo new file mode 100644 index 00000000..c3f49234 Binary files /dev/null and b/datacenterlight/locale/de/LC_MESSAGES/django.mo differ diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.po b/datacenterlight/locale/de/LC_MESSAGES/django.po new file mode 100644 index 00000000..0ad8eeb6 --- /dev/null +++ b/datacenterlight/locale/de/LC_MESSAGES/django.po @@ -0,0 +1,173 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-01-06 10:45-0500\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: templates/datacenterlight/index.html:58 +msgid "What is it" +msgstr "Was ist es?" + +#: templates/datacenterlight/index.html:61 +#: templates/datacenterlight/index.html:163 +#: templates/datacenterlight/index.html:335 +msgid "Scale out" +msgstr "Skalierung" + +#: templates/datacenterlight/index.html:64 +#: templates/datacenterlight/index.html:186 +#: templates/datacenterlight/index.html:338 +msgid "Reliable and light" +msgstr "Zuverlässig und leicht" + +#: templates/datacenterlight/index.html:67 +msgid "Buy VM" +msgstr "Kaufe VM" + +#: templates/datacenterlight/index.html:70 +#: templates/datacenterlight/index.html:345 +msgid "Contact" +msgstr "Kontakt" + +#: templates/datacenterlight/index.html:107 +msgid "Finally, an affordable VM hosting in Switzerland!" +msgstr "Endlich: bezahlbares VM Hosting in der Schweiz" + +#: templates/datacenterlight/index.html:111 +msgid "What is it?" +msgstr "Was ist es?" + +#: templates/datacenterlight/index.html:114 +msgid "I want it!" +msgstr "Das will ich haben!" + +#: templates/datacenterlight/index.html:137 +msgid "How it works :" +msgstr "Warum können wir diese Leistung so günstig anbieten:" + +#: templates/datacenterlight/index.html:139 +msgid "Reuse existing factory halls intead of building an expensive building." +msgstr "" +"Wiederverwendung ehemaliger Fabrikhallen anstatt eines teuren, neuen Gebäudes" + +#: templates/datacenterlight/index.html:142 +msgid "Being creative, using modern and alternative design for a datacenter." +msgstr "" +"Kreatives handeln, Nutzung eines modernen und alternativem Designs des " +"Datacenters" + +#: templates/datacenterlight/index.html:144 +msgid "Being open : Using FOSS exclusively, we can save money for licenses." +msgstr "" +"Offene Verfahrensweise: Die Benutzung eines eigenen Frameworks, FOSS, " +"erspart Lizenzgebühren" + +#: templates/datacenterlight/index.html:164 +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 " +"called data center." +msgstr "" +"Wir benutzen keine spezielle Hardware, sondern am Markt verfügbare, " +"erschwingliche Systeme.Bei größerer Auslastung werden mehrStandard " +"Komponenten hinzugekauft und skalieren so das Datacenter" + +#: templates/datacenterlight/index.html:187 +msgid "" +"Our VMs are located in Switzerland, with reliable power supply and fast " +"internet connection. Our VM costs less thanks to our featherlight " +"infrastructure." +msgstr "" +"Unser Datacenter befindet sich in der Schweiz undist mit zuverlässiger " +"Energieversorgung sowie schneller Internetverbindung ausgestattet.Unser " +"Angebot ist aufgrund unserer federleichten Infrastruktur überaus " +"kostengünstig." + +#: templates/datacenterlight/index.html:209 +msgid "We are cutting down the costs significantly!" +msgstr "Wir sorgen dafür, dass die Kosten für Sie signifikant abnehmen" + +#: templates/datacenterlight/index.html:210 +msgid "Affordable VM hosting based in Switzerland" +msgstr "Bezahlbares VM Hosting in der Schweiz" + +#: templates/datacenterlight/index.html:226 +msgid "VM hosting" +msgstr "" + +#: templates/datacenterlight/index.html:227 +msgid "Based in Switzerland" +msgstr "Standort des Datacenters ist in der Schweiz" + +#: templates/datacenterlight/index.html:230 +msgid "15 GiB storage(SSD)" +msgstr "" + +#: templates/datacenterlight/index.html:232 +msgid "Buy Now!" +msgstr "Kaufe jetzt!" + +#: templates/datacenterlight/index.html:232 +msgid "More Info" +msgstr "Weitere Informationen" + +#: templates/datacenterlight/index.html:254 +msgid "I want to try!" +msgstr "Das möchte ich haben" + +#: templates/datacenterlight/index.html:272 +msgid "Email address" +msgstr "E-Mail Adresse" + +#: templates/datacenterlight/index.html:275 +msgid "Request Beta Access" +msgstr "Beantrage Beta-Zugang" + +#: templates/datacenterlight/index.html:298 +msgid "QUESTIONS?" +msgstr "Fragen?" + +#: templates/datacenterlight/index.html:299 +msgid "CONTACT US!" +msgstr "Kontaktiere uns!" + +#: templates/datacenterlight/index.html:303 +msgid "Switzerland " +msgstr "Schweiz" + +#: templates/datacenterlight/index.html:328 +msgid "Home" +msgstr "Home" + +#: templates/datacenterlight/index.html:332 +msgid "How it works" +msgstr "Wie es funktioniert" + +#: templates/datacenterlight/index.html:341 +msgid "Pricing" +msgstr "Preise" + +#~ msgid "Our promise" +#~ msgstr "Unser Versprechen" + +#~ msgid "" +#~ "Instead of creating an expensive SLA for availability, we promise that we " +#~ "do our best to run things as smooth as possible." +#~ msgstr "" +#~ "Anstatt eines SLAs (Service Levle Agreements) zu vereinbaren,setzen wir " +#~ "unsere persönliche Arbeitskraft ein, um Ihnen ein sorgenfreiesHosting zu " +#~ "garantieren" diff --git a/datacenterlight/static/datacenterlight/css/landing-page.css b/datacenterlight/static/datacenterlight/css/landing-page.css index 9eaf7a52..547ea9bc 100755 --- a/datacenterlight/static/datacenterlight/css/landing-page.css +++ b/datacenterlight/static/datacenterlight/css/landing-page.css @@ -155,6 +155,11 @@ h6 { margin-top: 0; } +.btn-buynow { + background-color: #607D8B; + border-color: #607D8B; +} + @media(max-width:1199px) { ul.banner-social-buttons { float: left; @@ -195,9 +200,20 @@ a#forgotpassword { } +.selectpicker { + margin-top: 8px !important; +} + .content-404 h1 { margin: 0 0 15px; font-size: 200px; line-height: 1; font-weight: 700; color: #6db97c; + +} + +.btn-buynow { + background-color: #607D8B; + border-color: #607D8B; +} \ No newline at end of file diff --git a/datacenterlight/static/datacenterlight/img/datacenterlight.png b/datacenterlight/static/datacenterlight/img/datacenterlight.png new file mode 100644 index 00000000..1ae6ff53 Binary files /dev/null and b/datacenterlight/static/datacenterlight/img/datacenterlight.png differ diff --git a/datacenterlight/static/datacenterlight/img/favicon.ico b/datacenterlight/static/datacenterlight/img/favicon.ico index 9cd0fe78..f1c5a80c 100644 Binary files a/datacenterlight/static/datacenterlight/img/favicon.ico and b/datacenterlight/static/datacenterlight/img/favicon.ico differ diff --git a/datacenterlight/templates/datacenterlight/emails/request_access_confirmation.html b/datacenterlight/templates/datacenterlight/emails/request_access_confirmation.html new file mode 100644 index 00000000..4fee1677 --- /dev/null +++ b/datacenterlight/templates/datacenterlight/emails/request_access_confirmation.html @@ -0,0 +1,128 @@ +{% load static from staticfiles %} + + + + + + +Oxygen Invoice + + + + + + + + + + + + + +
+
+ + +
+ +
+ + + +
+ logo + +
+
+ +
+
+
+
+ + + + + + + + + + +
+ Thank you for your request. +
+

You are one step away from being our beta tester!

+ Currently we are running our tests to make sure everything runs perfectly.
+ In the meantime, we would like to ask you a little patience
until our team contacts you with beta access.
+ Thank you!

 
+
+
+
+ + +
Your data center light team
+
+
+
+ + + diff --git a/datacenterlight/templates/datacenterlight/emails/request_access_confirmation.txt b/datacenterlight/templates/datacenterlight/emails/request_access_confirmation.txt new file mode 100644 index 00000000..4fee1677 --- /dev/null +++ b/datacenterlight/templates/datacenterlight/emails/request_access_confirmation.txt @@ -0,0 +1,128 @@ +{% load static from staticfiles %} + + + + + + +Oxygen Invoice + + + + + + + + + + + + + +
+
+ + +
+ +
+ + + +
+ logo + +
+
+ +
+
+
+
+ + + + + + + + + + +
+ Thank you for your request. +
+

You are one step away from being our beta tester!

+ Currently we are running our tests to make sure everything runs perfectly.
+ In the meantime, we would like to ask you a little patience
until our team contacts you with beta access.
+ Thank you!

 
+
+
+
+ + +
Your data center light team
+
+
+
+ + + diff --git a/datacenterlight/templates/datacenterlight/emails/request_access_notification.html b/datacenterlight/templates/datacenterlight/emails/request_access_notification.html new file mode 100644 index 00000000..09531ba6 --- /dev/null +++ b/datacenterlight/templates/datacenterlight/emails/request_access_notification.html @@ -0,0 +1,125 @@ +{% load static from staticfiles %} + + + + + + +Oxygen Invoice + + + + + + + + + + + + + +
+
+ + +
+ +
+ + + +
+ logo + +
+
+ +
+
+
+
+ + + + + + + + + + +
+ An user requested a beta access +
+

User {{email}} requested beta access

 
+
+
+
+ + +
Your data center light team
+
+
+
+ + + diff --git a/datacenterlight/templates/datacenterlight/emails/request_access_notification.txt b/datacenterlight/templates/datacenterlight/emails/request_access_notification.txt new file mode 100644 index 00000000..09531ba6 --- /dev/null +++ b/datacenterlight/templates/datacenterlight/emails/request_access_notification.txt @@ -0,0 +1,125 @@ +{% load static from staticfiles %} + + + + + + +Oxygen Invoice + + + + + + + + + + + + + +
+
+ + +
+ +
+ + + +
+ logo + +
+
+ +
+
+
+
+ + + + + + + + + + +
+ An user requested a beta access +
+

User {{email}} requested beta access

 
+
+
+
+ + +
Your data center light team
+
+
+
+ + + diff --git a/datacenterlight/templates/datacenterlight/index.html b/datacenterlight/templates/datacenterlight/index.html index f61b6b17..578c5bed 100755 --- a/datacenterlight/templates/datacenterlight/index.html +++ b/datacenterlight/templates/datacenterlight/index.html @@ -1,4 +1,5 @@ -{% load staticfiles %} +{% load staticfiles i18n%} +{% get_current_language as LANGUAGE_CODE %} @@ -17,12 +18,14 @@ + + @@ -52,21 +55,38 @@ @@ -84,14 +104,14 @@

datacenterlight.ch

-

Finally, an affordable VM hosting in Switzerland!

+

{% trans "Finally, an affordable VM hosting in Switzerland!" %}

@@ -114,14 +134,14 @@
-

How it works :

    +

    {% trans "How it works :" %}

    • -

      Reuse existing factory halls intead of building an expensive building.

      +

      {% trans "Reuse existing factory halls intead of building an expensive building." %}

    • -

      Being creative, using modern and alternative design for a datacenter.

      • +

      {% trans "Being creative, using modern and alternative design for a datacenter." %}

    • -

      Being open : Using FOSS exclusively, we can save money for licenses.

      • +

      {% trans "Being open : Using FOSS exclusively, we can save money for licenses." %}

@@ -140,8 +160,8 @@
-

Scale out

-

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 called data center.

+

{% trans "Scale out" %}

+

{% trans "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 called data center." %}

@@ -163,8 +183,8 @@
-

Our promise

-

Instead of creating an expensive SLA for availability, we promise that we do our best to run things as smooth as possible.

+

{% 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." %}

@@ -186,8 +206,8 @@
-

We are cutting down the costs significantly!

-

Affordable VM hosting based in Switzerland

+

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

+

{% trans "Affordable VM hosting based in Switzerland" %}

@@ -203,13 +223,13 @@
-

VM hosting

-

Based in Switzerland

+

{% trans "VM hosting" %}

+

{% trans "Based in Switzerland" %}

1 core,

2 GiB RAM,

-

15 GiB storage(SSD) (10 CHF)

+

{% trans "15 GiB storage(SSD)" %}

- Buy Now! More Info

+ {% trans "Buy Now!" %} {% trans "More Info" %}

@@ -231,7 +251,7 @@
-

I want to try!

+

{% trans "I want to try!" %}

 

 

@@ -242,19 +262,33 @@ {% csrf_token %} {{ form.non_field_errors }} {{ form.email.errors|striptags}} -
- {% for message in messages %} - {{ message }} - {% endfor %} -
- +
- + - + + + + +
@@ -275,12 +309,12 @@
-

QUESTIONS?

-

CONTACT US!

+

{% trans "QUESTIONS?" %}

+

{% trans "CONTACT US!" %}

ungleich GmbH

info@datacenterlight.ch

In der Au 7, Schwanden 8762

-

Switzerland

+

{% trans "Switzerland " %}

@@ -334,6 +368,24 @@ + + + + diff --git a/datacenterlight/views.py b/datacenterlight/views.py index a70e75d5..5de74ebb 100644 --- a/datacenterlight/views.py +++ b/datacenterlight/views.py @@ -3,6 +3,7 @@ from .forms import BetaAccessForm from .models import BetaAccess from django.contrib import messages from django.core.urlresolvers import reverse_lazy, reverse +from utils.mailer import BaseEmail class IndexView(CreateView): @@ -18,5 +19,34 @@ class IndexView(CreateView): return success_url def form_valid(self, form): + + context = { + 'base_url': "{0}://{1}".format(self.request.scheme, self.request.get_host()) + } + + email_data = { + 'subject': 'DatacenterLight Beta Access Request', + 'to': form.cleaned_data.get('email'), + 'context': context, + 'template_name': 'request_access_confirmation', + 'template_path': 'datacenterlight/emails/' + } + email = BaseEmail(**email_data) + email.send() + + context.update({ + 'email': form.cleaned_data.get('email') + }) + + email_data = { + 'subject': 'DatacenterLight Beta Access Request', + 'to': 'info@ungleich.ch', + 'context': context, + 'template_name': 'request_access_notification', + 'template_path': 'datacenterlight/emails/' + } + email = BaseEmail(**email_data) + email.send() + messages.add_message(self.request, messages.SUCCESS, self.success_message) return super(IndexView, self).form_valid(form) diff --git a/digitalglarus/forms.py b/digitalglarus/forms.py index 9dc35eed..90a1024e 100644 --- a/digitalglarus/forms.py +++ b/digitalglarus/forms.py @@ -123,9 +123,11 @@ class BookingDateForm(forms.Form): raise forms.ValidationError("Your end date must be greather than your start date.") q1 = Q(bookingorder__customer__user=self.user, - start_date__lte=start_date, end_date__gte=start_date) + start_date__lte=start_date, end_date__gte=start_date, + bookingorder__status=BookingOrder.APPROVED) q2 = Q(bookingorder__customer__user=self.user, - start_date__gt=start_date, start_date__lte=end_date) + start_date__gt=start_date, start_date__lte=end_date, + bookingorder__status=BookingOrder.APPROVED) if Booking.objects.filter(q1 | q2).exists(): raise forms.ValidationError("You already have a booking in these dates.") diff --git a/digitalglarus/locale/de/LC_MESSAGES/django.mo b/digitalglarus/locale/de/LC_MESSAGES/django.mo index 0313fcfd..3200410e 100644 Binary files a/digitalglarus/locale/de/LC_MESSAGES/django.mo and b/digitalglarus/locale/de/LC_MESSAGES/django.mo differ diff --git a/digitalglarus/templates/digitalglarus/login.html b/digitalglarus/templates/digitalglarus/login.html index e8d81b47..41f859d6 100644 --- a/digitalglarus/templates/digitalglarus/login.html +++ b/digitalglarus/templates/digitalglarus/login.html @@ -98,6 +98,9 @@ + + +
diff --git a/digitalglarus/templates/digitalglarus/supportus.html b/digitalglarus/templates/digitalglarus/supportus.html index f7445447..afff1994 100644 --- a/digitalglarus/templates/digitalglarus/supportus.html +++ b/digitalglarus/templates/digitalglarus/supportus.html @@ -33,6 +33,15 @@ margin-top: 0px; } + + @media only screen and (max-width: 450px) { + + /*body { font-size: 2em; }*/ + .intro-headline-big {font-size: 1.8em !important;} + + + } + {% endblock %} @@ -142,7 +151,7 @@

What we do with your support

Discover how your donation is being used in renovating our coworking space!

-
+
{% for post in post_list %} {% include "ungleich/djangocms_blog/includes/blog_item.html" with post=post image="true" TRUNCWORDS_COUNT=TRUNCWORDS_COUNT %} diff --git a/dynamicweb/urls.py b/dynamicweb/urls.py index e2f78903..8999bff7 100644 --- a/dynamicweb/urls.py +++ b/dynamicweb/urls.py @@ -17,7 +17,6 @@ urlpatterns = [ url(r'^index.html$', LandingView.as_view()), url(r'^nodehosting/', NodeJSHostingView.as_view(), name="node.hosting"), url(r'^djangohosting/', DjangoHostingView.as_view(), name="django.hosting"), url(r'^nosystemd/', include('nosystemd.urls', namespace="nosystemd")), - url(r'^datacenterlight', include('datacenterlight.urls', namespace="datacenterlight")), url(r'^taggit_autosuggest/', include('taggit_autosuggest.urls')), url(r'^jsi18n/(?P\S+?)/$', 'django.views.i18n.javascript_catalog'), @@ -27,6 +26,7 @@ urlpatterns = [ url(r'^index.html$', LandingView.as_view()), urlpatterns += i18n_patterns('', url(r'^/?$', LandingView.as_view()), url(r'^admin/', include(admin.site.urls)), + url(r'^datacenterlight', include('datacenterlight.urls', namespace="datacenterlight")), url(r'^membership/', include(membership_urls)), url(r'^digitalglarus/', include('digitalglarus.urls', namespace="digitalglarus")), diff --git a/hosting/locale/de/LC_MESSAGES/django.mo b/hosting/locale/de/LC_MESSAGES/django.mo new file mode 100644 index 00000000..11ba904f Binary files /dev/null and b/hosting/locale/de/LC_MESSAGES/django.mo differ