From 290bfe272fd28e91466b7b6e97d7e6c86f9d1b20 Mon Sep 17 00:00:00 2001
From: Siarhei Puhach <siarhei.puhach@itechart-group.com>
Date: Thu, 13 Jul 2017 12:59:05 +0300
Subject: [PATCH 1/6] Changed field error messages, made fields wider
---
.../datacenterlight/css/landing-page.css | 23 +++++-----
.../static/datacenterlight/js/main.js | 46 +++++++++----------
.../datacenterlight/calculator_form.html | 6 +--
3 files changed, 38 insertions(+), 37 deletions(-)
diff --git a/datacenterlight/static/datacenterlight/css/landing-page.css b/datacenterlight/static/datacenterlight/css/landing-page.css
index 077faef7..177d8125 100755
--- a/datacenterlight/static/datacenterlight/css/landing-page.css
+++ b/datacenterlight/static/datacenterlight/css/landing-page.css
@@ -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: 85px;
+ margin-left: 0;
}
}
@@ -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;
}
diff --git a/datacenterlight/static/datacenterlight/js/main.js b/datacenterlight/static/datacenterlight/js/main.js
index bfe92631..be9f1103 100644
--- a/datacenterlight/static/datacenterlight/js/main.js
+++ b/datacenterlight/static/datacenterlight/js/main.js
@@ -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);
diff --git a/datacenterlight/templates/datacenterlight/calculator_form.html b/datacenterlight/templates/datacenterlight/calculator_form.html
index 65c19c9b..c247f36f 100644
--- a/datacenterlight/templates/datacenterlight/calculator_form.html
+++ b/datacenterlight/templates/datacenterlight/calculator_form.html
@@ -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>
From 2ad62daa10dfffa0d12b0e6dbd1edc9a501f7f25 Mon Sep 17 00:00:00 2001
From: Siarhei Puhach <srgpugach@gmail.com>
Date: Thu, 13 Jul 2017 14:53:43 +0300
Subject: [PATCH 2/6] Update landing-page.css
---
datacenterlight/static/datacenterlight/css/landing-page.css | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/datacenterlight/static/datacenterlight/css/landing-page.css b/datacenterlight/static/datacenterlight/css/landing-page.css
index 177d8125..bb8464de 100755
--- a/datacenterlight/static/datacenterlight/css/landing-page.css
+++ b/datacenterlight/static/datacenterlight/css/landing-page.css
@@ -1141,8 +1141,8 @@ line-height: 40px;
.price-calc-section .card .description .select-number{
font-size: 17px;
text-align: center;
- width: 85px;
- margin-left: 0;
+ width: 60px;
+ margin-right: 10px;
}
}
From d727e64b93bde2a74632b4c45aed863524a8bdc4 Mon Sep 17 00:00:00 2001
From: Siarhei Puhach <srgpugach@gmail.com>
Date: Thu, 13 Jul 2017 15:06:18 +0300
Subject: [PATCH 3/6] Update landing-page.css
---
datacenterlight/static/datacenterlight/css/landing-page.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/datacenterlight/static/datacenterlight/css/landing-page.css b/datacenterlight/static/datacenterlight/css/landing-page.css
index bb8464de..42b9ed70 100755
--- a/datacenterlight/static/datacenterlight/css/landing-page.css
+++ b/datacenterlight/static/datacenterlight/css/landing-page.css
@@ -1141,7 +1141,7 @@ line-height: 40px;
.price-calc-section .card .description .select-number{
font-size: 17px;
text-align: center;
- width: 60px;
+ width: 65px;
margin-right: 10px;
}
From b4e943849c20a57925bb4e41c88d498a735d9d30 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Thu, 13 Jul 2017 23:58:54 +0530
Subject: [PATCH 4/6] Added DE translations and periods for all validation
texts
---
.../locale/de/LC_MESSAGES/django.po | 28 +++++++++++++------
.../datacenterlight/calculator_form.html | 8 +++---
2 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.po b/datacenterlight/locale/de/LC_MESSAGES/django.po
index 7585c0cc..72b8ba89 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-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,7 +87,9 @@ msgid "Your Name"
msgstr "Dein Name"
#: templates/datacenterlight/calculator_form.html:60
-msgid "Please enter your name"
+#, fuzzy
+#| msgid "Please enter your name"
+msgid "Please enter your name."
msgstr "Bitte gib Deinen Namen ein"
#: templates/datacenterlight/calculator_form.html:74
@@ -99,7 +101,9 @@ msgid "Your Email"
msgstr "Deine E-Mail"
#: templates/datacenterlight/calculator_form.html:75
-msgid "Please enter a valid email address"
+#, fuzzy
+#| msgid "Please enter a valid email address"
+msgid "Please enter a valid email address."
msgstr "Bitte gib eine gültige E-Mailadresse ein"
#: templates/datacenterlight/calculator_form.html:88
@@ -501,6 +505,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"
diff --git a/datacenterlight/templates/datacenterlight/calculator_form.html b/datacenterlight/templates/datacenterlight/calculator_form.html
index c247f36f..09b59b6f 100644
--- a/datacenterlight/templates/datacenterlight/calculator_form.html
+++ b/datacenterlight/templates/datacenterlight/calculator_form.html
@@ -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="48" id="coreValue" name="cpu" data-error="{% trans 'Please enter a value in range 1 - 48' %}" 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 in range 2-200.' %}" 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>
@@ -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 %}
From 270354b22d430a60ebdcf30ec11ee5adf88a0c3a Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Fri, 14 Jul 2017 00:02:35 +0530
Subject: [PATCH 5/6] Removed some fuzzy translations
---
datacenterlight/locale/de/LC_MESSAGES/django.po | 4 ----
1 file changed, 4 deletions(-)
diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.po b/datacenterlight/locale/de/LC_MESSAGES/django.po
index 72b8ba89..4e80bb7a 100644
--- a/datacenterlight/locale/de/LC_MESSAGES/django.po
+++ b/datacenterlight/locale/de/LC_MESSAGES/django.po
@@ -87,8 +87,6 @@ msgid "Your Name"
msgstr "Dein Name"
#: templates/datacenterlight/calculator_form.html:60
-#, fuzzy
-#| msgid "Please enter your name"
msgid "Please enter your name."
msgstr "Bitte gib Deinen Namen ein"
@@ -101,8 +99,6 @@ msgid "Your Email"
msgstr "Deine E-Mail"
#: templates/datacenterlight/calculator_form.html:75
-#, fuzzy
-#| msgid "Please enter a valid email address"
msgid "Please enter a valid email address."
msgstr "Bitte gib eine gültige E-Mailadresse ein"
From c7a99b4ad219c770e88f60ca5fa6dd5d342d4d40 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Fri, 14 Jul 2017 00:04:20 +0530
Subject: [PATCH 6/6] Added periods to german validation texts
---
datacenterlight/locale/de/LC_MESSAGES/django.po | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.po b/datacenterlight/locale/de/LC_MESSAGES/django.po
index 4e80bb7a..5aa97bdd 100644
--- a/datacenterlight/locale/de/LC_MESSAGES/django.po
+++ b/datacenterlight/locale/de/LC_MESSAGES/django.po
@@ -88,7 +88,7 @@ msgstr "Dein Name"
#: templates/datacenterlight/calculator_form.html:60
msgid "Please enter your name."
-msgstr "Bitte gib Deinen Namen ein"
+msgstr "Bitte gib Deinen Namen ein."
#: templates/datacenterlight/calculator_form.html:74
msgid "Email"
@@ -100,7 +100,7 @@ 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"
+msgstr "Bitte gib eine gültige E-Mailadresse ein."
#: templates/datacenterlight/calculator_form.html:88
#: templates/datacenterlight/pricing.html:79