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

conflicts resolved

Browse source
This commit is contained in:
Arvind Tiwari 2017-10-13 02:08:28 +05:30
commit 606a687bc7
34 changed files with 1391 additions and 1661 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-07 14:39+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"

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

@ -280,7 +280,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;
@ -719,9 +719,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 {

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'),
]

6
datacenterlight/views.py
View file

@ -49,13 +49,17 @@ class ContactUsView(FormView):
def form_valid(self, form):
form.save()
from_emails = {
'glasfaser': 'glasfaser@ungleich.ch'
}
from_page = self.request.POST.get('from_page')
email_data = {
'subject': "{dcl_text} Message from {sender}".format(
dcl_text=settings.DCL_TEXT,
sender=form.cleaned_data.get('email')
),
'from_email': settings.DCL_SUPPORT_FROM_ADDRESS,
'to': ['info@ungleich.ch'],
'to': [from_emails.get(from_page, 'info@ungleich.ch')],
'body': "\n".join(
["%s=%s" % (k, v) for (k, v) in form.cleaned_data.items()]),
'reply_to': [form.cleaned_data.get('email')],