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:
Polycarp Okock 2017-07-20 23:30:04 +03:00 • committed by GitHub
commit 032059c965
27 changed files with 1162 additions and 712 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5,8 +5,8 @@
*/
@font-face {
font-family: 'Lato-Regular';
src: url('../fonts/Lato/Lato-Regular.ttf');
font-family: 'Lato-Light';
src: url('../fonts/Lato/Lato-Light.ttf');
}
body,
@ -22,7 +22,7 @@ h3,
h4,
h5,
h6 {
font-family: 'Lato', sans-serif;
font-family: 'Lato-Light', sans-serif;
font-weight: 300;
}
@ -137,13 +137,13 @@ h6 {
.navbar-default .navbar-nav>li>a {
cursor: pointer;
font-family: 'Lato-Regular', sans-serif;
font-family: 'Lato-Light', sans-serif;
}
.navbar-transparent .navbar-nav>li>a {
color: #fff;
cursor: pointer;
font-family: 'Lato-Regular', sans-serif;
font-family: 'Lato-Light', sans-serif;
}
.navbar-transparent .navbar-nav>li>a:hover {
@ -188,7 +188,7 @@ h6 {
.navbar-transparent .nav-language .select-language {
color: #fff;
font-family: 'Lato-Regular', sans-serif;
font-family: 'Lato-Light', sans-serif;
}
.nav-language .select-language span {
@ -214,7 +214,7 @@ h6 {
text-align: center;
border-radius: 4px;
}
.nav-language .drop-language a {
cursor: pointer;
font-family: 'Lato-Regular', sans-serif;
@ -227,7 +227,7 @@ h6 {
.navbar-transparent .nav-language .drop-language a {
color: #fff;
font-family: 'Lato-Regular', sans-serif;
font-family: 'Lato-Light', sans-serif;
}
.nav-language:hover .drop-language {
@ -253,7 +253,7 @@ h6 {
bottom: 0;
left: 0;
right: 0;
background: rgba(90, 116, 175, 0.7);
background: rgba(38, 59, 107, 0.7);
}
.intro-header-1 {
@ -381,9 +381,15 @@ h6 {
.split-section .split-text .lead {
font-size: 21px;
color: #3a3a3a;
font-weight: 300 !important;
}
.split-section .split-text .split-title {
.new-lead {
font-weight: 300 !important;
font-size: 21px !important;
}
.split-section .split-text .split-title{
position: relative;
margin-bottom: 25px;
}
@ -833,7 +839,7 @@ tech-sub-sec h2 {
.dropdown-menu>li>a {
font-size: 13px;
font-weight: 300;
font-family: 'Lato-Regular', sans-serif;
font-family: 'Lato-Light', sans-serif;
}
.navbar-default .navbar-nav>.active>a,

1
datacenterlight/templates/datacenterlight/includes/_navbar.html
View file

@ -48,6 +48,7 @@
{% endif %}
<i class="fa fa-globe" aria-hidden="true"></i>
</div>
<div class="drop-language">
{% if LANGUAGE_CODE == 'en-us'%}
<a class="url" href="{% change_lang 'de' %}">Deutsch</a>

2
datacenterlight/templates/datacenterlight/index.html
View file

@ -130,7 +130,7 @@
<div class="row text-center">
<div class="col-xs-12 col-md-6 text">
<h2 class="section-heading">{% trans "Simple and affordable: Try our virtual machine with featherlight price." %}</h2>
<p class="lead">{% trans "Affordable VM hosting based in Switzerland" %}</p>
<p class="lead new-lead">{% trans "Affordable VM hosting based in Switzerland" %}</p>
</div>
<div class="col-xs-12 col-md-6 hero-feature">

21
datacenterlight/templates/datacenterlight/order_detail.html
View file

@ -25,21 +25,20 @@
</div>
<hr>
<div class="row">
<div class="col-xs-6">
<address>
<h3><b>{% trans "Billed To:"%}</b></h3>
{% with request.session.billing_address_data as billing_address %}
{{request.session.user.name}}<br> {{billing_address|get_value_from_dict:'street_address'}}, {{billing_address|get_value_from_dict:'postal_code'}}<br>
{{billing_address|get_value_from_dict:'city'}}, {{billing_address|get_value_from_dict:'country'}}.
{% endwith %}
</address>
</div>
<div class="col-xs-6 text-right">
<div class="col-xs-12 col-sm-6 pull-right order-confirm-date">
<address>
<strong>{% trans "Date"%}:</strong><br>
<span id="order-created_at">{% now "Y-m-d H:i" %}</span><br><br>
</address>
</div>
<div class="col-xs-12 col-sm-6">
<address>
<h3><b>{% trans "Billed To:"%}</b></h3>
{% with request.session.billing_address_data as billing_address %}
{{billing_address|get_value_from_dict:'cardholder_name'}}<br> {{billing_address|get_value_from_dict:'street_address'}}, {{billing_address|get_value_from_dict:'postal_code'}}<br>
{{billing_address|get_value_from_dict:'city'}}, {{billing_address|get_value_from_dict:'country'}}.
{% endwith %}
</address>
</div>
</div>
<div class="row">

8
datacenterlight/templates/datacenterlight/whydatacenterlight.html
View file

@ -88,7 +88,7 @@
<div class="col-xs-12 col-sm-8 col-md-7 text-right">
<div class="tech-sub-sec">
<h2>{% trans "We believe in giving back to the FOSS community." %}</h2>
<p class="lead">{% blocktrans %}Data Center Light is the child of free and open source software (FOSS) movement. <br>We grew up with it, live by it, and believe in it.<br> The more we work on our data center,<br> the more we contribute back to the FOSS community.{% endblocktrans %}</p>
<p class="lead new-lead">{% blocktrans %}Data Center Light is the child of free and open source software (FOSS) movement. <br>We grew up with it, live by it, and believe in it.<br> The more we work on our data center,<br> the more we contribute back to the FOSS community.{% endblocktrans %}</p>
</div>
</div>
</div>
@ -104,7 +104,7 @@
<h2>{% trans "We bring the future to you." %}</h2>
</div>
<div class="col-xs-12 col-sm-7 col-md-8 col-lg-8 text-left tech-sub-sec landscape-xs-6">
<p class="lead">{% blocktrans %} Data Center Light uses the most modern technologies out there.<br>
<p class="lead new-lead">{% blocktrans %} Data Center Light uses the most modern technologies out there.<br>
Your VM needs only IPv6. Data Center Light provides<br> transparent two-way IPv6/IPv4 translation.
{% endblocktrans %}</p>
</div>
@ -119,7 +119,7 @@
</div>
<div class="col-xs-12 col-sm-5 col-md-4 col-lg-4 text-right tech-sub-sec padding-vertical landscape-xs-4">
<div>
<p class="lead">{% blocktrans %} No more spinning metal plates! Data Center Light uses only SSDs. We keep things faster and lighter. {% endblocktrans %}</p>
<p class="lead new-lead">{% blocktrans %} No more spinning metal plates! Data Center Light uses only SSDs. We keep things faster and lighter. {% endblocktrans %}</p>
</div>
</div>
</div>
@ -136,7 +136,7 @@
<div class="row text-center">
<div class="col-xs-12 col-md-6 text">
<h2 class="section-heading">{% trans "Starting from only 15CHF per month. Try now." %}</h2>
<p class="lead">{% trans "Actions speak louder than words. Let's do it, try our VM now." %}</p>
<p class="lead new-lead">{% trans "Actions speak louder than words. Let's do it, try our VM now." %}</p>
</div>
<div class="col-xs-12 col-md-6 hero-feature">

1
datacenterlight/views.py
View file

@ -343,6 +343,7 @@ class PaymentOrderView(FormView):
if billing_address_data:
form_kwargs.update({
'initial': {
'cardholder_name': billing_address_data['cardholder_name'],
'street_address': billing_address_data['street_address'],
'city': billing_address_data['city'],
'postal_code': billing_address_data['postal_code'],