+
\ No newline at end of file
diff --git a/ungleich_page/templates/ungleich_page/includes/_services.html b/ungleich_page/templates/ungleich_page/includes/_services.html
index 928a0132..1d35528a 100644
--- a/ungleich_page/templates/ungleich_page/includes/_services.html
+++ b/ungleich_page/templates/ungleich_page/includes/_services.html
@@ -6,8 +6,8 @@
{% trans "our services" %}
-
{% trans "We support our clients in all areas of Unix infrastructure.
- Our top notch configuration management is refreshingly simple and reliable." %}
+
We support our clients in all areas of Unix infrastructure.
+ Our top notch configuration management is refreshingly simple and reliable."
@@ -44,4 +44,4 @@
-
\ No newline at end of file
+
diff --git a/ungleich_page/templates/ungleich_page/landing.html b/ungleich_page/templates/ungleich_page/landing.html
index d6444ec2..59bb8fd3 100644
--- a/ungleich_page/templates/ungleich_page/landing.html
+++ b/ungleich_page/templates/ungleich_page/landing.html
@@ -2,7 +2,7 @@
{% load bootstrap3 %}
-
+
@@ -14,12 +14,12 @@
-
-
+
+
-
+
@@ -28,130 +28,147 @@
-
-
-
+
-
+
-
+
+
-
+
-
-
+
+
+{% include "ungleich_page/includes/_header.html" %}
-
- {% include "ungleich_page/includes/_services.html" %}
+
+{% include "ungleich_page/includes/_services.html" %}
-
- {% include "ungleich_page/includes/_portfolio.html" %}
+
+{% include "ungleich_page/includes/_portfolio.html" %}
-
- {% include "ungleich_page/includes/_about.html" %}$
+
+{% include "ungleich_page/includes/_about.html" %}$
-
- {% include "ungleich_page/includes/_team.html" %}
+
+{% include "ungleich_page/includes/_team.html" %}
-
- {% include "ungleich_page/includes/_softwares.html" %}
+
+{% include "ungleich_page/includes/_softwares.html" %}
-
- {% include "ungleich_page/includes/_contact_us.html" %}
+
+{% include "ungleich_page/includes/_contact_us.html" %}
-
- {% include "ungleich_page/includes/_footer.html" %}
+
+{% include "ungleich_page/includes/_footer.html" %}
-
-
+
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
+
-
+
-
+
-
@@ -161,11 +178,13 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/ungleich_page/views.py b/ungleich_page/views.py
index e5a99d8d..eddb3a81 100644
--- a/ungleich_page/views.py
+++ b/ungleich_page/views.py
@@ -2,9 +2,10 @@ from django.contrib import messages
from django.views.generic.edit import FormView
from django.utils.translation import ugettext_lazy as _
-from django.core.urlresolvers import reverse_lazy
+from django.core.urlresolvers import reverse_lazy,reverse
from django.views.generic import View
-from django.shortcuts import render
+from django.shortcuts import render,redirect,render_to_response
+from django.http import HttpResponseRedirect
from utils.forms import ContactUsForm
diff --git a/utils/mailer.py b/utils/mailer.py
new file mode 100644
index 00000000..a12ffba6
--- /dev/null
+++ b/utils/mailer.py
@@ -0,0 +1,52 @@
+import six
+from django.core.mail import send_mail
+
+from django.conf import settings
+
+
+class BaseMailer(object):
+ def __init__(self):
+ self._slug = None
+ self.no_replay_mail = 'no-replay@ungleich.ch'
+
+ if not hasattr(self, '_to'):
+ self._to = None
+
+ @property
+ def slug(self):
+ return self._slug
+
+ @slug.setter
+ def slug(self, val):
+ assert isinstance(val, six.string_types), "slug is not string: %r" % val
+ self._slug = val
+
+ @property
+ def registration(self):
+ return self.message
+
+ @registration.setter
+ def registration(self, val):
+ msg = "registration is not dict with fields subject,message"
+ assert type(val) is dict, msg
+ assert val.get('subject') and val.get('message'), msg
+ self._message, self._subject, self._from = (
+ val.get('message'), val.get('subject'), val.get('from'))
+ assert isinstance(self.slug, six.string_types), 'slug not set'
+
+ def send_mail(self, to=None):
+ if not to:
+ to = self._to
+ if not self.message:
+ raise NotImplementedError
+ send_mail(self._subject, self._message, self.no_replay_mail, [to])
+
+
+class DigitalGlarusRegistrationMailer(BaseMailer):
+ message = settings.REGISTRATION_MESSAGE
+
+ def __init__(self, slug):
+ self.slug = slug
+ self.registration = self.message
+ self._message = self._message.format(slug=self._slug)
+ super().__init__()
diff --git a/utils/stripe_utils.py b/utils/stripe_utils.py
index ce14d417..fb0a328e 100644
--- a/utils/stripe_utils.py
+++ b/utils/stripe_utils.py
@@ -1,6 +1,5 @@
import stripe
from django.conf import settings
-
stripe.api_key = settings.STRIPE_API_PRIVATE_KEY
@@ -122,3 +121,6 @@ class StripeUtils(object):
name=name,
currency=self.CURRENCY,
id=id)
+
+
+