amal/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' into bugfix/#3553-2

Browse source
This commit is contained in:
Miguel Cardenas 2017-07-13 14:30:06 -05:00 committed by GitHub
commit 407b3f0a8c
4 changed files with 28 additions and 26 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 "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -62,16 +62,16 @@ msgid "Hosted in Switzerland"
msgstr "Standort: Schweiz" msgstr "Standort: Schweiz"
#: templates/datacenterlight/calculator_form.html:21 #: templates/datacenterlight/calculator_form.html:21
msgid "Please enter a value greater than or equal to 1." msgid "Please enter a value in range 1 - 48."
msgstr "Bitte gib einen Wert größer oder gleich 1 ein." msgstr "Bitte gib einen Wert von 1 bis 48 ein."
#: templates/datacenterlight/calculator_form.html:30 #: templates/datacenterlight/calculator_form.html:30
msgid "Please enter a value greater than or equal to 2." msgid "Please enter a value in range 2 - 200."
msgstr "Bitte gib einen Wert größer oder gleich 2 ein." msgstr "Bitte gib einen Wert von 2 bis 200 ein."
#: templates/datacenterlight/calculator_form.html:39 #: templates/datacenterlight/calculator_form.html:39
msgid "Please enter a value greater than or equal to 10." msgid "Please enter a value in range 10 - 2000."
msgstr "Bitte gib einen Wert größer oder gleich 10 ein" msgstr "Bitte gib einen Wert von 10 bis 200 ein."
#: templates/datacenterlight/calculator_form.html:40 #: templates/datacenterlight/calculator_form.html:40
#: templates/datacenterlight/pricing.html:50 #: templates/datacenterlight/pricing.html:50
@ -87,8 +87,8 @@ msgid "Your Name"
msgstr "Dein Name" msgstr "Dein Name"
#: templates/datacenterlight/calculator_form.html:60 #: templates/datacenterlight/calculator_form.html:60
msgid "Please enter your name" msgid "Please enter your name."
msgstr "Bitte gib Deinen Namen ein" msgstr "Bitte gib Deinen Namen ein."
#: templates/datacenterlight/calculator_form.html:74 #: templates/datacenterlight/calculator_form.html:74
msgid "Email" msgid "Email"
@ -99,8 +99,8 @@ msgid "Your Email"
msgstr "Deine E-Mail" msgstr "Deine E-Mail"
#: templates/datacenterlight/calculator_form.html:75 #: templates/datacenterlight/calculator_form.html:75
msgid "Please enter a valid email address" 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/calculator_form.html:88
#: templates/datacenterlight/pricing.html:79 #: templates/datacenterlight/pricing.html:79
@ -501,6 +501,12 @@ msgstr "ist kein gültiger Name"
msgid "is not a proper email" msgid "is not a proper email"
msgstr "ist keine gültige E-Mailadresse" 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" #~ msgid "Buy VM"
#~ msgstr "VM Kaufen" #~ msgstr "VM Kaufen"

6
datacenterlight/static/datacenterlight/css/landing-page.css
View file

@ -948,10 +948,10 @@ tech-sub-sec h2 {
text-align: left; text-align: left;
} }
.price-calc-section .card .description .select-number { .price-calc-section .card .description .select-number{
font-size: 20px; font-size: 20px;
text-align: center; text-align: center;
width: 60px; width: 85px;
} }
.price-calc-section .card .description i { .price-calc-section .card .description i {
@ -1088,7 +1088,7 @@ tech-sub-sec h2 {
} }
.logo-wrap-1 { .logo-wrap-1 {
width: 50%; width: 50%;
padding: 15px 30px !importantx; padding: 15px 30px !important;
min-height: 179px; min-height: 179px;
} }
.landscape-xs-6 { .landscape-xs-6 {

4
datacenterlight/static/datacenterlight/js/main.js
View file

@ -69,7 +69,6 @@
$(window).scroll(function () { $(window).scroll(function () {
_navScroll(); _navScroll();
}); });
} }
function _navScroll() { function _navScroll() {
@ -108,7 +107,6 @@
function verifiedUrl() { function verifiedUrl() {
if (window.location.href.indexOf('#success') > -1) { if (window.location.href.indexOf('#success') > -1) {
form_success(); form_success();
console.log('epa');
} }
} }
@ -162,6 +160,4 @@
$('#valueTotal').text(numbers * price * 31); $('#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="form-group">
<div class="description input"> <div class="description input">
<i class="fa fa-minus-circle left" data-minus="cpu" aria-hidden="true"></i> <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> <span> Core</span>
<i class="fa fa-plus-circle right" data-plus="cpu" aria-hidden="true"></i> <i class="fa fa-plus-circle right" data-plus="cpu" aria-hidden="true"></i>
</div> </div>
@ -27,7 +27,7 @@
<div class="form-group"> <div class="form-group">
<div class="description input"> <div class="description input">
<i class="fa fa-minus-circle left" data-minus="ram" aria-hidden="true"></i> <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> <span> GB RAM</span>
<i class="fa fa-plus-circle right" data-plus="ram" aria-hidden="true"></i> <i class="fa fa-plus-circle right" data-plus="ram" aria-hidden="true"></i>
</div> </div>
@ -36,7 +36,7 @@
<div class="form-group"> <div class="form-group">
<div class="description input"> <div class="description input">
<i class="fa fa-minus-circle left" data-minus="storage" aria-hidden="true"></i> <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> <span>{% trans "GB Storage (SSD)" %}</span>
<i class="fa fa-plus-circle right" data-plus="storage" aria-hidden="true"></i> <i class="fa fa-plus-circle right" data-plus="storage" aria-hidden="true"></i>
</div> </div>
@ -57,7 +57,7 @@
<div class="form-group"> <div class="form-group">
<div class="description input justify-center"> <div class="description input justify-center">
<label for="name" class="control-label">{% trans "Name"%}</label> <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>
<div class="help-block with-errors"> <div class="help-block with-errors">
{% for message in messages %} {% for message in messages %}
@ -72,7 +72,7 @@
<div class="form-group"> <div class="form-group">
<div class="description input justify-center"> <div class="description input justify-center">
<label for="email" class="control-label">{% trans "Email"%}</label> <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>
<div class="help-block with-errors"> <div class="help-block with-errors">
{% for message in messages %} {% for message in messages %}