diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.mo b/datacenterlight/locale/de/LC_MESSAGES/django.mo index 668aa97b..a7ca90d4 100644 Binary files a/datacenterlight/locale/de/LC_MESSAGES/django.mo 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 index 04c3ab5d..30a44512 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-03 21:51-0500\n" +"POT-Creation-Date: 2017-06-09 14:40-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -75,28 +75,27 @@ msgstr "" msgid "Thank you!" msgstr "Vielen Dank!" -<<<<<<< HEAD #: templates/datacenterlight/index.html:62 -#: templates/datacenterlight/index.html:160 -#: templates/datacenterlight/index.html:368 +#: templates/datacenterlight/index.html:147 +#: templates/datacenterlight/index.html:346 #: templates/datacenterlight/pricing.html:62 -#: templates/datacenterlight/pricing.html:190 +#: templates/datacenterlight/pricing.html:202 msgid "What is it" msgstr "Was ist es?" #: templates/datacenterlight/index.html:65 -#: templates/datacenterlight/index.html:211 -#: templates/datacenterlight/index.html:371 +#: templates/datacenterlight/index.html:190 +#: templates/datacenterlight/index.html:349 #: templates/datacenterlight/pricing.html:65 -#: templates/datacenterlight/pricing.html:193 +#: templates/datacenterlight/pricing.html:205 msgid "Scale out" msgstr "Skalierung" #: templates/datacenterlight/index.html:68 -#: templates/datacenterlight/index.html:237 -#: templates/datacenterlight/index.html:374 +#: templates/datacenterlight/index.html:216 +#: templates/datacenterlight/index.html:352 #: templates/datacenterlight/pricing.html:68 -#: templates/datacenterlight/pricing.html:196 +#: templates/datacenterlight/pricing.html:208 msgid "Reliable and light" msgstr "Zuverlässig und leicht" @@ -105,60 +104,60 @@ msgid "Order VM" msgstr "VM bestellen" #: templates/datacenterlight/index.html:74 -#: templates/datacenterlight/index.html:381 +#: templates/datacenterlight/index.html:359 #: templates/datacenterlight/pricing.html:74 -#: templates/datacenterlight/pricing.html:203 +#: templates/datacenterlight/pricing.html:215 msgid "Contact" msgstr "Kontakt" -#: templates/datacenterlight/index.html:127 +#: templates/datacenterlight/index.html:114 msgid "Finally, an affordable VM hosting in Switzerland!" msgstr "Endlich: bezahlbares VM Hosting in der Schweiz" -#: templates/datacenterlight/index.html:131 +#: templates/datacenterlight/index.html:118 msgid "What is it?" msgstr "Was ist es?" -#: templates/datacenterlight/index.html:134 +#: templates/datacenterlight/index.html:121 msgid "I want it!" msgstr "Das will ich haben!" -#: templates/datacenterlight/index.html:166 +#: templates/datacenterlight/index.html:150 +msgid "Our data center" +msgstr "Unser Datacenter" + +#: templates/datacenterlight/index.html:157 msgid "" "Reuses existing factory halls instead of building a new expensive building." -msgstr "Verwendet ehemalige Fabrikhallen anstatt ein neues, teures Gebäude zu errichten.
" +msgstr "" +"Verwendet ehemalige Fabrikhallen anstatt ein neues, teures Gebäude zu " +"errichten.
" -#: templates/datacenterlight/index.html:171 +#: templates/datacenterlight/index.html:162 msgid "Only wants you to pay for what you actually need.\\u2028" -msgstr "Möchte, dass du nur bezahlst, was du auch wirklich brauchst: Wähle deine Ressourcen individuell aus!
" +msgstr "" +"Möchte, dass du nur bezahlst, was du auch wirklich brauchst: Wähle deine " +"Ressourcen individuell aus!
" -#: templates/datacenterlight/index.html:175 +#: templates/datacenterlight/index.html:166 msgid "" "Is creative, using a modern and alternative design for a data center in " "order to make it more sustainable and affordable at the same time.\\u2028" -msgstr "Ist kreativ, indem es sich ein modernes und alternatives Layout zu Nutze macht um Nachhaltigkeit zu fördern und somit erschwingliche Preise bieten zu können.
" +msgstr "" +"Ist kreativ, indem es sich ein modernes und alternatives Layout zu Nutze " +"macht um Nachhaltigkeit zu fördern und somit erschwingliche Preise bieten zu " +"können.
" -#: templates/datacenterlight/index.html:179 +#: templates/datacenterlight/index.html:170 msgid "" "Cuts down the costs for you by using FOSS (Free Open Source Software) " "exclusively, wherefore we can save money from paying licenses." -msgstr "Sorgt dafür, dass unnötige Kosten erspart werden, indem es ausschliesslich mit FOSS (Free Open Source Software) arbeitet und wir daher auf Lizenzgebühren verzichten können.
" - -#: templates/datacenterlight/index.html:183 -msgid "" -"Is located in Glarus, Switzerland where your data is under strict privacy." -msgstr "Befindet sich in Glarus, in der Schweiz, wo deine Daten unter striktem Schutz stehen." - -#: templates/datacenterlight/index.html:187 -msgid "Has qualified workers on site who take care of the hardware.\\u2028" -msgstr "Hat qualifizierte Mitarbeiter vor Ort, die sich um die Hardware kümmern." - -#: templates/datacenterlight/index.html:191 -msgid "" -"Renounces active cooling by taking an advantage of the isolation of our " -"tight factory walls." -msgstr "Verzichtet auf aktive Kühlung, indem es sich die Isolation unserer ehemaligen Fabrikhalle zu Nutze macht." +msgstr "" +"Sorgt dafür, dass unnötige Kosten erspart werden, indem es ausschliesslich " +"mit FOSS (Free Open Source Software) arbeitet und wir daher auf " +"Lizenzgebühren verzichten können.
" +#: templates/datacenterlight/index.html:193 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 " @@ -168,8 +167,7 @@ msgstr "" "erschwingliche Systeme. Bei grösserer Auslastung werden mehr Standard " "komponenten hinzugekauft und skalieren so das Datencenter." -#: templates/datacenterlight/index.html:240 -#: datacenterlight/templates/datacenterlight/index.html:218 +#: templates/datacenterlight/index.html:219 msgid "" "Our VMs are located in Switzerland, with reliable power supply and fast " "internet connection. Our VM costs less thanks to our featherlight " @@ -179,84 +177,78 @@ 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:237 +#: 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:238 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:245 +#: templates/datacenterlight/pricing.html:119 msgid "VM hosting" msgstr "VM Hosting" -#: datacenterlight/templates/datacenterlight/index.html:252 +#: templates/datacenterlight/index.html:252 msgid "Based in Switzerland" msgstr "Standort des Datacenters ist in der Schweiz" -#: datacenterlight/templates/datacenterlight/index.html:261 +#: templates/datacenterlight/index.html:261 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:264 +#: templates/datacenterlight/pricing.html:173 msgid "Order Now!" msgstr "Bestelle jetzt!" -#: datacenterlight/templates/datacenterlight/index.html:280 +#: templates/datacenterlight/index.html:280 msgid "Want to know more? Subscribe to our newsletter!" msgstr "Willst du mehr wissen? Abonniere unseren Newsletter!" -#: datacenterlight/templates/datacenterlight/index.html:307 +#: templates/datacenterlight/index.html:307 msgid "Switzerland " msgstr "Schweiz" -#: datacenterlight/templates/datacenterlight/index.html:324 +#: templates/datacenterlight/index.html:324 msgid "Questions?" msgstr "Fragen?" -#: datacenterlight/templates/datacenterlight/index.html:324 +#: templates/datacenterlight/index.html:324 msgid "Contact us!" msgstr "Kontaktiere uns!" -#: datacenterlight/templates/datacenterlight/index.html:342 -#: datacenterlight/templates/datacenterlight/pricing.html:186 +#: templates/datacenterlight/index.html:342 +#: templates/datacenterlight/pricing.html:198 msgid "Home" msgstr "Home" -#: datacenterlight/templates/datacenterlight/index.html:355 -#: datacenterlight/templates/datacenterlight/pricing.html:199 +#: templates/datacenterlight/index.html:355 +#: templates/datacenterlight/pricing.html:211 msgid "Pricing" msgstr "Preise" -#: datacenterlight/templates/datacenterlight/pricing.html:71 +#: templates/datacenterlight/pricing.html:71 msgid "Buy VM" msgstr "VM Kaufen" -#: datacenterlight/templates/datacenterlight/pricing.html:127 +#: 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/pricing.html:144 msgid "GB Storage (SSD)" msgstr "GB Storage (SSD)" -#: datacenterlight/templates/datacenterlight/pricing.html:168 +#: templates/datacenterlight/pricing.html:180 msgid "Simple and affordable: Try our virtual machine with featherlight price." msgstr "" "Einfach und bezahlbar: Testen Sie unsere virtuelen Machinen mit " "federleichten Preisen" -#: templates/datacenterlight/pricing.html:171 -#: datacenterlight/templates/datacenterlight/pricing.html:171 +#: templates/datacenterlight/pricing.html:183 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 " @@ -272,6 +264,26 @@ msgstr "" "uns unter support@datacenterlight.ch. Unser Team wird sich umgehend um dein " "Anliegen kümmern!" +#~ msgid "" +#~ "Is located in Glarus, Switzerland where your data is under strict privacy." +#~ msgstr "" +#~ "Befindet sich in Glarus, in der Schweiz, wo deine Daten unter striktem " +#~ "Schutz stehen." + +#~ msgid "Has qualified workers on site who take care of the hardware.\\u2028" +#~ msgstr "" +#~ "Hat qualifizierte Mitarbeiter vor Ort, die sich um die Hardware kümmern." + +#~ msgid "" +#~ "Renounces active cooling by taking an advantage of the isolation of our " +#~ "tight factory walls." +#~ msgstr "" +#~ "Verzichtet auf aktive Kühlung, indem es sich die Isolation unserer " +#~ "ehemaligen Fabrikhalle zu Nutze macht." + +#~ msgid "More Info" +#~ msgstr "Weitere Informationen" + #~ msgid "How it works" #~ msgstr "Wie es funktioniert" diff --git a/datacenterlight/static/datacenterlight/css/landing-page.css b/datacenterlight/static/datacenterlight/css/landing-page.css index 56739c71..52c2bbdc 100755 --- a/datacenterlight/static/datacenterlight/css/landing-page.css +++ b/datacenterlight/static/datacenterlight/css/landing-page.css @@ -7,14 +7,6 @@ font-family: 'Lato-Regular'; src: url('../fonts/Lato/Lato-Regular.ttf'); } -@font-face { - font-family: 'Lato-Black'; - src: url('../fonts/Lato/Lato-Black.ttf'); -} -@font-face { - font-family: 'Lato-Light'; - src: url('../fonts/Lato/Lato-Light.ttf'); -} body, html { width: 100%; @@ -263,7 +255,6 @@ h6 { margin: 0; font-weight: 400; font-size: 6em; - font-family: 'Lato-Black'; } .intro-divider { @@ -274,7 +265,7 @@ h6 { .intro-message > h3 { font-weight: 300; - font-family: 'Lato-Light'; + } .intro-pricing{ @@ -327,7 +318,6 @@ h6 { margin-bottom: 25px; } .split-section .split-text .split-title h2{ - font-family: 'Lato-Black'; font-size: 50px; line-height: 50px; padding-bottom: 25px; @@ -348,6 +338,12 @@ h6 { width: 90%; margin-left: auto; } +.split-section.right .split-description.title p{ + font-size: 27px; + margin-bottom: 10px; + text-align: left; + +} .split-section.right .split-text { text-align: right; } @@ -388,10 +384,10 @@ h6 { min-height: 500px; } .split-section.what .split-text .lead { - font-size: 18px; + font-size: 19px; color: #3a3a3a; - margin-bottom: 0; - line-height: 25px; + margin-bottom: 5px; + line-height: 29px; } .split-section.what .fa-li.fa-lg{ font-size: 17px; @@ -419,10 +415,8 @@ h6 { } .pricing-section .card .title{ padding: 15px 40px; - font-family: 'Lato-Black'; } .pricing-section .card .title h3{ - font-family: 'Lato-Black'; } .pricing-section .card .price{ background: #5A74AF; @@ -447,7 +441,6 @@ h6 { text-align: left; } .pricing-section .text .section-heading{ - font-family: 'Lato-Black'; font-size: 50px; line-height: 50px; padding-bottom: 25px; @@ -474,7 +467,6 @@ h6 { padding: 70px 0; } .request-section .title h2{ - font-family: 'Lato-Black'; font-size: 45px; margin: 0; color: #fff; @@ -550,7 +542,6 @@ h6 { .contact-section .card .subtitle h3{ font-size: 30px; margin-bottom: 23px; - font-family: 'Lato-Black'; } .contact-section .card .social a:hover{ text-decoration: none; @@ -561,7 +552,6 @@ h6 { max-width: 468px; } .contact-section .title h2{ - font-family: 'Lato-Black'; font-size: 65px; margin: 0; color: #fff; @@ -591,10 +581,9 @@ h6 { width: 50%; } .price-calc-section .text .section-heading{ - font-family: 'Lato-Black'; font-size: 48px; line-height: 48px; - padding-bottom: 25px; + padding-bottom: 27px; color: #3a3a3a; letter-spacing: 1px; position: relative; @@ -634,10 +623,8 @@ h6 { } .price-calc-section .card .title{ padding: 15px 40px; - font-family: 'Lato-Black'; } .price-calc-section .card .title h3{ - font-family: 'Lato-Black'; } .price-calc-section .card .price{ background: #5A74AF; @@ -893,8 +880,7 @@ h6 { margin-top: 20px; } .price-calc-section .text .section-heading { - font-family: 'Lato-Black'; - font-size: 35px; + font-size: 35px; line-height: 35px; padding-bottom: 15px; text-align: center; @@ -960,7 +946,6 @@ h6 { .section-heading { margin-bottom: 30px; - font-family: 'Lato-Black'; } .section-heading-spacer { diff --git a/datacenterlight/templates/datacenterlight/base.html b/datacenterlight/templates/datacenterlight/base.html new file mode 100644 index 00000000..82072cac --- /dev/null +++ b/datacenterlight/templates/datacenterlight/base.html @@ -0,0 +1,83 @@ +{% load staticfiles i18n%} +{% get_current_language as LANGUAGE_CODE %} + + + + + + + + + + + + datacenterlight.ch - Featherlight Swiss VM + + + + + + + + + + + + + + + + + + + + + + + + + + + + {% include "datacenterlight/includes/_navbar.html" %} + + + {% block content %} + {% endblock %} + + {% include "datacenterlight/includes/_footer.html" %} + + + + + + + + + + + + + + + + + + diff --git a/datacenterlight/templates/datacenterlight/beta.html b/datacenterlight/templates/datacenterlight/beta.html deleted file mode 100644 index 0de80cd2..00000000 --- a/datacenterlight/templates/datacenterlight/beta.html +++ /dev/null @@ -1,107 +0,0 @@ -{% load staticfiles i18n%} - - - - - - - - landings - - - - - - - - - -
-
-
-

Your affordable Swiss VM

-
-
-
-
-

Are you looking for a secure and affordable VM in the midst of the Swiss mountains?

-

While there are many offers in Switzerland for secure hosting, we haven't found any that is affordable. So we decided we will built one in the Glarus mountains.

-

Right now we are in a preparing the tech stack and talking to infrastructure providers to find the optimal location.

-

Our objective is to launch this offer starting in 2017. Are you curious how it works? Be one of the first to try it and request access to our beta program.

-
-
-
-
-
-

Beta Program

-
-

I am interested in running

-
- {% for vm in vms %} -
-
- -
-
number of VMs ({{vm.ssd}} GB SSD, {{vm.ram}} GB RAM, {{vm.cpu}} CPU) - {{vm.price}}chf / day
-
- {% endfor %} -

At a monthly total of 0chf per day

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

Notice: this is no an order - you don't have to pay anything, it just helps us to setup the right infrastructure

-
- {% csrf_token %} -
- -
-
-
-
- -
- - - - - - - - \ No newline at end of file diff --git a/datacenterlight/templates/datacenterlight/beta_access.html b/datacenterlight/templates/datacenterlight/beta_access.html index 1552a1c0..19714d40 100644 --- a/datacenterlight/templates/datacenterlight/beta_access.html +++ b/datacenterlight/templates/datacenterlight/beta_access.html @@ -24,4 +24,4 @@ $('#beta_access').ajaxForm({ target: '#beta_access_form', success: function(response) { } }); - + \ No newline at end of file diff --git a/datacenterlight/templates/datacenterlight/beta_success.html b/datacenterlight/templates/datacenterlight/beta_success.html index 70695d07..327198e7 100644 --- a/datacenterlight/templates/datacenterlight/beta_success.html +++ b/datacenterlight/templates/datacenterlight/beta_success.html @@ -1,3 +1,4 @@ + {% load i18n %} - - - - - - - - - - - - - - - - - diff --git a/datacenterlight/templates/datacenterlight/error404.html b/datacenterlight/templates/datacenterlight/error404.html deleted file mode 100644 index dc819a9d..00000000 --- a/datacenterlight/templates/datacenterlight/error404.html +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - Rails Hosting.ch - Ruby on Rails as easy as possible | Page not found - - - - - - - - - - - - - - - - - - - - - -
-
-
-

 

-

404

-

- "Sorry, we could not find the page you are looking for!" -

-
-
-
- - - - - - - - - - diff --git a/datacenterlight/templates/datacenterlight/index.html b/datacenterlight/templates/datacenterlight/home.html similarity index 52% rename from datacenterlight/templates/datacenterlight/index.html rename to datacenterlight/templates/datacenterlight/home.html index 25d6e124..d66f290c 100755 --- a/datacenterlight/templates/datacenterlight/index.html +++ b/datacenterlight/templates/datacenterlight/home.html @@ -1,120 +1,8 @@ +{% extends "datacenterlight/base.html" %} {% load staticfiles i18n%} {% get_current_language as LANGUAGE_CODE %} - - - - - - - - - - - - datacenterlight.ch - Featherlight Swiss VM - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +{% block content %}
@@ -123,7 +11,7 @@
-

DataCenterLight

+

DataCenterLight

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

    @@ -139,8 +27,6 @@
-
-
@@ -159,6 +45,10 @@

{% trans "What is it" %}

+
+

{% trans "Our data center" %}

+ +
  • @@ -178,18 +68,6 @@

    {% trans "Cuts down the costs for you by using FOSS (Free Open Source Software) exclusively, wherefore we can save money from paying licenses." %}

    • -
  • - -

    {% trans "Is located in Glarus, Switzerland where your data is under strict privacy." %}

    -
    • -
  • - -

    {% trans "Has qualified workers on site who take care of the hardware.
" %}

    -
    • -
  • - -

    {% trans "Renounces active cooling by taking an advantage of the isolation of our tight factory walls." %}

    -
@@ -257,7 +135,6 @@

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

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

- {% trans "More Info" %}
@@ -352,68 +229,4 @@
- - - - - - - - - - - - - - - - - - - - - +{% endblock %} diff --git a/datacenterlight/templates/datacenterlight/includes/_footer.html b/datacenterlight/templates/datacenterlight/includes/_footer.html new file mode 100644 index 00000000..17ba6b64 --- /dev/null +++ b/datacenterlight/templates/datacenterlight/includes/_footer.html @@ -0,0 +1,35 @@ + {% load staticfiles i18n%} +{% get_current_language as LANGUAGE_CODE %} + diff --git a/datacenterlight/templates/datacenterlight/includes/_head.html b/datacenterlight/templates/datacenterlight/includes/_head.html new file mode 100644 index 00000000..e69de29b diff --git a/datacenterlight/templates/datacenterlight/includes/_navbar.html b/datacenterlight/templates/datacenterlight/includes/_navbar.html new file mode 100644 index 00000000..899757b2 --- /dev/null +++ b/datacenterlight/templates/datacenterlight/includes/_navbar.html @@ -0,0 +1,66 @@ +{% load staticfiles i18n%} +{% get_current_language as LANGUAGE_CODE %} + \ No newline at end of file diff --git a/datacenterlight/templates/datacenterlight/landing.html b/datacenterlight/templates/datacenterlight/landing.html deleted file mode 100644 index 0a23be9e..00000000 --- a/datacenterlight/templates/datacenterlight/landing.html +++ /dev/null @@ -1,86 +0,0 @@ -{% load staticfiles i18n%} - - - - - - - - landings - - - - - - - - - -
-
-
-

Swiss 2 GB VM for 0.5 CHF per day

-
-
-
-
-
-

Details about the offer..
  • 2 GB RAM
  • 1 CPU
  • 10 GB Dus

I am interested in running

-
-
-
- - -
-
- number of VMs -
- -
- -
-
-

Interested in other offers? Checkout our beta program offers!

-
- -
-
-
- - - - - - - - \ No newline at end of file diff --git a/datacenterlight/templates/datacenterlight/login.html b/datacenterlight/templates/datacenterlight/login.html deleted file mode 100755 index 3a00b83e..00000000 --- a/datacenterlight/templates/datacenterlight/login.html +++ /dev/null @@ -1,155 +0,0 @@ - - - - - - - - - - - - Rails Hosting.ch - Ruby on Rails as easy as possible - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
 
- -
-

Log In

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

-
    - -
 
-
-
-
- - - - - - - - - - - - - - - - - - - diff --git a/datacenterlight/templates/datacenterlight/order.html b/datacenterlight/templates/datacenterlight/order.html deleted file mode 100644 index ab224172..00000000 --- a/datacenterlight/templates/datacenterlight/order.html +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - Rails Hosting.ch - Ruby on Rails as easy as possible - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
 
- -
-

-

Order Now

-

 

- -
-   -
- - - -
- -

 

- -
-
-   -
- - - -
-

VM size sliders to be inserted

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

-
    - -
 
-
-
-
- -
- - -
- - - - - - - - - - - - - - diff --git a/datacenterlight/templates/datacenterlight/pricing.html b/datacenterlight/templates/datacenterlight/pricing.html index 8d88682c..9786f876 100644 --- a/datacenterlight/templates/datacenterlight/pricing.html +++ b/datacenterlight/templates/datacenterlight/pricing.html @@ -1,105 +1,8 @@ +{% extends "datacenterlight/base.html" %} {% load staticfiles i18n%} {% get_current_language as LANGUAGE_CODE %} - - - - - - - - - - - datacenterlight.ch - Featherlight Swiss VM - - - - - - - - - - - - - - - - - - - - - - - - - - - - +{% block content %}
@@ -157,14 +60,14 @@
-
+ - - - - - - - - - - - - - - - - - - +{% endblock %} \ No newline at end of file diff --git a/datacenterlight/templates/datacenterlight/signup.html b/datacenterlight/templates/datacenterlight/signup.html deleted file mode 100755 index b7dc3239..00000000 --- a/datacenterlight/templates/datacenterlight/signup.html +++ /dev/null @@ -1,156 +0,0 @@ - - - - - - - - - - - - Rails Hosting.ch - Ruby on Rails as easy as possible - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
 
-
-

Sign up

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

 

-
- - -

-
    - -
-
-
-
- -
- - -
- - - - - - - - - - - - - - diff --git a/datacenterlight/views.py b/datacenterlight/views.py index 1a33bc3e..519804cd 100644 --- a/datacenterlight/views.py +++ b/datacenterlight/views.py @@ -191,7 +191,7 @@ class BetaProgramView(CreateView): class IndexView(CreateView): - template_name = "datacenterlight/index.html" + template_name = "datacenterlight/home.html" model = BetaAccess form_class = BetaAccessForm success_url = "/datacenterlight#requestform" diff --git a/hosting/locale/de/LC_MESSAGES/django.mo b/hosting/locale/de/LC_MESSAGES/django.mo index 21191e02..478838b5 100644 Binary files a/hosting/locale/de/LC_MESSAGES/django.mo and b/hosting/locale/de/LC_MESSAGES/django.mo differ diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po index 091aed0a..b0d0bb5e 100644 --- a/hosting/locale/de/LC_MESSAGES/django.po +++ b/hosting/locale/de/LC_MESSAGES/django.po @@ -236,11 +236,6 @@ msgstr "" msgid "The %(site_name)s team" msgstr "" -#: hosting/templates/hosting/login.html:10 -#: hosting/templates/hosting/reset_password.html:10 -#: hosting/templates/hosting/signup.html:9 -msgid "Your VM hosted in Switzerland" -msgstr "Ihre VM gehostet in der Schweiz" #: hosting/templates/hosting/login.html:26 msgid "You haven been logged out" @@ -452,7 +447,6 @@ msgstr "" #: templates/hosting/virtual_machine_detail.html:166 msgid "plan?" msgstr "" -msgstr "Sind Sie sicher, dass Sie ihre virtuelle Maschine beenden wollen "\ #: templates/hosting/virtual_machine_detail.html:169 msgid "Cancel"