diff --git a/hosting/test_forms.py b/hosting/test_forms.py
new file mode 100644
index 00000000..e0f5df30
--- /dev/null
+++ b/hosting/test_forms.py
@@ -0,0 +1,116 @@
+from django.test import TestCase
+
+from unittest import mock
+from model_mommy import mommy
+
+from .forms import HostingOrderAdminForm, HostingUserLoginForm, HostingUserSignupForm
+from .models import VirtualMachinePlan
+
+
+class HostingUserLoginFormTest(TestCase):
+
+ def setUp(self):
+ password = 'user_password'
+ self.user = mommy.make('CustomUser')
+
+ self.user.set_password(password)
+ self.user.save()
+ self.completed_data = {
+ 'email': self.user.email,
+ 'password': password
+ }
+
+ self.incorrect_data = {
+ 'email': 'test',
+ }
+
+ def test_valid_form(self):
+ form = HostingUserLoginForm(data=self.completed_data)
+ self.assertTrue(form.is_valid())
+
+ def test_invalid_form(self):
+ form = HostingUserLoginForm(data=self.incorrect_data)
+ self.assertFalse(form.is_valid())
+
+
+class HostingUserSignupFormTest(TestCase):
+
+ def setUp(self):
+
+ self.completed_data = {
+ 'name': 'test name',
+ 'email': 'test@ungleich.com',
+ 'password': 'test_password',
+ 'confirm_password': 'test_password'
+ }
+
+ self.incorrect_data = {
+ 'email': 'test',
+ }
+
+ def test_valid_form(self):
+ form = HostingUserSignupForm(data=self.completed_data)
+ self.assertTrue(form.is_valid())
+
+ def test_invalid_form(self):
+ form = HostingUserSignupForm(data=self.incorrect_data)
+ self.assertFalse(form.is_valid())
+
+
+class HostingOrderAdminFormTest(TestCase):
+
+ def setUp(self):
+
+ self.customer = mommy.make('StripeCustomer')
+ self.vm_plan = mommy.make('VirtualMachinePlan')
+ self.vm_canceled_plan = mommy.make('VirtualMachinePlan',
+ status=VirtualMachinePlan.CANCELED_STATUS)
+
+ self.mocked_charge = {
+ 'amount': 5100,
+ 'amount_refunded': 0,
+ 'balance_transaction': 'txn_18U99zGjsLAXdRPzUJKkBx3Q',
+ 'captured': True,
+ 'created': 1467785123,
+ 'currency': 'chf',
+ 'customer': 'cus_8V61MvJvMd0PhM',
+ 'status': 'succeeded'
+ }
+
+ self.completed_data = {
+ 'customer': self.customer.id,
+ 'vm_plan': self.vm_plan.id,
+ }
+
+ self.incompleted_data = {
+ 'vm_plan': self.vm_plan.id,
+ 'customer': None
+ }
+
+ @mock.patch('utils.stripe_utils.StripeUtils.make_charge')
+ def test_valid_form(self, stripe_mocked_call):
+ stripe_mocked_call.return_value = {
+ 'paid': True,
+ 'response_object': self.mocked_charge,
+ 'error': None
+ }
+ form = HostingOrderAdminForm(data=self.completed_data)
+ self.assertTrue(form.is_valid())
+
+ @mock.patch('utils.stripe_utils.StripeUtils.make_charge')
+ def test_invalid_form_canceled_vm(self, stripe_mocked_call):
+
+ self.completed_data.update({
+ 'vm_plan': self.vm_canceled_plan.id
+ })
+ stripe_mocked_call.return_value = {
+ 'paid': True,
+ 'response_object': self.mocked_charge,
+ 'error': None
+ }
+ form = HostingOrderAdminForm(data=self.completed_data)
+ self.assertFalse(form.is_valid())
+
+ def test_invalid_form(self):
+ form = HostingOrderAdminForm(data=self.incompleted_data)
+ self.assertFalse(form.is_valid())
diff --git a/hosting/test_views.py b/hosting/test_views.py
index b2deb6d7..5e43db88 100644
--- a/hosting/test_views.py
+++ b/hosting/test_views.py
@@ -3,15 +3,21 @@ from django.conf import settings
from django.test import TestCase, RequestFactory
from django.core.urlresolvers import reverse
from django.core.urlresolvers import resolve
+from django.contrib.auth.tokens import default_token_generator
+from django.utils.http import urlsafe_base64_encode, urlsafe_base64_decode
+from django.utils.encoding import force_bytes
+
from model_mommy import mommy
+from stored_messages.models import Inbox
from membership.models import CustomUser, StripeCustomer
from .models import VirtualMachineType, HostingOrder, VirtualMachinePlan
from .views import DjangoHostingView, RailsHostingView, NodeJSHostingView, LoginView, SignupView, \
PaymentVMView, OrdersHostingDetailView, OrdersHostingListView, VirtualMachineView, \
- VirtualMachinesPlanListView
+ VirtualMachinesPlanListView, PasswordResetView, PasswordResetConfirmView, HostingPricingView, \
+ NotificationsView, MarkAsReadNotificationView, GenerateVMSSHKeysView
from utils.tests import BaseTestCase
@@ -40,9 +46,12 @@ class DjangoHostingViewTest(TestCase, ProcessVMSelectionTestMixin):
self.url = reverse('django.hosting')
self.view = DjangoHostingView()
self.expected_template = 'hosting/django.html'
+ HOSTING = 'django'
+ configuration_detail = dict(VirtualMachinePlan.VM_CONFIGURATION).get(HOSTING)
self.expected_context = {
- 'hosting': "django",
+ 'hosting': HOSTING,
'hosting_long': "Django",
+ 'configuration_detail': configuration_detail,
'domain': "django-hosting.ch",
'google_analytics': "UA-62285904-6",
'email': "info@django-hosting.ch",
@@ -56,9 +65,12 @@ class RailsHostingViewTest(TestCase, ProcessVMSelectionTestMixin):
self.url = reverse('rails.hosting')
self.view = RailsHostingView()
self.expected_template = 'hosting/rails.html'
+ HOSTING = 'rails'
+ configuration_detail = dict(VirtualMachinePlan.VM_CONFIGURATION).get(HOSTING)
self.expected_context = {
- 'hosting': "rails",
+ 'hosting': HOSTING,
'hosting_long': "Ruby On Rails",
+ 'configuration_detail': configuration_detail,
'domain': "rails-hosting.ch",
'google_analytics': "UA-62285904-5",
'email': "info@rails-hosting.ch",
@@ -72,9 +84,12 @@ class NodeJSHostingViewTest(TestCase, ProcessVMSelectionTestMixin):
self.url = reverse('node.hosting')
self.view = NodeJSHostingView()
self.expected_template = 'hosting/nodejs.html'
+ HOSTING = 'nodejs'
+ configuration_detail = dict(VirtualMachinePlan.VM_CONFIGURATION).get(HOSTING)
self.expected_context = {
- 'hosting': "nodejs",
+ 'hosting': HOSTING,
'hosting_long': "NodeJS",
+ 'configuration_detail': configuration_detail,
'domain': "node-hosting.ch",
'google_analytics': "UA-62285904-7",
'email': "info@node-hosting.ch",
@@ -82,6 +97,36 @@ class NodeJSHostingViewTest(TestCase, ProcessVMSelectionTestMixin):
}
+class HostingPricingViewTest(TestCase):
+
+ def setUp(self):
+ self.url = reverse('hosting:pricing')
+ self.view = HostingPricingView()
+ self.expected_template = 'hosting/hosting_pricing.html'
+
+ configuration_options = dict(VirtualMachinePlan.VM_CONFIGURATION)
+ self.expected_context = {
+ 'configuration_options': configuration_options,
+ 'email': "info@django-hosting.ch",
+ 'vm_types': VirtualMachineType.get_serialized_vm_types(),
+ }
+
+ def url_resolve_to_view_correctly(self):
+ found = resolve(self.url)
+ self.assertEqual(found.func.__name__, self.view.__name__)
+
+ def get(self):
+ response = self.client.get(self.url)
+ self.assertEqual(response.status_code, 200)
+ self.assertEqual(self.view.get_context_data(), self.expected_context)
+ self.assertTemplateUsed(response, self.expected_template)
+
+ def test_anonymous_post(self):
+ response = self.client.post(self.url)
+ self.assertRedirects(response, expected_url=reverse('hosting:login'),
+ status_code=302, target_status_code=200)
+
+
class PaymentVMViewTest(BaseTestCase):
def setUp(self):
@@ -115,6 +160,7 @@ class PaymentVMViewTest(BaseTestCase):
'memory': 10,
'disk_size': 10000,
'price': 22000,
+ 'configuration': dict(VirtualMachinePlan.VM_CONFIGURATION).get('django')
}
}
@@ -153,7 +199,8 @@ class PaymentVMViewTest(BaseTestCase):
'memory': hosting_order.vm_plan.memory,
'disk_size': hosting_order.vm_plan.disk_size,
'price': hosting_order.vm_plan.price,
- 'hosting_company': hosting_order.vm_plan.vm_type.hosting_company
+ 'hosting_company': hosting_order.vm_plan.vm_type.hosting_company,
+ 'configuration': hosting_order.vm_plan.configuration
}
self.assertEqual(vm_plan, self.session_data.get('vm_specs'))
@@ -172,6 +219,107 @@ class PaymentVMViewTest(BaseTestCase):
settings.STRIPE_API_PUBLIC_KEY)
+class NotificationsViewTest(BaseTestCase):
+
+ def setUp(self):
+ super(NotificationsViewTest, self).setUp()
+
+ self.view = NotificationsView
+ self.url = reverse('hosting:notifications')
+ self.expected_template = 'hosting/notifications.html'
+
+ self.inboxes = mommy.make(Inbox, user=self.customer, _quantity=2)
+ self.messages = list(map(lambda x: x.message, self.inboxes))
+
+ def test_url_resolve_to_view_correctly(self):
+ found = resolve(self.url)
+ self.assertEqual(found.func.__name__, self.view.__name__)
+
+ def test_get(self):
+
+ # Anonymous user should get redirect to login
+ response = self.client.get(self.url)
+ expected_url = "%s?next=%s" % (reverse('hosting:login'), reverse('hosting:notifications'))
+ self.assertRedirects(response, expected_url=expected_url,
+ status_code=302, target_status_code=200)
+
+ # Logged user should get the page
+ response = self.customer_client.get(self.url, follow=True)
+ self.assertEqual(response.status_code, 200)
+ self.assertEqual(response.context['all_notifications'], self.messages)
+ self.assertTemplateUsed(response, self.expected_template)
+
+
+class MarkAsReadNotificationViewTest(BaseTestCase):
+
+ def setUp(self):
+ super(MarkAsReadNotificationViewTest, self).setUp()
+
+ self.view = MarkAsReadNotificationView
+ self.url = reverse('hosting:notifications')
+ self.expected_template = 'hosting/notifications.html'
+
+ self.inbox = mommy.make(Inbox, user=self.customer)
+ self.message = self.inbox.message
+
+ self.url = reverse('hosting:read_notification', kwargs={'pk': self.message.id})
+
+ def test_url_resolve_to_view_correctly(self):
+ found = resolve(self.url)
+ self.assertEqual(found.func.__name__, self.view.__name__)
+
+ def test_post(self):
+
+ # Anonymous user should get redirect to login
+ response = self.client.get(self.url)
+ expected_url = "%s?next=%s" % (reverse('hosting:login'),
+ reverse('hosting:read_notification',
+ kwargs={'pk': self.message.id}))
+ self.assertRedirects(response, expected_url=expected_url,
+ status_code=302, target_status_code=200)
+
+ # Logged user should mark a message as read
+ response = self.customer_client.post(self.url, follow=True)
+ self.assertEqual(response.status_code, 200)
+ self.assertFalse(Inbox.objects.filter(user=self.customer).exists())
+ self.assertTemplateUsed(response, self.expected_template)
+
+
+class GenerateVMSSHKeysViewTest(BaseTestCase):
+
+ def setUp(self):
+ super(GenerateVMSSHKeysViewTest, self).setUp()
+
+ self.view = GenerateVMSSHKeysView
+ self.vm = mommy.make(VirtualMachinePlan)
+ self.expected_template = 'hosting/virtual_machine_key.html'
+ self.url = reverse('hosting:virtual_machine_key', kwargs={'pk': self.vm.id})
+
+ def test_url_resolve_to_view_correctly(self):
+ found = resolve(self.url)
+ self.assertEqual(found.func.__name__, self.view.__name__)
+
+ def test_get(self):
+
+ # Anonymous user should get redirect to login
+ response = self.client.get(self.url)
+ expected_url = "%s?next=%s" % (reverse('hosting:login'),
+ reverse('hosting:virtual_machine_key',
+ kwargs={'pk': self.vm.id}))
+ self.assertRedirects(response, expected_url=expected_url,
+ status_code=302, target_status_code=200)
+
+ # Logged user should get the page
+ response = self.customer_client.get(self.url, follow=True)
+ self.assertEqual(response.status_code, 200)
+ updated_vm = VirtualMachinePlan.objects.get(id=self.vm.id)
+ self.assertEqual(response.context['public_key'].decode("utf-8"), updated_vm.public_key)
+ self.assertTrue(response.context['private_key'] is not None)
+ self.assertEqual(len(response.context['public_key']), 380)
+ self.assertTrue(len(response.context['private_key']) is 1678 or 1674)
+ self.assertTemplateUsed(response, self.expected_template)
+
+
class VirtualMachineViewTest(BaseTestCase):
def setUp(self):
@@ -357,3 +505,78 @@ class SignupViewTest(TestCase):
self.user = CustomUser.objects.get(email=self.signup_data.get('email'))
self.assertEqual(response.context['user'], self.user)
self.assertEqual(response.status_code, 200)
+
+
+class PasswordResetViewTest(BaseTestCase):
+
+ def setUp(self):
+ super(PasswordResetViewTest, self).setUp()
+
+ self.url = reverse('hosting:reset_password')
+ self.view = PasswordResetView
+ self.expected_template = 'hosting/reset_password.html'
+ self.user = mommy.make('membership.CustomUser')
+ self.password = 'fake_password'
+ self.user.set_password(self.password)
+ self.user.save()
+
+ self.post_data = {
+ 'email': self.user.email
+ }
+
+ def test_url_resolve_to_view_correctly(self):
+ found = resolve(self.url)
+ self.assertEqual(found.func.__name__, self.view.__name__)
+
+ def test_get(self):
+ response = self.client.get(self.url)
+ self.assertEqual(response.status_code, 200)
+ self.assertTemplateUsed(response, self.expected_template)
+
+ def test_post(self):
+ response = self.client.post(self.url, data=self.post_data, follow=True)
+ self.assertEqual(response.status_code, 200)
+
+ def test_test_generate_email_context(self):
+ context = self.setup_view(self.view()).\
+ test_generate_email_context(self.user)
+ self.assertEqual(context.get('user'), self.user)
+ self.assertEqual(context.get('site_name'), 'ungleich')
+ self.assertEqual(len(context.get('token')), 24)
+
+
+class PasswordResetConfirmViewTest(BaseTestCase):
+
+ def setUp(self):
+ super(PasswordResetConfirmViewTest, self).setUp()
+
+ self.view = PasswordResetConfirmView
+ self.expected_template = 'hosting/confirm_reset_password.html'
+ self.user = mommy.make('membership.CustomUser')
+ self.password = 'fake_password'
+ self.user.set_password(self.password)
+ self.user.save()
+
+ self.token = default_token_generator.make_token(self.user)
+ self.uid = urlsafe_base64_encode(force_bytes(self.user.pk))
+ self.url = reverse('hosting:reset_password_confirm',
+ kwargs={'token': self.token, 'uidb64': self.uid})
+
+ self.post_data = {
+ 'new_password1': 'new_password',
+ 'new_password2': 'new_password'
+ }
+
+ def test_url_resolve_to_view_correctly(self):
+ found = resolve(self.url)
+ self.assertEqual(found.func.__name__, self.view.__name__)
+
+ def test_get(self):
+ response = self.client.get(self.url)
+ self.assertEqual(response.status_code, 200)
+ self.assertTemplateUsed(response, self.expected_template)
+
+ def test_post(self):
+ response = self.client.post(self.url, data=self.post_data, follow=True)
+ self.assertEqual(response.status_code, 200)
+ self.assertTrue(not response.context['form'].errors)
diff --git a/hosting/urls.py b/hosting/urls.py
index 225dd19e..5ceeba97 100644
--- a/hosting/urls.py
+++ b/hosting/urls.py
@@ -4,13 +4,14 @@ from .views import DjangoHostingView, RailsHostingView, PaymentVMView,\
NodeJSHostingView, LoginView, SignupView, IndexView, \
OrdersHostingListView, OrdersHostingDetailView, VirtualMachinesPlanListView,\
VirtualMachineView, GenerateVMSSHKeysView, OrdersHostingDeleteView, NotificationsView, \
- MarkAsReadNotificationView, PasswordResetView, PasswordResetConfirmView
+ MarkAsReadNotificationView, PasswordResetView, PasswordResetConfirmView, HostingPricingView
urlpatterns = [
url(r'index/?$', IndexView.as_view(), name='index'),
url(r'django/?$', DjangoHostingView.as_view(), name='djangohosting'),
url(r'nodejs/?$', NodeJSHostingView.as_view(), name='nodejshosting'),
url(r'rails/?$', RailsHostingView.as_view(), name='railshosting'),
+ url(r'pricing/?$', HostingPricingView.as_view(), name='pricing'),
url(r'payment/?$', PaymentVMView.as_view(), name='payment'),
url(r'orders/?$', OrdersHostingListView.as_view(), name='orders'),
url(r'orders/(?P\d+)/?$', OrdersHostingDetailView.as_view(), name='orders'),
diff --git a/hosting/views.py b/hosting/views.py
index 09f94ac9..18d8819e 100644
--- a/hosting/views.py
+++ b/hosting/views.py
@@ -99,6 +99,26 @@ class NodeJSHostingView(ProcessVMSelectionMixin, View):
return render(request, self.template_name, context)
+class HostingPricingView(ProcessVMSelectionMixin, View):
+ template_name = "hosting/hosting_pricing.html"
+
+ def get_context_data(self, **kwargs):
+ configuration_options = dict(VirtualMachinePlan.VM_CONFIGURATION)
+ context = {
+ 'configuration_options': configuration_options,
+ 'email': "info@django-hosting.ch",
+ 'vm_types': VirtualMachineType.get_serialized_vm_types(),
+ }
+
+ return context
+
+ def get(self, request, *args, **kwargs):
+ request.session['hosting_url'] = reverse('hosting:djangohosting')
+ context = self.get_context_data()
+
+ return render(request, self.template_name, context)
+
+
class IndexView(View):
template_name = "hosting/index.html"
@@ -175,13 +195,7 @@ class PasswordResetView(FormView):
success_url = reverse_lazy('hosting:login')
# form_valid_message = 'Thank you for registering'
- def form_valid(self, form):
-
- email = form.cleaned_data.get('email')
- user = CustomUser.objects.get(email=email)
-
- messages.add_message(self.request, messages.SUCCESS, self.success_message)
-
+ def test_generate_email_context(self, user):
context = {
'user': user,
'token': default_token_generator.make_token(user),
@@ -190,6 +204,16 @@ class PasswordResetView(FormView):
'base_url': "{0}://{1}".format(self.request.scheme, self.request.get_host())
}
+ return context
+
+ def form_valid(self, form):
+
+ email = form.cleaned_data.get('email')
+ user = CustomUser.objects.get(email=email)
+
+ messages.add_message(self.request, messages.SUCCESS, self.success_message)
+
+ context = self.test_generate_email_context(user)
email_data = {
'subject': 'Password Reset',
'to': email,
@@ -226,15 +250,18 @@ class PasswordResetConfirmView(FormView):
return self.form_valid(form)
else:
messages.error(request, 'Password reset has not been unsuccessful.')
+ form.add_error(None, 'Password reset has not been unsuccessful.')
return self.form_invalid(form)
else:
messages.error(request, 'The reset password link is no longer valid.')
+ form.add_error(None, 'Password reset has not been unsuccessful.')
return self.form_invalid(form)
-class NotificationsView(TemplateView):
+class NotificationsView(LoginRequiredMixin, TemplateView):
template_name = 'hosting/notifications.html'
+ login_url = reverse_lazy('hosting:login')
def get_context_data(self, **kwargs):
context = super(NotificationsView, self).get_context_data(**kwargs)
@@ -251,6 +278,7 @@ class NotificationsView(TemplateView):
class MarkAsReadNotificationView(LoginRequiredMixin, UpdateView):
model = Message
success_url = reverse_lazy('hosting:notifications')
+ login_url = reverse_lazy('hosting:login')
fields = '__all__'
def post(self, *args, **kwargs):
@@ -265,6 +293,7 @@ class GenerateVMSSHKeysView(LoginRequiredMixin, DetailView):
model = VirtualMachinePlan
template_name = 'hosting/virtual_machine_key.html'
success_url = reverse_lazy('hosting:orders')
+ login_url = reverse_lazy('hosting:login')
context_object_name = "virtual_machine"
def get_context_data(self, **kwargs):
@@ -272,9 +301,10 @@ class GenerateVMSSHKeysView(LoginRequiredMixin, DetailView):
context = super(GenerateVMSSHKeysView, self).get_context_data(**kwargs)
vm = self.get_object()
if not vm.public_key:
- private_key = vm.generate_keys()
+ private_key, public_key = vm.generate_keys()
context.update({
- 'private_key': private_key
+ 'private_key': private_key,
+ 'public_key': public_key
})
return context
return context
diff --git a/ungleich_page/locale/de/LC_MESSAGES/django.mo b/ungleich_page/locale/de/LC_MESSAGES/django.mo
index ef04e0da..b44e0c32 100644
Binary files a/ungleich_page/locale/de/LC_MESSAGES/django.mo and b/ungleich_page/locale/de/LC_MESSAGES/django.mo differ
diff --git a/ungleich_page/locale/de/LC_MESSAGES/django.po b/ungleich_page/locale/de/LC_MESSAGES/django.po
index a5cb93c7..f8b938ce 100644
--- a/ungleich_page/locale/de/LC_MESSAGES/django.po
+++ b/ungleich_page/locale/de/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-15 19:16-0500\n"
+"POT-Creation-Date: 2016-07-09 16:47-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -70,32 +70,32 @@ msgstr "und"
msgid "the story continues!"
msgstr "Die Geschichte geht weiter!"
-#: templates/ungleich_page/includes/_contact_us.html:14
-#: templates/ungleich_page/includes/_contact_us.html:21 views.py:35
+#: templates/ungleich_page/includes/_contact_us.html:15
+#: templates/ungleich_page/includes/_contact_us.html:28 views.py:36
msgid "Contact Us"
msgstr "Kontaktieren Sie uns"
-#: templates/ungleich_page/includes/_contact_us.html:16
+#: templates/ungleich_page/includes/_contact_us.html:18
msgid "Join us at"
msgstr "Schliessen Sie sich uns an"
-#: templates/ungleich_page/includes/_contact_us.html:16
+#: templates/ungleich_page/includes/_contact_us.html:19
msgid "Digital Glarus"
msgstr "Digital Glarus"
-#: templates/ungleich_page/includes/_contact_us.html:17
+#: templates/ungleich_page/includes/_contact_us.html:20
msgid "a great co-working space in the middle of Alps!"
msgstr "ein wunderschöner Co-Working Space mitten in den Alpen"
-#: templates/ungleich_page/includes/_contact_us.html:17
+#: templates/ungleich_page/includes/_contact_us.html:21
msgid "You can contact us at"
msgstr "Sie können uns kontaktieren unter"
-#: templates/ungleich_page/includes/_contact_us.html:20
+#: templates/ungleich_page/includes/_contact_us.html:26
msgid "or"
msgstr "oder"
-#: templates/ungleich_page/includes/_contact_us.html:50
+#: templates/ungleich_page/includes/_contact_us.html:60
msgid "Submit"
msgstr "Absenden"
@@ -126,21 +126,24 @@ msgid ""
"infrastructure is powered by Free and Open Source Software like OpenNebula, "
"Qemu and GlusterFS."
msgstr ""
+"Wir offerieren hohe Verfügbarkeit für das Hosting in Deutschland und in der "
+"Schweiz. Unsere Infrastruktur ist unterstützt durch Free and Open Source "
+"Software wie OpenNebula."
#: templates/ungleich_page/includes/_portfolio.html:24
msgid "Rails Hosting"
-msgstr ""
+msgstr "Rails Hosting"
#: templates/ungleich_page/includes/_portfolio.html:26
msgid ""
"Ready to go live with your Ruby on Rails application? We offer you ready-to-"
"deploy virtual machines or configure your existing infrastructure for Ruby "
"on Rails."
-msgstr ""
+msgstr "Sind bereit mit ihrem Ruby on Rails Applikation live zu gehen?"
#: templates/ungleich_page/includes/_portfolio.html:32
msgid " Configuration as a Service"
-msgstr ""
+msgstr "Konfiguration als Service"
#: templates/ungleich_page/includes/_portfolio.html:34
msgid ""
@@ -148,11 +151,23 @@ msgid ""
"experienced team that configure your systems to provide service like DNS, E-"
"Mail, Databases or Webservers."
msgstr ""
+"Sie brauchen eine Konfiguration? Mit ungleich haben sie ein erfahrenes Team "
+"gefunden, dass ihnen die Konfiguration von DNS, E-Mail, Datenbanken oder "
+"Webservern für ihr System anbietet"
#: templates/ungleich_page/includes/_services.html:8
msgid "our services"
msgstr "Unsere Dienstleistungen"
+#: templates/ungleich_page/includes/_services.html:9
+msgid "We support our clients in all areas of Unix infrastructure."
+msgstr ""
+
+#: templates/ungleich_page/includes/_services.html:10
+msgid ""
+"Our top notch configuration management is refreshingly simple and reliable."
+msgstr ""
+
#: templates/ungleich_page/includes/_services.html:18
msgid "Hosting"
msgstr "Hosting"
@@ -162,6 +177,8 @@ msgid ""
"Ruby on Rails. Java hosting, Django hosting, we make it everything run "
"smooth and safe."
msgstr ""
+"Ruby on Rails. Java hosting, Django hosting, wir garantieren einen "
+"reibungslosen Ablauf"
#: templates/ungleich_page/includes/_services.html:28
msgid "Configuration as a Service"
@@ -173,16 +190,21 @@ msgid ""
"needs to configured, we provide comprehensive solutions. Amazon, rackspace "
"or bare metal servers, we configure for you."
msgstr ""
+"Ruby on Rails, Django, Java, Webserver, Mailserver, jegliche Infrastruktur "
+"welche eine Konfiguration braucht, wir offerieren umfassende Lösungen, "
+"Amazon, Rackspace oder Bare Metal Servers, wir konfigurieren alles."
#: templates/ungleich_page/includes/_services.html:38
msgid "Linux System Engineering"
-msgstr ""
+msgstr "Linux System Engineering"
#: templates/ungleich_page/includes/_services.html:41
msgid ""
"Let your developers develop! We take care of your system administration. "
"Gentoo, Archlinux, Debian, Ubuntu, and many more."
msgstr ""
+"Lassen sie ihre Entwickler entwickeln! Wir kümmern uns um ihre "
+"Systemadministration. Gentoo, Archlinux, Debian, Ubuntu und viele mehr."
#: templates/ungleich_page/includes/_team.html:8
msgid "Why ungleich?*"
@@ -190,7 +212,7 @@ msgstr "Warum ungleich?"
#: templates/ungleich_page/includes/_team.html:9
msgid "What our customers say"
-msgstr ""
+msgstr "Was unsere Kunden sagen"
#: templates/ungleich_page/includes/_team.html:29
msgid ""
@@ -249,16 +271,19 @@ msgstr ""
#: templates/ungleich_page/includes/_team.html:95
msgid "*ungleich means not equal to (≠) U+2260."
-msgstr ""
+msgstr "*ungleich bedeutet nicht gleich wie (≠) U+2260."
-#: urls.py:7
-msgid "contact/?$"
-msgstr ""
+#: urls.py:8
+#, fuzzy
+#| msgid "Contact Us"
+msgid "contact/$"
+msgstr "Kontaktieren Sie uns"
-#: views.py:25
+#: views.py:26
msgid "Message Successfully Sent"
msgstr "Nachricht erfolgreich versendet"
-#: views.py:36
+#: views.py:37
msgid "If you have any question, just send us an email."
-msgstr "Wenn Sie irgendwelche Fragen haben, schicken Sie uns einfach eine E-Mail."
+msgstr ""
+"Wenn Sie irgendwelche Fragen haben, schicken Sie uns einfach eine E-Mail."
diff --git a/ungleich_page/static/ungleich_page/css/404.css b/ungleich_page/static/ungleich_page/css/404.css
new file mode 100644
index 00000000..2528973d
--- /dev/null
+++ b/ungleich_page/static/ungleich_page/css/404.css
@@ -0,0 +1,28 @@
+.error {
+ margin: 0 auto;
+ text-align: center;
+}
+
+.error-code {
+ bottom: 60%;
+ color: #2d353c;
+ font-size: 96px;
+ line-height: 100px;
+}
+
+.error-desc {
+ font-size: 12px;
+ color: #647788;
+}
+
+.m-b-10 {
+ margin-bottom: 10px!important;
+}
+
+.m-b-20 {
+ margin-bottom: 20px!important;
+}
+
+.m-t-20 {
+ margin-top: 20px!important;
+}
diff --git a/ungleich_page/templates/ungleich_page/404.html b/ungleich_page/templates/ungleich_page/404.html
new file mode 100644
index 00000000..2fbac545
--- /dev/null
+++ b/ungleich_page/templates/ungleich_page/404.html
@@ -0,0 +1,27 @@
+{% load staticfiles%}
+
+
+
+
+ 404 | ungleich
+
+
+
+
+
404
+
We couldn't find the page..
+
+
+ Sorry, but the page you are looking for was either not found or does not exist.
+ Try refreshing the page or click the button below to go back to the Homepage.
+