diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.mo b/datacenterlight/locale/de/LC_MESSAGES/django.mo index 8abdd932..4e429e48 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 1b763f78..ef76adcc 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-26 13:35+0000\n" +"POT-Creation-Date: 2017-05-27 10:13-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -75,6 +75,11 @@ msgstr "" msgid "Thank you!" msgstr "Vielen Dank!" +#: templates/datacenterlight/index.html:62 +#: templates/datacenterlight/index.html:142 +#: templates/datacenterlight/index.html:328 +#: templates/datacenterlight/pricing.html:62 +#: templates/datacenterlight/pricing.html:185 #: datacenterlight/templates/datacenterlight/index.html:62 #: datacenterlight/templates/datacenterlight/pricing.html:62 msgid "What is it" @@ -96,6 +101,11 @@ msgstr "Skalierung" msgid "Reliable and light" msgstr "Zuverlässig und leicht" +#: templates/datacenterlight/index.html:71 +#: templates/datacenterlight/pricing.html:71 +msgid "Order VM" +msgstr "VM bestellen" + #: datacenterlight/templates/datacenterlight/index.html:71 #: datacenterlight/templates/datacenterlight/pricing.html:71 msgid "Buy VM" @@ -120,6 +130,7 @@ msgstr "Was ist es?" msgid "I want it!" msgstr "Das will ich haben!" +#: templates/datacenterlight/index.html:147 #: datacenterlight/templates/datacenterlight/index.html:142 #: datacenterlight/templates/datacenterlight/index.html:328 #: datacenterlight/templates/datacenterlight/pricing.html:187 @@ -186,9 +197,11 @@ msgstr "VM Hosting" msgid "Based in Switzerland" msgstr "Standort des Datacenters ist in der Schweiz" -#: datacenterlight/templates/datacenterlight/index.html:243 -msgid "15 GB Storage (SSD)" -msgstr "15 GB Storage (SSD)" +#: templates/datacenterlight/index.html:243 +#, fuzzy +#| msgid "10 GB Storage (SSD)" +msgid "10 GB Storage (SSD)" +msgstr "10 GB Storage (SSD)" #: datacenterlight/templates/datacenterlight/index.html:246 #: datacenterlight/templates/datacenterlight/pricing.html:156 @@ -225,6 +238,7 @@ msgstr "Preise" msgid "Hosted in Switzerland" msgstr "Standort des Datacenters ist in der Schweiz" +#: templates/datacenterlight/pricing.html:139 #: datacenterlight/templates/datacenterlight/pricing.html:139 msgid "GB Storage (SSD)" msgstr "GB Storage (SSD)" @@ -256,15 +270,23 @@ msgstr "" #~ msgid "Thank you, we will contact you as soon as possible" #~ msgstr "Vielen Dank, wir werden Sie sobald als möglich kontaktieren." +#: templates/datacenterlight/pricing.html:166 +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 " +"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." +msgstr "Unsere VMs werden in der Schweiz im Kanton Glarus gehostet und befinden sich zur Zeit noch in der BETA-Phase. Möchtest du mehr über uns erfahren und hast auf unserer Website nicht genügend Informationen gefunden? Möchtest eine detailliertere Bestellung aufgeben? Bist du auf technische Probleme gestossen, die du uns mitteilen möchtest? Dann zögere nicht und kontaktiere uns unter support@datacenterlight.ch. Unser Team wird sich umgehend um dein Anliegen kümmern!" + + + #~ 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:" - #~ msgid "Email address" #~ msgstr "E-Mail Adresse" diff --git a/datacenterlight/static/datacenterlight/css/landing-page.css b/datacenterlight/static/datacenterlight/css/landing-page.css index 74671e1a..7705393d 100755 --- a/datacenterlight/static/datacenterlight/css/landing-page.css +++ b/datacenterlight/static/datacenterlight/css/landing-page.css @@ -136,7 +136,7 @@ h6 { cursor: pointer; } .navbar-right { - margin-right: 0px; + margin-right: 10px; } .navbar-default .btn-link { color: #fff; @@ -144,6 +144,52 @@ h6 { .navbar-default .btn-link:hover { color: #fff !important; } +.nav-language{ + position: relative; +} +.nav-language .select-language{ + padding: 15px 10px; + color: #777; +} +.navbar-transparent .nav-language .select-language{ + color: #fff; +} + +.nav-language .select-language span{ + margin-left: 5px; + margin-right: 5px; + +} +.nav-language .drop-language{ + position: absolute; + top: 45px; + left: -8px; + background: #fff; + width: 100px; + height: 40px; + padding: 9px 10px; + -webkit-box-shadow: -8px 13px 31px -8px rgba(77,77,77,1); + -moz-box-shadow: -8px 13px 31px -8px rgba(77,77,77,1); + box-shadow: -8px 13px 31px -8px rgba(77,77,77,1); + display: none; + z-index: 100; + /* margin-left: 10px; */ + text-align: center; + border-radius: 4px; +} +.nav-language .drop-language a{ + cursor: pointer; +} +.navbar-transparent .nav-language .drop-language{ + background: transparent; + border: 1px solid #fff; +} +.navbar-transparent .nav-language .drop-language a{ + color: #fff; +} +.nav-language:hover .drop-language{ + display: block; +} .intro-header { height: 100vh; text-align: center; @@ -250,7 +296,7 @@ h6 { bottom: 0; left: 0; right: 0; - background: rgba(90, 116, 175, 0.7); + background: rgba(90, 116, 175, 0.8); } .intro-pricing .intro-message .section-heading{ font-size: 45px; @@ -532,8 +578,8 @@ h6 { } .price-calc-section .text .section-heading{ font-family: 'Montserrat-Bold'; - font-size: 50px; - line-height: 50px; + font-size: 48px; + line-height: 48px; padding-bottom: 25px; color: #3a3a3a; letter-spacing: 1px; @@ -601,6 +647,13 @@ h6 { .price-calc-section .card .description input{ font-size: 20px; text-align: center; + width: 70px; +} +.price-calc-section .card .description #coreValue{ + width: 50px; +} +.price-calc-section .card .description #ramValue{ + width: 50px; } .price-calc-section .card .description i{ color: #29427A; @@ -670,6 +723,14 @@ h6 { margin-bottom: 20px; padding: 0; } + .intro-pricing .intro-message .section-heading { + font-size: 35px; + width: 80%; + margin: 0 auto; + } + .intro-pricing .intro-message { + padding-bottom: 0; + } ul.intro-social-buttons > li:last-child { margin-bottom: 0; @@ -693,6 +754,23 @@ h6 { font-size: 15px; color: #777; } + .nav-language:hover{ + height: 80px; + } + .navbar-transparent .nav-language .select-language { + color: #777; + } + .navbar-transparent .nav-language .drop-language a { + color: #777; + } + .navbar-transparent .nav-language .drop-language { + background: #fff; + /* border: 1px solid #fff; */ + z-index: 100000; + left: 9px; + border: 1px solid rgba(119, 119, 119, 0.4); + box-shadow: none; + } .split-section { padding: 10px 0; } @@ -735,7 +813,35 @@ h6 { left: 50%; transform: translate(-50%, 0); } - + + .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: 'Montserrat-Bold'; + 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; + } } @media(max-width:540px) { @@ -752,6 +858,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: 17px; + margin-left: 4px; + } } diff --git a/datacenterlight/templates/datacenterlight/index.html b/datacenterlight/templates/datacenterlight/index.html index 89297926..f3c7a9a0 100755 --- a/datacenterlight/templates/datacenterlight/index.html +++ b/datacenterlight/templates/datacenterlight/index.html @@ -68,13 +68,13 @@ {% trans "Reliable and light" %}
  • - {% trans "Buy VM" %} + {% trans "Order VM" %}
  • {% trans "Contact" %}
    • - - {% if LANGUAGE_CODE == 'en-us'%} - - {% else %} - - {% endif %} - {% if LANGUAGE_CODE == 'de'%} - - {% else %} - - {% endif %} +
  • +
    + {% if LANGUAGE_CODE == 'en-us'%} + English + {% else %} + Deutsch + {% endif %} + +
    +
    + {% if LANGUAGE_CODE == 'en-us'%} + Deutsch + {% else %} + English + {% endif %} - +
    +
    • @@ -163,9 +168,7 @@

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

    -

    {% trans "Our VMs are hosted in Glarus, Switzerland." %}

    - - {% trans " WARNING: We are currently running in BETA mode. We hope you won't encounter any hiccups, but if you do, 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." %}

    @@ -184,7 +187,7 @@
  • ⋅
  • - {% trans "How it works" %}
    • + {% trans "What is it" %}
  • ⋅
  • {% trans "Scale out" %}
    • diff --git a/datacenterlight/views.py b/datacenterlight/views.py index b68f7408..75c72202 100644 --- a/datacenterlight/views.py +++ b/datacenterlight/views.py @@ -7,6 +7,7 @@ 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.utils.translation import get_language, get_language_info from opennebula_api.models import OpenNebulaManager from opennebula_api.serializers import VirtualMachineTemplateSerializer @@ -24,6 +25,7 @@ class PricingView(TemplateView): context = { 'templates': VirtualMachineTemplateSerializer(templates, many=True).data, + 'languages': getlanguages() } except: messages.error( request, @@ -241,3 +243,5 @@ class IndexView(CreateView): messages.add_message(self.request, messages.SUCCESS, self.success_message) return super(IndexView, self).form_valid(form) + + diff --git a/hosting/static/hosting/css/commons.css b/hosting/static/hosting/css/commons.css index 94e84df5..234b680f 100644 --- a/hosting/static/hosting/css/commons.css +++ b/hosting/static/hosting/css/commons.css @@ -1,5 +1,5 @@ .dashboard-container { - padding-top:5%; padding-bottom: 11%; + padding-top:70px; padding-bottom: 11%; } .borderless td { diff --git a/hosting/static/hosting/css/landing-page.css b/hosting/static/hosting/css/landing-page.css index 84650ab4..5d4c6a90 100644 --- a/hosting/static/hosting/css/landing-page.css +++ b/hosting/static/hosting/css/landing-page.css @@ -82,24 +82,25 @@ h6 { text-align: center; color: #f8f8f8; position: relative; - padding-bottom: 25%; - padding-top: 10%; } .intro-login { - background: url(../img/login-bg.jpg) no-repeat center center; + background: url(../img/intro-bg.jpg) no-repeat center center; background-size: cover; height: 100%; } .intro-signup { - background: url(../img/signup-bg.png) no-repeat center center; + background: url(../img/intro-bg.jpg) no-repeat center center; background-size: cover; height: 100%; + display: flex; + justify-content: center; + align-items: center; } .intro-reset-password { - background: url(../img/signup-bg.png) no-repeat center center; + background: url(../img/intro-bg.jpg) no-repeat center center; background-size: cover; height: 100%; } @@ -193,6 +194,128 @@ h6 { float: right; margin-top: 0; } +/*------Auth section---------*/ +.auth-container{ + height: 100vh; + position: relative; +} +.auth-bg{ + background: url(../img/auth-bg.jpg); + position: fixed; + left: 0; + top: 0; + width: 100%; + height: 100vh; + background-repeat: no-repeat; + background-position: center center; + background-size: cover; + background-attachment: fixed; + +} +.auth-bg::before{ + content: ""; + position: absolute; + top: 0; + bottom: 0; + left: 0; + right: 0; + background: rgba(75, 75, 101, 0.55); + z-index: 1; +} +.auth-container .container{ + z-index: 1000; +} +.auth-container .auth-content{ + width: 80%; + margin: 0 auto; + max-width: 390px; + margin-top: 60px; + +} +.auth-container .auth-title{ + margin-top: 40px; +} +.auth-container .auth-title h2{ + color: #fff; + font-family: 'Montserrat-Bold'; + font-size: 44px; + text-align: center; + width: 425px; + margin: 0 auto; + margin-bottom: 30px; + position: relative; +} +.auth-container .auth-title h2::after{ + content: ""; + position: absolute; + bottom: -20px; + background: #fff; + height: 7px; + width: 70px; + left: 50%; + transform: translate(-50%, 0); +} + +.auth-box{ + background: #fff; + padding: 0; + padding-bottom: 30px; + box-sizing: border-box; + box-shadow: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23); + border-radius: 4px; + z-index: 10; +} + +.auth-box .section-heading{ + color: #5a5a5a; + padding-top: 20px; + padding-bottom: 5px; + text-align: center; + text-transform: uppercase; + letter-spacing: 3px; + font-size: 20px; + border-radius: 3px 3px 0px 0px; + margin: 0 auto; + font-family: 'Montserrat-Medium'; +} +.auth-box .form{ + padding: 20px; + width: 80%; + margin: 0 auto; +} +.auth-box .form .red{ + color: #ea3a3a; +} +.auth-box .form .btn{ + box-shadow: 0 0px 9px rgba(0,0,0,0.19), 0 3px 5px rgba(0,0,0,0.23); + letter-spacing: 3px; + font-size: 17px; + text-transform: uppercase; +} +.auth-box .form .form-control{ + height: 44px; + font-size: 16px; +} +.auth-box .auth-footer { + text-align: center; + padding: 10px; +} +.auth-box .auth-footer .text{ + color: #777; +} +.auth-box .auth-footer .links a{ + color: #1e94cc; +} +.auth-box .auth-footer .links a:hover{ + color: #1e94cc; +} + +.auth-box.sign-up{ + padding-bottom: 5px; +} +.auth-box.sign-up .form{ + padding: 15px 20px 0 20px; +} @media (max-width: 1199px) { ul.banner-social-buttons { @@ -218,7 +341,17 @@ h6 { margin-bottom: 0; } } - +@media (max-width: 540px) { + .auth-container .auth-title h2{ + font-size: 32px; + width: 90%; + margin-bottom: 50px; + } + .auth-box .form { + padding: 15px; + width: 90%; + } +} footer { padding: 2%; background-color: #f8f8f8; @@ -250,4 +383,5 @@ a.unlink { a.unlink:hover { color: inherit; -} \ No newline at end of file +} + diff --git a/hosting/static/hosting/css/order.css b/hosting/static/hosting/css/order.css index 8e0c5919..2abc47db 100644 --- a/hosting/static/hosting/css/order.css +++ b/hosting/static/hosting/css/order.css @@ -1,4 +1,4 @@ -.order-detail-container {padding-top:5%; padding-bottom: 11%;} +.order-detail-container {padding-top: 70px; padding-bottom: 11%;} .order-detail-container .invoice-title h2, .invoice-title h3 { display: inline-block; diff --git a/hosting/static/hosting/css/orders.css b/hosting/static/hosting/css/orders.css index 64e95328..6819a94b 100644 --- a/hosting/static/hosting/css/orders.css +++ b/hosting/static/hosting/css/orders.css @@ -1,4 +1,4 @@ -.orders-container {padding-top:5%; padding-bottom: 11%;} +.orders-container {padding-top:70px; padding-bottom: 11%;} .orders-container .table > tbody > tr > td { vertical-align: middle; diff --git a/hosting/static/hosting/css/payment.css b/hosting/static/hosting/css/payment.css index 57e830f4..68a36837 100644 --- a/hosting/static/hosting/css/payment.css +++ b/hosting/static/hosting/css/payment.css @@ -1,5 +1,5 @@ -.payment-container {padding-top:5%; padding-bottom: 11%;} +.payment-container {padding-top:70px; padding-bottom: 11%;} .creditcard-box .panel-title {display: inline;font-weight: bold; font-size:17px;} .creditcard-box .checkbox.pull-right { margin: 0; } .creditcard-box .pl-ziro { padding-left: 0px; } diff --git a/hosting/static/hosting/img/auth-bg.jpg b/hosting/static/hosting/img/auth-bg.jpg new file mode 100644 index 00000000..b2450fab Binary files /dev/null and b/hosting/static/hosting/img/auth-bg.jpg differ diff --git a/hosting/templates/hosting/base_short.html b/hosting/templates/hosting/base_short.html index c6d1772e..864c8835 100644 --- a/hosting/templates/hosting/base_short.html +++ b/hosting/templates/hosting/base_short.html @@ -44,6 +44,7 @@ + {% if request.user.is_authenticated %} + {% endif %} @@ -123,6 +124,7 @@ {% endblock %} + {% if request.user.is_authenticated %} - + {% endif %} diff --git a/hosting/templates/hosting/login.html b/hosting/templates/hosting/login.html index 3f3a60b7..e06099bd 100644 --- a/hosting/templates/hosting/login.html +++ b/hosting/templates/hosting/login.html @@ -3,12 +3,16 @@ {% load staticfiles bootstrap3%} {% block content %} -