From bf82aa61f12d48b809bdd0fd1589474e3766e132 Mon Sep 17 00:00:00 2001 From: Levi Date: Wed, 4 Jan 2017 20:31:53 -0500 Subject: [PATCH 1/5] Fixed #2862. Fixed #2861. Fixed #2864. Fixed #2865 --- .../locale/de/LC_MESSAGES/django.mo | Bin 0 -> 460 bytes .../locale/de/LC_MESSAGES/django.po | 55 ++++++++ .../datacenterlight/css/landing-page.css | 4 + .../datacenterlight/img/datacenterlight.png | Bin 0 -> 5135 bytes .../static/datacenterlight/img/favicon.ico | Bin 1150 -> 1150 bytes .../emails/request_access_confirmation.html | 128 ++++++++++++++++++ .../emails/request_access_confirmation.txt | 128 ++++++++++++++++++ .../emails/request_access_notification.html | 125 +++++++++++++++++ .../emails/request_access_notification.txt | 125 +++++++++++++++++ .../templates/datacenterlight/index.html | 55 ++++++-- datacenterlight/views.py | 30 ++++ digitalglarus/locale/de/LC_MESSAGES/django.mo | Bin 661 -> 585 bytes .../templates/digitalglarus/supportus.html | 9 ++ dynamicweb/urls.py | 2 +- hosting/locale/de/LC_MESSAGES/django.mo | Bin 0 -> 421 bytes 15 files changed, 648 insertions(+), 13 deletions(-) create mode 100644 datacenterlight/locale/de/LC_MESSAGES/django.mo create mode 100644 datacenterlight/locale/de/LC_MESSAGES/django.po create mode 100644 datacenterlight/static/datacenterlight/img/datacenterlight.png create mode 100644 datacenterlight/templates/datacenterlight/emails/request_access_confirmation.html create mode 100644 datacenterlight/templates/datacenterlight/emails/request_access_confirmation.txt create mode 100644 datacenterlight/templates/datacenterlight/emails/request_access_notification.html create mode 100644 datacenterlight/templates/datacenterlight/emails/request_access_notification.txt create mode 100644 hosting/locale/de/LC_MESSAGES/django.mo diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.mo b/datacenterlight/locale/de/LC_MESSAGES/django.mo new file mode 100644 index 0000000000000000000000000000000000000000..2e17da5610d46b99b73ef0b5180f2de42db2fffc GIT binary patch literal 460 zcmYL_&rZTX5XP(VPtv1j59>{%gDnXL7cf*30hL>`dkj%Cd-A0S^?$@6@X|o4xhxBA zl%`}b2?8?mLPpvw^!%Xf_4^4Mk8e;avklJ#q=K&~3B1v8Qdw>XLAS_jN@rUQS`Gb> zZTE9)j$Q39BtG}CM&Cxfo6B{d%+f4>PuV7ytkO literal 0 HcmV?d00001 diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.po b/datacenterlight/locale/de/LC_MESSAGES/django.po new file mode 100644 index 00000000..e17785cf --- /dev/null +++ b/datacenterlight/locale/de/LC_MESSAGES/django.po @@ -0,0 +1,55 @@ +# 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: 2016-12-29 10:50-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:55 +msgid "What is it" +msgstr "" + +#: templates/datacenterlight/index.html:58 +msgid "Scale out" +msgstr "" + +#: templates/datacenterlight/index.html:61 +msgid "Our promise" +msgstr "" + +#: templates/datacenterlight/index.html:64 +msgid "Buy VM" +msgstr "" + +#: templates/datacenterlight/index.html:67 +msgid "Contact" +msgstr "kontak" + +#: templates/datacenterlight/index.html:91 +msgid "What is it?" +msgstr "" + +#: templates/datacenterlight/index.html:94 +msgid "I want it!" +msgstr "" + +#: templates/datacenterlight/index.html:117 +msgid "How it works :" +msgstr "" + +#: templates/datacenterlight/index.html:119 +msgid "Reuse existing factory halls intead of building an expensive building." +msgstr "" diff --git a/datacenterlight/static/datacenterlight/css/landing-page.css b/datacenterlight/static/datacenterlight/css/landing-page.css index 9eaf7a52..cb2044b3 100755 --- a/datacenterlight/static/datacenterlight/css/landing-page.css +++ b/datacenterlight/static/datacenterlight/css/landing-page.css @@ -195,6 +195,10 @@ a#forgotpassword { } +.selectpicker { + margin-top: 8px !important; +} + .content-404 h1 { margin: 0 0 15px; font-size: 200px; diff --git a/datacenterlight/static/datacenterlight/img/datacenterlight.png b/datacenterlight/static/datacenterlight/img/datacenterlight.png new file mode 100644 index 0000000000000000000000000000000000000000..1ae6ff53c6e1876d7ff5c2dc598020e32774f37e GIT binary patch literal 5135 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 DnJB5u literal 0 HcmV?d00001 diff --git a/datacenterlight/static/datacenterlight/img/favicon.ico b/datacenterlight/static/datacenterlight/img/favicon.ico index 9cd0fe78ee9c3e0e2faa173823238d4790a3cf80..f1c5a80c13bcc948942aa9d3eddee060cd5ca95c 100644 GIT binary patch literal 1150 zcmbVMO=uHA6dpnF;H6aXqM(N!JctOQ;KhT`gNPRq>!I`@T0{!gDthn_EeHzYp;SwI z5=2Z|wP@35O%0?qVoGR@`7yD9RI+Ka8?$NJ{O-@^?CfsXG%bp|%$u2SzVE%aZyrm? zCi*rt5o&jn3!4eqP6*jU2Zbo2<8&f~o;7dP2isGFhDQZdr5;t+!Ri_MPUF=c6{=jN zuA~}59b49GmWEa;h!7)g2s0z#XNJN1>=68KP~bvTzJcDri|IJhzG18^%%YmlK&}*_ zR0=3(lgI`qkPW$LPS$+19CV*jaT(>M$eN_gt-)F4QA)>5uzpsmSd2$8=NdzfPa%^` zptPE29I0GH>bnn%;W-pCDH>9)X%$7U_1CvH^c>oOyT=dU!I`7DdUzMYpC_S86*zml zFnX;WuY1}s?{PA%YUs3$EJ?U?Y(IuBcd)Z>lMZz4+lHV1F9iGvvG?qKnQo(aYcjoUDG zyAzIE=MeZf3b$v9;bv^ZArwWgYcd+7wcLr&w2K{SxLIdG5YXS>*Pz$(P>kM41pGMP zvIPP6IOEAx+Q&w|ntov5X@gz^%x@8wIJ|mzgZ9G@gQwK=qA0>{x2>yZ;6E5Mmkp^j RSFI=h%A*d<|G@vwe*naJs?-1g literal 1150 zcmb_c+e$(~6rG?C@G0m*nHg%CU93ooBlPnOXd$D%T(wKI=pJuoeB70%4E`FLS-cWMN5>GE30Z&5~M zpGqr$Da#ohkMeLlJY^8LN+EcY#>Hg{CUZ=#-!~-U?EDAUw`l}|RB6t`W4a8_JA5Ze z8PEDS^p(%c=d;~yZY5xMB;asKShs!4{W831G77s>f^%2G_KpPaQ8}O1AQtNtW-qm+ zd)4R#zC6s+F&K;@`iI4$9T*Xd`)7OXrF&;NY&X2Tz5n7RltCz*`Df=WpK@RAY5}&5 y?_!+CS32L_r=g~Ikg~d2@{h~Z$__g{wU6Hho0scLx_525X)?;D- 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..c245e65f 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,9 +134,9 @@
-

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.

      • @@ -207,7 +227,7 @@

      Based in Switzerland

      1 core,

      2 GiB RAM,

      -

      15 GiB storage(SSD) (10 CHF)

      +

      15 GiB storage(SSD)

      Buy Now! More Info

@@ -334,6 +354,17 @@ + + + + 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/locale/de/LC_MESSAGES/django.mo b/digitalglarus/locale/de/LC_MESSAGES/django.mo index 0313fcfddb01f21b760073928747884894e374d2..3200410e6e94913cdf95cc692b17acd88facf1ef 100644 GIT binary patch delta 227 zcmbQrdXlC7o)F7a1|VPsVi_QI0b+I_&H-W&=m264AnpWWE+C!+#31>(K+FroOMy6> zk%3_|kOqm%GeOj;18ET72uSk*X)7QNR0g&O$Yfv!VjxfglPn-IF)6>aMBiS8Avr&< zBrzGx%*fA8o%kSw!_ZX0$jHjbWOD!`AEQ=kNqHhjVKzu%Hbh}!X)#DBDK)LMs64-@ JB((^{1pqy|BU}Ig delta 303 zcmX@fGL^Odo)F7a1|VPuVi_O~0b*_-?g3&D*a5_>K)e%(L2C8`F$)kM2Vx!|J_E#D zKztL3d4c!|5N9(oFnj{iAboL63=Et=It56B^yL9*kU7Ob8mKRkp&H2G0}8YOX`ns^ zAO!|&P#R2&POH9rv%1q8EfoKg$%}Gtm&tu32>B=tAw^w0E QN=+**D$g$}Ni70#0U-P{hyVZp diff --git a/digitalglarus/templates/digitalglarus/supportus.html b/digitalglarus/templates/digitalglarus/supportus.html index f7445447..3b333443 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 %} 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 0000000000000000000000000000000000000000..11ba904f74b4d5b55f01e8ccd0ae751617562114 GIT binary patch literal 421 zcmYL^-A=+V7=|%=v_p?QsEG#}{cyt{urR}91sC_1F-Y{RLY>pmE^RS-A>N+XVy8yl zif6GGpWXCzaxbEi?p6m@}zL!7)m`(VaIT zXil1 zgp9qF&EvoJ)l7ZEfdkr#wR&-XJj zon9N27i(HD$QfN>6ngPw)>IyZ;jk*(LKYjxRE>g&Z2sr8ZEGaBX52jYQJdbHz3bDu zq9yO6#WR(PX?K>7p||mxT2D*@;R~@Wd4W;yvD8*tttG8sEaXaI#Ot4>ayxzWJ9Q5^ L+INw2)VEsSEn##| literal 0 HcmV?d00001 From f9387cd6b82030ef71c40d1440d778734a468364 Mon Sep 17 00:00:00 2001 From: Levi Date: Fri, 6 Jan 2017 10:24:34 -0500 Subject: [PATCH 2/5] Finished #2883 --- .../locale/de/LC_MESSAGES/django.mo | Bin 460 -> 2974 bytes .../locale/de/LC_MESSAGES/django.po | 149 +++++++++++++++--- .../datacenterlight/css/landing-page.css | 12 ++ .../templates/datacenterlight/index.html | 50 +++--- 4 files changed, 168 insertions(+), 43 deletions(-) diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.mo b/datacenterlight/locale/de/LC_MESSAGES/django.mo index 2e17da5610d46b99b73ef0b5180f2de42db2fffc..21bbd419e041ad97519aa967c7f64de000cc9326 100644 GIT binary patch literal 2974 zcma)8O^hQ)6)qqI7{X5i;ZG5Ib67zVx0#6`EZ!`;o*8?082?Oc&#qYDQ0{(i*ScM8 zs;b9p!vP6#jYK34xqy(u9p$hGG+gkVoDeqnHuIg9seebKU z{g>yS`h~*rC7dtd{0Gh}I4?ec3y#wdD)kcZb>L@#KL)mdKL;KG{|x*n@P!X4^)&Db z@Z-Q5@FT#hz)t{g0{4ME;8Vb#0G|Q=4ERaln_K)f@MF0DE$}Vi?|>3#gqL=J-v>Si zOo5*Pu7Pdf8$fyQPrw@RufX2`pZRe0-aEhpd%!yIJ`hW(w}6t*FM+QD-vK@k{QDOF4g4GKpGT6y(?5X{ z?_a>r1D{55GXKlK9`NfxsrRS2+yuS>`~&b^pz!-9F47{20gB380qRpYzaT$w$otYW zIiv@|n;eq=7ja6@rB=yXa`+t1ClAR}j%O<fz55NC*Z&e^I)OQu*`^7@>yfaO&gC^HD+ z*&|4?qF%n-Eq~nUs>6P7)I1!~*>G1K<`%03)tYOQkxmlF-mA8;I+M@{tKXN1%M|RY z+xeVvS&|8~%-zgix}kqhZ;?gw5p+oC}|9_ zU}#Z*&62G^tGtlMb^1<$I_KK1ATxAJIKVtfWG;I`(jQOm|?olP5bb!@`UX;wI$MeW?peS_?xy!F>#xklB`>tD6Bd!6=Q zytV^JS?g&wh7!CO+wHBfp?z>B8phKlo3$DSG#7k}GZARr8WOry?zBsDPqrTCAtak{ zW^2?d!n%O2;a+&ZGCf#WaoP6fbX5AD|L;{)e==bU<7GF|Q-^(lq&z4(GK_s@FGXjQ zVy>mO({nDZr$*wDHG-5D8Z~sxn(aE}@#aE;sS{mHnC^2}hu!TBT=7Jla25@Rme$CsWfNHIv_a$li^vyF)1t-$Su~ume#JA(`@q)Ze`(cjuOMz zmmQQEggl>9y1B5h5HX0cVQ8hHjx-3}JdCG-32A`yF-p422K%*gR5!;*1)l+{&fx#< ziS{Aoi9w43d3p76&!s!k-8me5U7W)dH*b453nH{EyVNkAd5F5oZHbb6JhhCS?cn5< z`C`f#E65aG_!PdVL*P)aGHF^gA(verFg!_}2m)LqbFpFwFk>W!I_1+)dGQQhOq+`_ zI|QT|&dr#zDs;!C#(Zd=Ywkp&Ubabysv2_)?f+dmilB<*% zMyBEF$fm8w&dkKHkqma7)UlOwV0;}Qa?1tAZb4RW7uY6hIK#V)nj|v5PoN6piJojO zTn&hi4?0XIWeFrtX(%LC<~@_IqaItH&ZVCSfWAWL2r-jwBu2hA!ZzLB`gIL!pqui4 zVoqJ{W`R%)0;jUQOZ{Uz!zM(pOv4qpn{yriDJXTDhnruOyf+ItU8OjDRuil@=cy|V r0P7&#`9j1bO_>_IE>fPMclfxVcfKkaLl7$}d_rr`cjXrBZ>aYGBTjqh delta 123 zcmbOyeug>xo)F7a1|VPpVi_RT0b*7lwgF-g2moSsAPxlLY(@r#NFdDy#7BW_AOh3Ft3@ep^>hUrGlY>m8rpIX*NDa_H2-BHUj`Qe-I}C diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.po b/datacenterlight/locale/de/LC_MESSAGES/django.po index e17785cf..203db4fa 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: 2016-12-29 10:50-0500\n" +"POT-Creation-Date: 2017-01-06 10:01-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,38 +18,151 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: templates/datacenterlight/index.html:55 -msgid "What is it" -msgstr "" - #: templates/datacenterlight/index.html:58 -msgid "Scale out" -msgstr "" +msgid "What is it" +msgstr "Was ist es?" #: templates/datacenterlight/index.html:61 -msgid "Our promise" -msgstr "" +#: templates/datacenterlight/index.html:163 +#: templates/datacenterlight/index.html:335 +msgid "Scale out" +msgstr "Skalierung" #: templates/datacenterlight/index.html:64 -msgid "Buy VM" -msgstr "" +#: 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 "kontak" +msgstr "Kontakt" -#: templates/datacenterlight/index.html:91 +#: 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 "" +msgstr "Was ist es?"" -#: templates/datacenterlight/index.html:94 +#: templates/datacenterlight/index.html:114 msgid "I want it!" msgstr "" -#: templates/datacenterlight/index.html:117 +#: templates/datacenterlight/index.html:137 msgid "How it works :" -msgstr "" +msgstr "Warum können wir diese Leistung so günstig anbieten:" -#: templates/datacenterlight/index.html:119 +#: 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 und" +"ist 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: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 cb2044b3..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; @@ -205,3 +210,10 @@ a#forgotpassword { 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/templates/datacenterlight/index.html b/datacenterlight/templates/datacenterlight/index.html index c245e65f..12c2ca11 100755 --- a/datacenterlight/templates/datacenterlight/index.html +++ b/datacenterlight/templates/datacenterlight/index.html @@ -61,7 +61,7 @@ {% trans "Scale out" %}
  • - {% trans "Our promise" %} + {% trans "Reliable and light" %}
  • {% trans "Buy VM" %} @@ -139,9 +139,9 @@

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

    @@ -160,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." %}

    @@ -183,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." %}

    @@ -206,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" %}

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

    VM hosting

    -

    Based in Switzerland

    +

    {% trans "VM hosting" %}

    +

    {% trans "Based in Switzerland" %}

    1 core,

    2 GiB RAM,

    -

    15 GiB storage(SSD)

    +

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

    - Buy Now! More Info

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

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

    I want to try!

    +

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

     

     

    @@ -269,10 +269,10 @@
    - +
    - + @@ -295,8 +295,8 @@
    -

    QUESTIONS?

    -

    CONTACT US!

    +

    {% trans "QUESTIONS?" %}

    +

    {% trans "CONTACT US!" %}

    ungleich GmbH

    info@datacenterlight.ch

    In der Au 7, Schwanden 8762

    @@ -325,27 +325,27 @@
    -

    Copyright © ungleich GmbH 2016. All Rights Reserved

    +

    Copyright © ungleich GmbH {% now "Y" %}. All Rights Reserved

    From ef07f5da83b013460f138cfa71314ff828a0365d Mon Sep 17 00:00:00 2001 From: Levi Date: Mon, 9 Jan 2017 09:34:25 -0500 Subject: [PATCH 3/5] #2905 --- .../locale/de/LC_MESSAGES/django.mo | Bin 2974 -> 3114 bytes .../locale/de/LC_MESSAGES/django.po | 19 +++++++++++------- .../templates/datacenterlight/index.html | 2 +- digitalglarus/forms.py | 6 ++++-- 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.mo b/datacenterlight/locale/de/LC_MESSAGES/django.mo index 21bbd419e041ad97519aa967c7f64de000cc9326..c3f492346087f9c7fe8612bb90c4b2c144e575fc 100644 GIT binary patch delta 775 zcmX}qzfTik9LMqRU9Sb(%8w!(ikj=-01^|4KgK$!8=AntpbRHm=*6Za^g;~-bvCKN zG@3a0V^I^r^WNVaZS9x5*G62T zU8H%A**G4dV#76?z*l$b);m!ml`lJ9r=WP~(DZH-SyyB>mg?2^Uf0^Hf_P zzYTNol-ZW?3J=<3xr!;y-~rC#6w{<)+d$3u9j5{Oj4JFKY9in98va6RvA?JSU8=f; zBdGo~4wK(PU0@Rrv5nMX%ao}PucD9ZsQ2FB1KdImJLaVKa;*Cu?8Be<5IL+w)$%f) z{8eKSy5DN45>>64D5>^=sve|ic@_G9+8d+l5K4A|)~^n6o<_|!LSwSsP(p?F41e%6 zRIpZYjK&uFpW^hn`RTO#$jQV>IsKTaIK|m!oUBDFwXnVzboRZ2!dx{>g18aHNu{%$ zop*2COviG&Zhteb)q;4T8dSq4QN5i0>GhrLO1Ko&J6`@p&+J0A8O3X9J3r_Y=R(Fe Jk|1hS>>nbOR5Jho delta 644 zcmYk(ze_?<6u|NGp1x=P$jmY=BxrD`BoZQPv&h;ktxX#vsQ;h@gJ=m7QW{)@hL)!A zZBa{qKtT{~Mq|*{&{lnqI&|RN&wcN4-#zEv>sT{dX@}hxLX44d@{>%EcLoEoVTw#) z9*41vSvGd5K=0Z?J*4s6X0b zl@Ci8#$6o316;)_>be(9;u~IJ!0N7R;XX~>V}kdS{B)ZAWt~ZZ7l*iwk4R;bq%G}i zks*Z3$S2uEEx3p?xQFZ|4b*~~IFBui;78A2eCIhrm3mU&=wW~PVG>1~_H@BG=5P+R z<70*lR`CI!P>;CAptqz&aY&tFK?cZ}P6%DE*QTM@peLuH4UCd`y?5\n" "Language-Team: LANGUAGE \n" @@ -49,11 +49,11 @@ msgstr "Endlich: bezahlbares VM Hosting in der Schweiz" #: templates/datacenterlight/index.html:111 msgid "What is it?" -msgstr "Was ist es?"" +msgstr "Was ist es?" #: templates/datacenterlight/index.html:114 msgid "I want it!" -msgstr "" +msgstr "Das will ich haben!" #: templates/datacenterlight/index.html:137 msgid "How it works :" @@ -92,9 +92,10 @@ msgid "" "internet connection. Our VM costs less thanks to our featherlight " "infrastructure." msgstr "" -"Unser Datacenter befindet sich in der Schweiz und" -"ist mit zuverlässiger Energieversorgung sowie schneller Internetverbindung ausgestattet." -"Unser Angebot ist aufgrund unserer federleichten Infrastruktur überaus kostengünstig." +"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!" @@ -138,12 +139,16 @@ msgstr "Beantrage Beta-Zugang" #: templates/datacenterlight/index.html:298 msgid "QUESTIONS?" -msgstr "FRAGEN?" +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" diff --git a/datacenterlight/templates/datacenterlight/index.html b/datacenterlight/templates/datacenterlight/index.html index 12c2ca11..46c64d27 100755 --- a/datacenterlight/templates/datacenterlight/index.html +++ b/datacenterlight/templates/datacenterlight/index.html @@ -300,7 +300,7 @@

    ungleich GmbH

    info@datacenterlight.ch

    In der Au 7, Schwanden 8762

    -

    Switzerland

    +

    {% trans "Switzerland " %}

    - + + + + +
    @@ -360,6 +374,13 @@ style: 'btn-link', windowPadding: 10, }); + + var hash = window.location.hash.substr(1); + console.log(hash); + if (hash == 'requestform'){ + $('#reques-success-message').modal('show'); + } + }; diff --git a/digitalglarus/templates/digitalglarus/login.html b/digitalglarus/templates/digitalglarus/login.html index f61a3f9b..02c44e7d 100644 --- a/digitalglarus/templates/digitalglarus/login.html +++ b/digitalglarus/templates/digitalglarus/login.html @@ -43,9 +43,78 @@ {% endfor %}

    {{form.non_field_errors|striptags}}

    -     + + + + + +
    diff --git a/digitalglarus/templates/digitalglarus/supportus.html b/digitalglarus/templates/digitalglarus/supportus.html index 3b333443..afff1994 100644 --- a/digitalglarus/templates/digitalglarus/supportus.html +++ b/digitalglarus/templates/digitalglarus/supportus.html @@ -151,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 %} From cc7c34e780035d72520bf37cc5bd53d857e64492 Mon Sep 17 00:00:00 2001 From: Levi Date: Tue, 10 Jan 2017 20:12:26 -0500 Subject: [PATCH 5/5] remove modal --- .../templates/digitalglarus/login.html | 68 +------------------ 1 file changed, 1 insertion(+), 67 deletions(-) diff --git a/digitalglarus/templates/digitalglarus/login.html b/digitalglarus/templates/digitalglarus/login.html index 02c44e7d..8e3bde70 100644 --- a/digitalglarus/templates/digitalglarus/login.html +++ b/digitalglarus/templates/digitalglarus/login.html @@ -43,76 +43,10 @@ {% endfor %}

    {{form.non_field_errors|striptags}}

    - + - -