ungleich-public
/
dynamicweb
6
0
Fork 0
Code Issues 1 Pull Requests 2 Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ungleich/dynamicweb into bugfix/include_GA_on_all_pages_by_domain

This commit is contained in:
Andrii Marynets 2017-07-13 22:53:56 +03:00
parent a8be59d7a2 e32b8434ba
commit 6f99c94919
4 changed files with 57 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
datacenterlight/locale/de/LC_MESSAGES/django.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-07-09 15:21+0530\n"
"POT-Creation-Date: 2017-07-13 23:55+0530\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -62,16 +62,16 @@ msgid "Hosted in Switzerland"
msgstr "Standort: Schweiz"
#: templates/datacenterlight/calculator_form.html:21
msgid "Please enter a value greater than or equal to 1."
msgstr "Bitte gib einen Wert größer oder gleich 1 ein."
msgid "Please enter a value in range 1 - 48."
msgstr "Bitte gib einen Wert von 1 bis 48 ein."
#: templates/datacenterlight/calculator_form.html:30
msgid "Please enter a value greater than or equal to 2."
msgstr "Bitte gib einen Wert größer oder gleich 2 ein."
msgid "Please enter a value in range 2 - 200."
msgstr "Bitte gib einen Wert von 2 bis 200 ein."
#: templates/datacenterlight/calculator_form.html:39
msgid "Please enter a value greater than or equal to 10."
msgstr "Bitte gib einen Wert größer oder gleich 10 ein"
msgid "Please enter a value in range 10 - 2000."
msgstr "Bitte gib einen Wert von 10 bis 200 ein."
#: templates/datacenterlight/calculator_form.html:40
#: templates/datacenterlight/pricing.html:50
@ -87,8 +87,8 @@ msgid "Your Name"
msgstr "Dein Name"
#: templates/datacenterlight/calculator_form.html:60
msgid "Please enter your name"
msgstr "Bitte gib Deinen Namen ein"
msgid "Please enter your name."
msgstr "Bitte gib Deinen Namen ein."
#: templates/datacenterlight/calculator_form.html:74
msgid "Email"
@ -99,8 +99,8 @@ msgid "Your Email"
msgstr "Deine E-Mail"
#: templates/datacenterlight/calculator_form.html:75
msgid "Please enter a valid email address"
msgstr "Bitte gib eine gültige E-Mailadresse ein"
msgid "Please enter a valid email address."
msgstr "Bitte gib eine gültige E-Mailadresse ein."
#: templates/datacenterlight/calculator_form.html:88
#: templates/datacenterlight/pricing.html:79
@ -501,6 +501,12 @@ msgstr "ist kein gültiger Name"
msgid "is not a proper email"
msgstr "ist keine gültige E-Mailadresse"
#~ msgid "Please enter a value greater than or equal to 1."
#~ msgstr "Bitte gib einen Wert größer oder gleich 1 ein."
#~ msgid "Please enter a value greater than or equal to 10."
#~ msgstr "Bitte gib einen Wert größer oder gleich 10 ein"
#~ msgid "Buy VM"
#~ msgstr "VM Kaufen"

23
datacenterlight/static/datacenterlight/css/landing-page.css
View File

@ -26,7 +26,7 @@ h6 {
/*blue light #5A74AF*/
/*blue dark #29427A*/
.topnav {
font-size: 14px;
font-size: 14px;
}
.lead {
@ -271,7 +271,7 @@ h6 {
.intro-message > h3 {
font-weight: 300;
}
.intro-pricing{
@ -337,7 +337,7 @@ h6 {
.split-section.left{
background: -webkit-linear-gradient(#f0f4f7, #fff) no-repeat;
background: -o-linear-gradient(#f0f4f7, #fff) no-repeat;
background: linear-gradient(#f0f4f7, #fff) no-repeat;
background: linear-gradient(#f0f4f7, #fff) no-repeat;
}
.split-section.left .split-description{
@ -806,7 +806,7 @@ tech-sub-sec h2 {
.price-calc-section .card .description .select-number{
font-size: 20px;
text-align: center;
width: 60px;
width: 85px;
}
.price-calc-section .card .description i{
color: #29427A;
@ -907,7 +907,7 @@ color: #eb4d5c;
}
}
@media screen and (min-device-width: 480px) and (max-device-width: 767px) {
@media screen and (min-device-width: 480px) and (max-device-width: 767px) {
.logo-wrap {
width: 50%;
padding: 15px 30px !important;
@ -915,7 +915,7 @@ color: #eb4d5c;
}
.logo-wrap-1 {
width: 50%;
padding: 15px 30px !importantx;
padding: 15px 30px !important;
min-height: 179px;
}
.landscape-xs-6{
@ -1014,7 +1014,7 @@ line-height: 40px;
color: #777;
}
.nav-language:hover{
height: 80px;
height: 80px;
}
.navbar-transparent .nav-language .select-language {
color: #777;
@ -1141,7 +1141,8 @@ line-height: 40px;
.price-calc-section .card .description .select-number{
font-size: 17px;
text-align: center;
width: 60px;
width: 65px;
margin-right: 10px;
}
}
@ -1243,17 +1244,17 @@ p.copyright {
a#forgotpassword {
color: #ffffff;
}
.topnav a:focus {
outline: none;
outline: none;
outline-offset: 0;
}
.topnav .btn:focus {
outline: none !important;
outline: none !important;
outline-offset: 0;
}

46
datacenterlight/static/datacenterlight/js/main.js
View File

@ -1,7 +1,7 @@
(function($){
"use strict"; // Start of use strict
/* ---------------------------------------------
Scripts initialization
--------------------------------------------- */
@ -24,30 +24,30 @@
'id': 'storageValue',
'value': 10,
'min': 10,
'max': 500,
'max': 2000,
'interval': 10
}
}
};
$(window).load(function(){
});
$(document).ready(function(){
verifiedUrl();
_navScroll();
_initScroll();
_initNavUrl();
_initPricing();
});
$(window).resize(function(){
});
/* ---------------------------------------------
@ -62,11 +62,11 @@
} else {
/* the viewport is less than 400 pixels wide */
}
function _initScroll(){
$(window).scroll(function(){
$(window).scroll(function(){
_navScroll();
});
@ -107,7 +107,7 @@
$('.fa-minus-circle.left').click(function(event){
var data = $(this).data('minus');
if(cardPricing[data].value > cardPricing[data].min){
cardPricing[data].value = Number(cardPricing[data].value) - cardPricing[data].interval;
}
@ -136,7 +136,7 @@
}
function _calcPricing(){
var total = (cardPricing['cpu'].value * 5) + (2* cardPricing['ram'].value) + (0.6* cardPricing['storage'].value);
var total = (cardPricing['cpu'].value * 5) + (2* cardPricing['ram'].value) + (0.6* cardPricing['storage'].value);
total = parseFloat(total.toFixed(2));
$("#total").text(total);
@ -148,7 +148,7 @@
function _calculate(numbers, price){
$('#valueTotal').text(numbers*price*31);
}
})(jQuery);
})(jQuery);

10
datacenterlight/templates/datacenterlight/calculator_form.html
View File

@ -18,7 +18,7 @@
<div class="form-group">
<div class="description input">
<i class="fa fa-minus-circle left" data-minus="cpu" aria-hidden="true"></i>
<input class="input-price select-number" type="number" min="1" max="42" id="coreValue" name="cpu" data-error="{% trans 'Please enter a value greater than or equal to 1.' %}" required>
<input class="input-price select-number" type="number" min="1" max="48" id="coreValue" name="cpu" data-error="{% trans 'Please enter a value in range 1 - 48.' %}" required>
<span> Core</span>
<i class="fa fa-plus-circle right" data-plus="cpu" aria-hidden="true"></i>
</div>
@ -27,7 +27,7 @@
<div class="form-group">
<div class="description input">
<i class="fa fa-minus-circle left" data-minus="ram" aria-hidden="true"></i>
<input id="ramValue" class="input-price select-number" type="number" min="2" max="200" name="ram" data-error="{% trans 'Please enter a value greater than or equal to 2.' %}" required>
<input id="ramValue" class="input-price select-number" type="number" min="2" max="200" name="ram" data-error="{% trans 'Please enter a value in range 2 - 200.' %}" required>
<span> GB RAM</span>
<i class="fa fa-plus-circle right" data-plus="ram" aria-hidden="true"></i>
</div>
@ -36,7 +36,7 @@
<div class="form-group">
<div class="description input">
<i class="fa fa-minus-circle left" data-minus="storage" aria-hidden="true"></i>
<input id="storageValue" class="input-price select-number" type="number" min="10" max="500" step="10" name="storage" data-error="{% trans 'Please enter a value greater than or equal to 10.' %}" required>
<input id="storageValue" class="input-price select-number" type="number" min="10" max="2000" step="10" name="storage" data-error="{% trans 'Please enter a value in range 10 - 2000.' %}" required>
<span>{% trans "GB Storage (SSD)" %}</span>
<i class="fa fa-plus-circle right" data-plus="storage" aria-hidden="true"></i>
</div>
@ -57,7 +57,7 @@
<div class="form-group">
<div class="description input justify-center">
<label for="name" class="control-label">{% trans "Name"%}</label>
<input type="text" name="name" class="form-control" placeholder="{% trans 'Your Name'%}" data-minlength="3" data-error="{% trans 'Please enter your name' %}" required>
<input type="text" name="name" class="form-control" placeholder="{% trans 'Your Name'%}" data-minlength="3" data-error="{% trans 'Please enter your name.' %}" required>
</div>
<div class="help-block with-errors">
{% for message in messages %}
@ -72,7 +72,7 @@
<div class="form-group">
<div class="description input justify-center">
<label for="email" class="control-label">{% trans "Email"%}</label>
<input name="email" type="email" pattern="^[^@\s]+@([^@\s]+\.)+[^@\s]+$" class="form-control" placeholder="{% trans 'Your Email' %}" data-error="{% trans 'Please enter a valid email address' %}" required>
<input name="email" type="email" pattern="^[^@\s]+@([^@\s]+\.)+[^@\s]+$" class="form-control" placeholder="{% trans 'Your Email' %}" data-error="{% trans 'Please enter a valid email address.' %}" required>
</div>
<div class="help-block with-errors">
{% for message in messages %}