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

Merge remote-tracking branch 'mainRepo/master' into task/3829/handle_landing_login_fail_in_same_page

Browse source
This commit is contained in:
M.Ravi 2017-10-10 19:22:37 +02:00
commit 1c67d66ff7
34 changed files with 1095 additions and 1612 deletions
Download patch file Download diff file Expand all files Collapse all files

2
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-10-03 18:13+0530\n"
"POT-Creation-Date: 2017-10-10 21:35+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"

223
datacenterlight/static/datacenterlight/css/glasfaser.css Normal file
View file

@ -0,0 +1,223 @@
.topnav img {
height: 100%;
}
.navbar-transparent #logoWhite {
width: 140px;
}
.navbar-default {
border-bottom: 1px solid #e7e7e7;
}
.navbar-default .navbar-nav>li>a {
text-transform: uppercase;
font-weight: 400;
letter-spacing: 1px;
color: #777;
}
.navbar-transparent .navbar-nav>li>a {
color: #fff;
}
.navbar-transparent .navbar-nav>li>a:hover,
.navbar-transparent .navbar-nav>li>a:focus,
.navbar-transparent .navbar-nav>li>a:focus:active {
color: #fed136;
}
@media (min-width: 768px) {
.navbar-transparent {
border-color: transparent;
}
.navbar-transparent {
background: rgba(0,0,0,0.05);
box-shadow: 0 0 55px rgba(0,0,0,0.09);
}
}
.intro-header {
background: url(../img/header-nico-sans.jpg) no-repeat center center;
background-size: cover;
background-position: left;
background-color: rgb(118, 140, 163);
background-attachment: fixed;
flex-direction: column;
align-items: flex-start;
justify-content: space-between;
padding-top: 70px;
}
.intro-header:before {
background: transparent;
background: rgba(0,0,0,0.2);
}
.price-tag-container {
flex-grow: 1;
display: flex;
flex-direction: column;
margin-right: 8%;
margin-left: 10px;
margin-bottom: 20px;
justify-content: center;
position: relative;
}
.price-tag {
background: url(../img/header-pricetag.png) no-repeat center center;
height: 225px;
width: 225px;
background-size: cover;
}
.high-speed {
width: 100%;
text-align: right;
margin-bottom: 25px;
position: relative;
}
.high-speed h1 {
font-size: 32px;
font-weight: 700;
font-family: 'Open Sans Condensed';
padding: 10px 15px 10px 0;
text-shadow: 0px 2px 2px rgba(0,0,0,0.52);
color: #fff;
}
.high-speed-border {
background: #fff;
height: 3px;
position: absolute;
right: 10px;
left: 20px;
}
.high-speed-border:first-of-type {
width: 40%;
left: initial;
}
.high-speed-border:before {
content: ' ';
display: inline-block;
height: 23px;
width: 23px;
border-radius: 100%;
background: #fff;
position: absolute;
left: -5px;
top: -10px;
}
.split-section .container {
max-width: 1120px;
}
.split-section.right .container {
max-width: 840px;
}
.split-section {
padding: 90px 0;
}
.split-section.right {
padding: 100px 0;
background: rgba(0,0,0,0.03);
}
.split-section.right .split-description {
width: 100%;
}
.split-section .split-text .split-title h2,
.split-section.left .split-text .split-title h2 {
font-size: 40px;
letter-spacing: 0.5px;
}
.split-section.left .split-text .split-title::before,
.split-section.right .split-text .split-title::before {
width: 90%;
max-width: 420px;
}
.team-member h4 {
font-family: 'Raleway', Montserrat,"Helvetica Neue",Helvetica,Arial,sans-serif;
font-weight: 700;
margin-bottom: 20px;
}
.timeline>li .timeline-panel {
display: flex;
min-height: 80px;
align-items: center;
padding-bottom: 15px;
}
.timeline>li.timeline-inverted>.timeline-panel {
padding-bottom: 0;
}
.contact-section h2,
.contact-section h3,
.contact-section p {
color: rgba(255,255,255,0.9);
text-transform: initial;
font-weight: 300;
font-family: 'Lato';
}
.contact-section p {
font-size: 20px;
}
footer {
padding: 20px;
}
@media(max-width: 767px) {
.split-section .split-text .split-title h2,
.split-section.left .split-text .split-title h2 {
font-size: 32px;
line-height: 40px;
}
}
@media(min-width: 768px) {
section {
padding: 90px 0;
}
}
@media (min-width: 768px) {
.intro-header {
align-items: flex-end;
}
.high-speed h1 {
font-size: 88px;
}
}
@media (min-width: 768px) and (max-width: 991px) {
.intro-header {
background-position: -100px;
background-size: auto 110%;
}
.price-tag {
height: 240px;
width: 240px;
}
.timeline>li .timeline-panel {
min-height: 100px;
}
}
@media (min-width: 992px) {
.price-tag {
min-height: 320px;
width: 320px;
}
.timeline>li .timeline-panel {
min-height: 170px;
}
}

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

@ -276,7 +276,7 @@ button, input, optgroup, select, textarea {
display: block;
} */
.intro-header {
height: 100vh;
min-height: 100vh;
text-align: center;
color: #fff;
background: url(../img/configure.jpg) no-repeat center center;
@ -715,9 +715,10 @@ button, input, optgroup, select, textarea {
font-size: 65px;
margin: 0;
position: relative;
/* color: #eee;
/* color: #eee;
padding-bottom: 25px;
text-align: right; */
/* color: #fff; */
}
.contact-form .form-group {

BIN
datacenterlight/static/datacenterlight/img/header-nico-sans-Recovered.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 98 KiB

BIN
datacenterlight/static/datacenterlight/img/header-nico-sans.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 98 KiB

BIN
datacenterlight/static/datacenterlight/img/header-pricetag.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 92 KiB

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

@ -18,7 +18,7 @@
<!-- Custom Fonts -->
<!--Import Google Icon Font-->
<link href="//fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link href="//fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link href="{% static 'datacenterlight/font-awesome/css/font-awesome.min.css' %}" rel="stylesheet" type="text/css">
<link href="//fonts.googleapis.com/css?family=Lato:300,400,700,300italic,400italic,700italic" rel="stylesheet" type="text/css">
<link rel="shortcut icon" href="{% static 'datacenterlight/img/favicon.ico' %}" type="image/x-icon" />
@ -26,6 +26,8 @@
<!-- Custom CSS -->
<link href="{% static 'datacenterlight/css/landing-page.css' %}" rel="stylesheet">
{% block css_extra %}
{% endblock css_extra %}
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
@ -42,7 +44,9 @@
<body>
<!-- Navigation -->
{% include "datacenterlight/includes/_navbar.html" %}
{% block navbar %}
{% include "datacenterlight/includes/_navbar.html" %}
{% endblock navbar %}
{% block content %}

14
datacenterlight/urls.py
View file

@ -1,9 +1,13 @@
from django.conf.urls import url
from .views import IndexView, BetaProgramView, LandingProgramView, \
BetaAccessView, SuccessView, \
PaymentOrderView, OrderConfirmationView, \
from .views import (
IndexView, BetaProgramView, LandingProgramView, BetaAccessView,
SuccessView, PaymentOrderView, OrderConfirmationView,
WhyDataCenterLightView, ContactUsView
)
from django.views.generic import TemplateView
urlpatterns = [
url(r'^$', IndexView.as_view(), name='index'),
@ -21,4 +25,8 @@ urlpatterns = [
url(r'^order-success/?$', SuccessView.as_view(), name='order_success'),
url(r'^beta_access?$', BetaAccessView.as_view(), name='beta_access'),
url(r'^contact/?$', ContactUsView.as_view(), name='contact_us'),
url(r'glasfaser/?$',
TemplateView.as_view(template_name='ungleich_page/glasfaser.html'),
name='glasfaser'),
]

4
datacenterlight/views.py
View file

@ -55,7 +55,9 @@ class ContactUsView(FormView):
sender=form.cleaned_data.get('email')
),
'from_email': settings.DCL_SUPPORT_FROM_ADDRESS,
'to': ['info@ungleich.ch'],
'to': '{}@ungleich.ch'.format(
self.request.POST.get('from_page', 'info')
),
'body': "\n".join(
["%s=%s" % (k, v) for (k, v) in form.cleaned_data.items()]),
'reply_to': [form.cleaned_data.get('email')],