diff --git a/.travis.yml b/.travis.yml index a1d0aacc..c306c1f9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,14 @@ language: python python: - - "3.5" - - "3.6" + - "3.4.2" +# - "3.6" env: - # Set a dummy secret key - - DJANGO_SECRET_KEY=0 + - DJANGO_SECRET_KEY=0 OPENNEBULA_USERNAME='test' OPENNEBULA_PASSWORD='test' OPENNEBULA_PROTOCOL='http' OPENNEBULA_DOMAIN='test_domain' OPENNEBULA_PORT='2633' OPENNEBULA_ENDPOINT='/RPC2' DCL_TEXT='Data Center Light' CELERY_MAX_RETRIES=0 # install dependencies install: "pip install -r requirements.txt" script: - flake8 -- python manage.py test +- python manage.py test -v 3 +# - coverage run --source='.' manage.py test dynamicweb -v 3 +# - coverage report diff --git a/Changelog b/Changelog index fdcb6053..ad39c20d 100644 --- a/Changelog +++ b/Changelog @@ -1,5 +1,36 @@ -Next release: +1.2.13: 2017-12-09 + * [cms] Introduce UngleichHeaderBackgroundImageAndTextSliderPlugin that allows to have scrolling images and texts + * [cms] Remove

tag for ungleich cms customer item template +1.2.12: 2017-12-09 + * #3594: [digitalglarus] Remove white scroll bar on the right in mobile + * #3905: [ungleich] Update ungleich.ch header into a slider + * [all] Enable logging custom modules +1.2.11: 2017-11-30 + * [all] TravisCI: Test against python 3.4.2 only + * [ungleich] Remove data-replaced image in ungleich CMS services item plugin template +1.2.10: 2017-11-26 + * #3843: [ungleich] Add generic ungleich CMS template + * #3672: [all] Clean existing automated tests +1.2.9: 2017-11-13 + * #3848: [ungleich] Optimize ungleich.ch landing page + * #3360: [ungleich] Ungleich.ch landing page animation fix + * #3421: [hosting] Signup form placeholder translations + * #3856: [ungleich] Glasfaser text modified + * bugfix: [blog] Redirect user to ungleich home on ungleich logo click + * #3858: [dcl] Change "affordable vm ..." text to "Ready in 30 seconds ..." +1.2.8: 2017-10-21 + * Remove ALLOWED_HOST alplora.ch + * Add ALLOWED_HOST hack4glarus.ch + * Fetch page_title and meta_description dynamically in glasfaser CMS template +1.2.7: 2017-10-20 * Bugfix: [dcl, hosting] Fix Stripe js error in confirm payment page + * #3847: [ungleich] change text 'hosting products' -> 'our products' + * #3829: [dcl] Handle landing login fail in payment page itself + * #3794: [dcl, hosting] Update email styles + * #3828: [dcl, hosting] invoice period set to show monthly subscription + * #3838: [hosting] restyle signup/login/password reset/password pages + * Bugfix: [dg] Remove validate email link in the registration email + * Feature: [ungleich_page] Add new glasfaser CMS template 1.2.6: 2017-10-10 * Bugfix: [dcl] Refactor and optimize images, links in glasfaser page * Bugfix: [dcl] Fix email not being sent issue @@ -8,7 +39,6 @@ Next release: * Bugfix: [hosting] card details input form alignment fix * #3823: [hosting] favicon link fixed * #3844: [dcl] Add Glasfaser page for advertisement - 1.2.4: 2017-10-02 * #3780: [hosting] Store VM details locally * #3764: [hosting] Show cancelled VMs' invoices diff --git a/README.rst b/README.rst index 8c8c8ddb..f297018c 100644 --- a/README.rst +++ b/README.rst @@ -3,6 +3,10 @@ ungleich dynamicweb ---------- + +.. image:: https://travis-ci.org/ungleich/dynamicweb.svg?branch=master + :target: https://travis-ci.org/ungleich/dynamicweb + Website for ungleich GmbH ======= diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.po b/datacenterlight/locale/de/LC_MESSAGES/django.po index d5035912..c69f83d1 100644 --- a/datacenterlight/locale/de/LC_MESSAGES/django.po +++ b/datacenterlight/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: 2017-10-10 21:35+0530\n" +"POT-Creation-Date: 2017-11-13 17:59+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -126,56 +126,57 @@ msgstr "" msgid "Thank you!" msgstr "Vielen Dank!" -msgid "Account Activation" -msgstr "Account Aktivierung" +msgid "Data Center Light Account Activation" +msgstr "Data Center Light Account Aktivierung" #, python-format msgid "" -"\n" -"You can activate your Data Center Light account by clicking here.
\n" +"You can activate your Data Center Light account by clicking here." +msgstr "" +"Klicke here um deinen Data Center " +"Light Account zu aktivieren." + +msgid "" "You can also copy and paste the following link into the address bar of your " -"browser
\n" -"to activate your Data Center Light account.
\n" -"%(base_url)s%(activation_link)s\n" -msgstr "" -"\n" -"Klicke hier um deinen Data " -"Center Light Account zu aktivieren oder kopiere den folgenden Link in die " -"Adressleiste deines Browsers.
\n" -"%(base_url)s%(activation_link)s\n" +"browser to activate your Data Center Light account." +msgstr "Kopiere den folgenden Link in die Adressleiste deines Browsers." -#, python-format -msgid "" -"Your account details are as follows:

\n" -"Username : Your email address
\n" -"Password : %(account_details)s

\n" -"You can reset your password here:\n" -"%(base_url)s%(reset_password_url)s\n" -msgstr "" +msgid "Your account details are as follows" +msgstr "Deine Account Details sind unten aufgelistet" -#, python-format -msgid "" -"You can activate your Data Center Light account by clicking here.\n" -"You can also copy and paste the following link into the address bar of your " -"browser\n" -"to activate your Data Center Light account.\n" -"%(base_url)s%(activation_link)s\n" -msgstr "" -"Klicke hier, um deinen Data Center Light Account zu aktivieren oder kopiere " -"den folgenden Link in die Adressleiste deines Browsers.\n" -"%(base_url)s%(activation_link)s\n" +msgid "Username" +msgstr "Username" + +msgid "Your email address" +msgstr "Deine E-Mail-Adresse" + +msgid "Password" +msgstr "Passwort" + +msgid "You can reset your password here" +msgstr "Du kannst dein Passwort hier zurück setzen" -#, python-format msgid "" -"Your account details are as follows:\n" -"\n" -"Username : Your email address\n" -"Password : %(account_details)s\n" -"\n" -"You can reset your password here:\n" -"%(base_url)s%(reset_password_url)s\n" -msgstr "" +"You can copy and paste the following link into the address bar of your " +"browser to activate your Data Center Light account." +msgstr "Kopiere den folgenden Link in die Adressleiste deines Browsers." + +msgid "Welcome to Data Center Light!" +msgstr "Willkommen beim Data Center Light!" + +msgid "" +"Thanks for joining us! We provide the most affordable virtual machines from " +"the heart of Switzerland." +msgstr "Bei uns findest Du die günstiges VMs aus der Schweiz." + +msgid "Try now, order a VM. VM price starts from only 15CHF per month." +msgstr "Unser Angebot beginnt bei 15 CHF pro Monat. Probier's jetzt aus!" + +msgid "ORDER VM" +msgstr "VM BESTELLEN" msgid "Home" msgstr "Home" @@ -269,8 +270,12 @@ msgstr "" "Einfach und bezahlbar: Teste nun unsere virtuellen Maschinen mit " "federleichten Preisen." -msgid "Affordable VM hosting based in Switzerland" -msgstr "Bezahlbares VM Hosting in der Schweiz" +msgid "" +"Ready in 30 seconds.
Experience the unbeatable speed from Data Center " +"Light." +msgstr "" +"Fertig in 30 Sekunden.
Erlebe die unschlagbare Geschwindigkeit von Data " +"Center Light." msgid "Contact us" msgstr "Kontaktiere uns" @@ -512,6 +517,18 @@ msgstr "" "Deine VM ist gleich bereit. Wir senden Dir eine Bestätigungsemail, sobald Du " "auf sie zugreifen kannst." +#~ msgid "Affordable VM hosting based in Switzerland" +#~ msgstr "Bezahlbares VM Hosting in der Schweiz" + +#~ msgid "Processing..." +#~ msgstr "Abarbeitung..." + +#~ msgid "Hold tight, we are processing your request" +#~ msgstr "Bitte warten - wir verbeiten Deine Anfrage gerade" + +#~ msgid "Some problem encountered. Please try again later." +#~ msgstr "Ein Problem ist aufgetreten. Bitte versuche es später noch einmal." + #~ msgid "Submit" #~ msgstr "Absenden" @@ -530,15 +547,6 @@ msgstr "" #~ msgid "Order summary" #~ msgstr "Bestellungsübersicht" -#~ msgid "Processing..." -#~ msgstr "Abarbeitung..." - -#~ msgid "Hold tight, we are processing your request" -#~ msgstr "Bitte warten - wir verbeiten Deine Anfrage gerade" - -#~ msgid "Some problem encountered. Please try again later." -#~ msgstr "Ein Problem ist aufgetreten. Bitte versuche es später noch einmal." - #~ msgid "We are cutting down the costs significantly!" #~ msgstr "Wir sorgen dafür, dass die Kosten für Dich signifikant abnehmen" @@ -560,9 +568,6 @@ msgstr "" #~ "kontaktiere uns unter support@datacenterlight.ch. Unser Team wird sich " #~ "umgehend um dein Anliegen kümmern!" -#~ msgid "Email Address" -#~ msgstr "E-Mail-Adresse" - #~ msgid "is not a proper name" #~ msgstr "ist kein gültiger Name" diff --git a/datacenterlight/static/datacenterlight/css/landing-page.css b/datacenterlight/static/datacenterlight/css/landing-page.css index 97599738..196dcda4 100755 --- a/datacenterlight/static/datacenterlight/css/landing-page.css +++ b/datacenterlight/static/datacenterlight/css/landing-page.css @@ -7,7 +7,7 @@ body, html { width: 100%; - height: 100%; + min-height: 100%; } body, @@ -182,7 +182,11 @@ button, input, optgroup, select, textarea { .navbar-brand { padding: 10px 15px; - cursor: pointer; +} +@media (max-width: 767px) { + .navbar-brand { + padding: 10px 10px; + } } .navbar-right { @@ -1544,7 +1548,7 @@ tech-sub-sec h2 { } footer { - padding: 50px 0; + padding: 50px 20px; background-color: #f8f8f8; } diff --git a/datacenterlight/static/datacenterlight/img/logo_black.png b/datacenterlight/static/datacenterlight/img/logo_black.png new file mode 100644 index 00000000..5dfd0eaa Binary files /dev/null and b/datacenterlight/static/datacenterlight/img/logo_black.png differ diff --git a/datacenterlight/static/datacenterlight/img/pattern.jpg b/datacenterlight/static/datacenterlight/img/pattern.jpg index 8ae4c0f2..7c66e007 100755 Binary files a/datacenterlight/static/datacenterlight/img/pattern.jpg and b/datacenterlight/static/datacenterlight/img/pattern.jpg differ diff --git a/datacenterlight/tasks.py b/datacenterlight/tasks.py index 1f34c3fe..3db6eb54 100644 --- a/datacenterlight/tasks.py +++ b/datacenterlight/tasks.py @@ -5,6 +5,7 @@ from celery.utils.log import get_task_logger from celery import current_task from django.conf import settings from django.core.mail import EmailMessage +from django.core.urlresolvers import reverse from django.utils import translation from django.utils.translation import ugettext_lazy as _ @@ -131,9 +132,9 @@ def create_vm_task(self, vm_template_id, user, specs, template, 'storage': specs.get('disk_size'), 'price': specs.get('price'), 'template': template.get('name'), - 'vm.name': vm['name'], - 'vm.id': vm['vm_id'], - 'order.id': order.id + 'vm_name': vm.get('name'), + 'vm_id': vm['vm_id'], + 'order_id': order.id } email_data = { 'subject': settings.DCL_TEXT + " Order from %s" % context['email'], @@ -155,13 +156,14 @@ def create_vm_task(self, vm_template_id, user, specs, template, translation.activate(lang) # Send notification to the user as soon as VM has been booked context = { - 'vm': vm, - 'order': order, 'base_url': "{0}://{1}".format(user.get('request_scheme'), user.get('request_host')), + 'order_url': reverse('hosting:orders', + kwargs={'pk': order.id}), 'page_header': _( 'Your New VM %(vm_name)s at Data Center Light') % { - 'vm_name': vm.get('name')} + 'vm_name': vm.get('name')}, + 'vm_name': vm.get('name') } email_data = { 'subject': context.get('page_header'), diff --git a/datacenterlight/templates/datacenterlight/emails/user_activation.html b/datacenterlight/templates/datacenterlight/emails/user_activation.html index 3c7fae74..8f270a3f 100644 --- a/datacenterlight/templates/datacenterlight/emails/user_activation.html +++ b/datacenterlight/templates/datacenterlight/emails/user_activation.html @@ -1,24 +1,58 @@ -{% extends "datacenterlight/emails/base_email_datacenterlight.html" %} -{% load static from staticfiles %} -{% load i18n %} -{% block email_head %} -{{dcl_text}} {% trans 'Account Activation' %} -{% endblock %} -{% block email_body %} -{% blocktrans %} -You can activate your Data Center Light account by clicking here.
-You can also copy and paste the following link into the address bar of your browser
-to activate your Data Center Light account.
-{{base_url}}{{activation_link}} -{% endblocktrans %} -{% if account_details %} -{% url 'hosting:reset_password' as reset_password_url %} -

-{% blocktrans %}Your account details are as follows:

-Username : Your email address
-Password : {{account_details}}

-You can reset your password here: -{{base_url}}{{reset_password_url}} -{% endblocktrans %} -{% endif %} -{% endblock %} +{% load static i18n %} + + + + + + + {% trans "Data Center Light Account Activation" %} + + + + + + + + + + + + + + + + + + +
+ +
+

{% trans "Data Center Light Account Activation" %}

+
+

+ {% blocktrans %}You can activate your Data Center Light account by clicking here.{% endblocktrans %} +

+

+ {% blocktrans %}You can also copy and paste the following link into the address bar of your browser to activate your Data Center Light account.{% endblocktrans %} +

+

+ {{base_url}}{{activation_link}} +

+

+ {% if account_details %} + {% url 'hosting:reset_password' as reset_password_url %} + {% trans "Your account details are as follows" %}: + + {% trans "Username" %} : {% trans "Your email address" %} + {% trans "Password" %} : {{account_details}} + + {% trans "You can reset your password here" %}: + {{base_url}}{{reset_password_url}} + {% endif %} +

+
+

{% trans "Your Data Center Light Team" %}

+
+ + + diff --git a/datacenterlight/templates/datacenterlight/emails/user_activation.txt b/datacenterlight/templates/datacenterlight/emails/user_activation.txt index 7c833256..4f66e239 100644 --- a/datacenterlight/templates/datacenterlight/emails/user_activation.txt +++ b/datacenterlight/templates/datacenterlight/emails/user_activation.txt @@ -1,21 +1,20 @@ -{% extends "datacenterlight/emails/base_email_datacenterlight.txt" %} {% load i18n %} -{% block email_head %}{{dcl_text}} {% trans 'Account Activation' %}{% endblock %} -{% block email_body %} -{% blocktrans %}You can activate your Data Center Light account by clicking here. -You can also copy and paste the following link into the address bar of your browser -to activate your Data Center Light account. + +{% trans "Data Center Light Account Activation" %} + +{% blocktrans %}You can copy and paste the following link into the address bar of your browser to activate your Data Center Light account.{% endblocktrans %} + {{base_url}}{{activation_link}} -{% endblocktrans %} + {% if account_details %} -{% url 'hosting:reset_password' as reset_password_url %} -{% blocktrans %}Your account details are as follows: + {% url 'hosting:reset_password' as reset_password_url %} + {% trans "Your account details are as follows" %}: -Username : Your email address -Password : {{account_details}} + {% trans "Username" %} : {% trans "Your email address" %} + {% trans "Password" %} : {{account_details}} -You can reset your password here: -{{base_url}}{{reset_password_url}} -{% endblocktrans %} + {% trans "You can reset your password here" %}: + {{base_url}}{{reset_password_url}} {% endif %} -{% endblock %} + +{% trans "Your Data Center Light Team" %} \ No newline at end of file diff --git a/datacenterlight/templates/datacenterlight/emails/welcome_user.html b/datacenterlight/templates/datacenterlight/emails/welcome_user.html new file mode 100644 index 00000000..e947ac97 --- /dev/null +++ b/datacenterlight/templates/datacenterlight/emails/welcome_user.html @@ -0,0 +1,48 @@ +{% load static i18n %} + + + + + + + {% trans "Welcome to Data Center Light!" %} + + + + + + + + + + + + + + + + + + + + + +
+ +
+

{% trans "Welcome to Data Center Light!" %}

+
+

+ {% blocktrans %}Thanks for joining us! We provide the most affordable virtual machines from the heart of Switzerland.{% endblocktrans %} +

+

+ {% blocktrans %}Try now, order a VM. VM price starts from only 15CHF per month.{% endblocktrans %} +

+
+ {% trans "ORDER VM" %} +
+

{% trans "Your Data Center Light Team" %}

+
+ + + \ No newline at end of file diff --git a/datacenterlight/templates/datacenterlight/emails/welcome_user.txt b/datacenterlight/templates/datacenterlight/emails/welcome_user.txt new file mode 100644 index 00000000..0e7820e6 --- /dev/null +++ b/datacenterlight/templates/datacenterlight/emails/welcome_user.txt @@ -0,0 +1,10 @@ +{% load i18n %} + +{% trans "Welcome to Data Center Light!" %} + +{% blocktrans %}Thanks for joining us! We provide the most affordable virtual machines from the heart of Switzerland.{% endblocktrans %} +{% blocktrans %}Try now, order a VM. VM price starts from only 15CHF per month.{% endblocktrans %} + +{{ base_url }}{% url 'hosting:create_virtual_machine' %} + +{% trans "Your Data Center Light Team" %} \ No newline at end of file diff --git a/datacenterlight/templates/datacenterlight/includes/_footer.html b/datacenterlight/templates/datacenterlight/includes/_footer.html index 76c2c16e..edb7f8aa 100644 --- a/datacenterlight/templates/datacenterlight/includes/_footer.html +++ b/datacenterlight/templates/datacenterlight/includes/_footer.html @@ -1,38 +1,39 @@ - {% load staticfiles i18n%} +{% load staticfiles i18n%} {% get_current_language as LANGUAGE_CODE %} -

+ diff --git a/datacenterlight/templates/datacenterlight/index.html b/datacenterlight/templates/datacenterlight/index.html index 85e66571..cc3597ec 100755 --- a/datacenterlight/templates/datacenterlight/index.html +++ b/datacenterlight/templates/datacenterlight/index.html @@ -130,7 +130,7 @@

{% trans "Simple and affordable: Try our virtual machine with featherlight price." %}

-

{% trans "Affordable VM hosting based in Switzerland" %}

+

{% blocktrans %}Ready in 30 seconds.
Experience the unbeatable speed from Data Center Light.{% endblocktrans %}

diff --git a/datacenterlight/templates/datacenterlight/landing_payment.html b/datacenterlight/templates/datacenterlight/landing_payment.html index fa638d77..d195690b 100644 --- a/datacenterlight/templates/datacenterlight/landing_payment.html +++ b/datacenterlight/templates/datacenterlight/landing_payment.html @@ -25,14 +25,15 @@

{%trans "Log in" %}

{% blocktrans %}Already signed up?
By logging in you can retrieve saved billing information.{% endblocktrans %}

-
+ {% for field in login_form %} {% csrf_token %} {% bootstrap_field field show_label=False type='fields'%} {% endfor %} +

{{login_form.non_field_errors|striptags}}

- +

@@ -58,7 +59,7 @@ {% endfor %}

{% csrf_token %} - {% for field in form %} + {% for field in billing_address_form %} {% bootstrap_field field show_label=False type='fields'%} {% endfor %}
@@ -153,22 +154,12 @@ {% endif %}
{% for message in messages %} - {% if 'failed_payment' in message.tags or 'make_charge_error' in message.tags %} + {% if 'failed_payment' in message.tags or 'make_charge_error' in message.tags or 'error' in message.tags %}

  • {{ message|safe }}

- {% elif not form.non_field_errors %} -

- {% trans "You are not making any payment yet. After placing your order, you will be taken to the Submit Payment Page." %} -

{% endif %} {% endfor %} - - {% for error in form.non_field_errors %} -

- {{ error|escape }} -

- {% endfor %}
diff --git a/datacenterlight/templatetags/custom_tags.py b/datacenterlight/templatetags/custom_tags.py index ce6e6724..908b1f89 100644 --- a/datacenterlight/templatetags/custom_tags.py +++ b/datacenterlight/templatetags/custom_tags.py @@ -31,3 +31,14 @@ def get_value_from_dict(dict_data, key): return dict_data.get(key) else: return "" + + +@register.filter('multiply') +def multiply(value, arg): + """ + usage: {{ quantity|multiply:price }} + :param value: + :param arg: + :return: + """ + return value*arg diff --git a/datacenterlight/tests.py b/datacenterlight/tests.py index 3405cfb6..d1ce9785 100644 --- a/datacenterlight/tests.py +++ b/datacenterlight/tests.py @@ -8,6 +8,8 @@ from django.conf import settings from django.core.management import call_command from django.test import TestCase, override_settings from model_mommy import mommy +from unittest import skipIf + from datacenterlight.models import VMTemplate from datacenterlight.tasks import create_vm_task from membership.models import StripeCustomer @@ -16,6 +18,11 @@ from utils.hosting_utils import get_vm_price from utils.stripe_utils import StripeUtils +@skipIf( + settings.STRIPE_API_PRIVATE_KEY_TEST is None or + settings.STRIPE_API_PRIVATE_KEY_TEST is "", + """Stripe details unavailable, so skipping CeleryTaskTestCase""" + ) class CeleryTaskTestCase(TestCase): @override_settings( task_eager_propagates=True, @@ -47,6 +54,11 @@ class CeleryTaskTestCase(TestCase): # OpenNebula call_command('fetchvmtemplates') + @skipIf( + settings.OPENNEBULA_DOMAIN is None or settings.OPENNEBULA_DOMAIN is + "test_domain", + """OpenNebula details unavailable, so skipping test_create_vm_task""" + ) def test_create_vm_task(self): """Tests the create vm task for monthly subscription @@ -110,13 +122,11 @@ class CeleryTaskTestCase(TestCase): msg = subscription_result.get('error') raise Exception("Creating subscription failed: {}".format(msg)) - async_task = create_vm_task.delay(vm_template_id, self.user, - specs, - template_data, - stripe_customer.id, - billing_address_data, - stripe_subscription_obj.id, - card_details_dict) + async_task = create_vm_task.delay( + vm_template_id, self.user, specs, template_data, + stripe_customer.id, billing_address_data, + stripe_subscription_obj.id, card_details_dict + ) new_vm_id = 0 res = None for i in range(0, 10): diff --git a/datacenterlight/views.py b/datacenterlight/views.py index 81c83685..bd1a7f51 100644 --- a/datacenterlight/views.py +++ b/datacenterlight/views.py @@ -345,26 +345,45 @@ class PaymentOrderView(FormView): else: return BillingAddressFormSignup - def get_form_kwargs(self): - form_kwargs = super(PaymentOrderView, self).get_form_kwargs() - # if user is signed in, get billing address - if self.request.user.is_authenticated(): - form_kwargs.update({ - 'instance': self.request.user.billing_addresses.first() - }) - if 'billing_address_data' in self.request.session: - billing_address_data = self.request.session['billing_address_data'] - form_kwargs.update({ - 'initial': billing_address_data - }) - return form_kwargs - def get_context_data(self, **kwargs): context = super(PaymentOrderView, self).get_context_data(**kwargs) + if 'billing_address_data' in self.request.session: + billing_address_data = self.request.session['billing_address_data'] + else: + billing_address_data = {} + + if self.request.user.is_authenticated(): + if billing_address_data: + billing_address_form = BillingAddressForm( + initial=billing_address_data + ) + else: + billing_address_form = BillingAddressForm( + instance=self.request.user.billing_addresses.first() + ) + # Get user last order + last_hosting_order = HostingOrder.objects.filter( + customer__user=self.request.user + ).last() + + # If user has already an hosting order, get the credit card + # data from it + if last_hosting_order: + credit_card_data = last_hosting_order.get_cc_data() + if credit_card_data: + context['credit_card_data'] = credit_card_data + else: + context['credit_card_data'] = None + else: + billing_address_form = BillingAddressFormSignup( + initial=billing_address_data + ) + context.update({ 'stripe_key': settings.STRIPE_API_PUBLIC_KEY, 'site_url': reverse('datacenterlight:index'), - 'login_form': HostingUserLoginForm() + 'login_form': HostingUserLoginForm(prefix='login_form'), + 'billing_address_form': billing_address_form }) return context @@ -376,9 +395,32 @@ class PaymentOrderView(FormView): return self.render_to_response(self.get_context_data()) def post(self, request, *args, **kwargs): - form = self.get_form() - if form.is_valid(): - token = form.cleaned_data.get('token') + if 'login_form' in request.POST: + login_form = HostingUserLoginForm(data=request.POST, + prefix='login_form') + if login_form.is_valid(): + email = login_form.cleaned_data.get('email') + password = login_form.cleaned_data.get('password') + auth_user = authenticate(email=email, password=password) + if auth_user: + login(self.request, auth_user) + return HttpResponseRedirect( + reverse('datacenterlight:payment') + ) + else: + context = self.get_context_data() + context['login_form'] = login_form + return self.render_to_response(context) + if request.user.is_authenticated(): + address_form = BillingAddressForm( + data=request.POST, + ) + else: + address_form = BillingAddressFormSignup( + data=request.POST, + ) + if address_form.is_valid(): + token = address_form.cleaned_data.get('token') if request.user.is_authenticated(): this_user = { 'email': request.user.email, @@ -388,8 +430,8 @@ class PaymentOrderView(FormView): email=this_user.get('email'), token=token) else: - user_email = form.cleaned_data.get('email') - user_name = form.cleaned_data.get('name') + user_email = address_form.cleaned_data.get('email') + user_name = address_form.cleaned_data.get('name') this_user = { 'email': user_email, 'name': user_name @@ -422,13 +464,18 @@ class PaymentOrderView(FormView): token=token, customer_name=user_name) - request.session['billing_address_data'] = form.cleaned_data + request.session['billing_address_data'] = address_form.cleaned_data request.session['user'] = this_user # Get or create stripe customer if not customer: - form.add_error("__all__", "Invalid credit card") + address_form.add_error( + "__all__", "Invalid credit card" + ) return self.render_to_response( - self.get_context_data(form=form)) + self.get_context_data( + billing_address_form=address_form + ) + ) request.session['token'] = token if type(customer) is StripeCustomer: request.session['customer'] = customer.stripe_id @@ -437,7 +484,9 @@ class PaymentOrderView(FormView): return HttpResponseRedirect( reverse('datacenterlight:order_confirmation')) else: - return self.form_invalid(form) + context = self.get_context_data() + context['billing_address_form'] = address_form + return self.render_to_response(context) class OrderConfirmationView(DetailView): @@ -548,9 +597,13 @@ class OrderConfirmationView(DetailView): try: custom_user = CustomUser.objects.get( email=user.get('email')) - customer = StripeCustomer.objects.filter( + stripe_customer = StripeCustomer.objects.filter( user_id=custom_user.id).first() - stripe_customer_id = customer.id + if stripe_customer is None: + stripe_customer = StripeCustomer.objects.create( + user=custom_user, stripe_id=stripe_api_cus_id + ) + stripe_customer_id = stripe_customer.id except CustomUser.DoesNotExist: logger.debug( "Customer {} does not exist.".format(user.get('email'))) diff --git a/digitalglarus/locale/de/LC_MESSAGES/django.po b/digitalglarus/locale/de/LC_MESSAGES/django.po index 6ae6a6bb..23c0ecab 100644 --- a/digitalglarus/locale/de/LC_MESSAGES/django.po +++ b/digitalglarus/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: 2017-10-10 21:35+0530\n" +"POT-Creation-Date: 2017-11-06 00:24+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -95,6 +95,9 @@ msgstr "Seite" msgid "Data Center Light" msgstr "" +msgid "Glasfaser" +msgstr "" + msgid "English" msgstr "" diff --git a/digitalglarus/static/digitalglarus/css/agency.css b/digitalglarus/static/digitalglarus/css/agency.css index f66ce70c..4ac531c2 100755 --- a/digitalglarus/static/digitalglarus/css/agency.css +++ b/digitalglarus/static/digitalglarus/css/agency.css @@ -67,7 +67,7 @@ h6 { font-size: 18px; } -@media only screen and (max-width: 400px){ +@media only screen and (max-width: 400px){ h1, h2 { font-size: 20px; } @@ -404,8 +404,8 @@ section h3.section-subheading { @media(min-width:768px) { section { padding: 50px 0; - } -} + } +} */ .service-heading { margin: 15px 0; @@ -416,7 +416,7 @@ section h3.section-subheading { .no-padding { padding:0; -} +} .no-gutter > [class*='col-'] { padding-top:0; @@ -964,40 +964,6 @@ section h3.section-comment { color: #494949; } -small-comment { - font-family: "Open Sans", "Droid Serif", "Helvetica Neue", Helvetica, Arial, sans-serif; - margin-bottom: none; - font-transform: none; - font-size:10px; - font-weight:400; - color: #777 -} - -logo-image { - z-index: 100; - position: absolute; - left: 0; - width: 80px; - height: 80px; - margin-left: 0; - border: 7px solid #f1f1f1; - border-radius: 100%; - text-align: center; - color: #fff; - background-color: #a1cfd7; -} - - -intro-cap { - margin-bottom: 25px; - text-transform: uppercase; - font-family: 'Raleway', "Helvetica Neue", "Helvetica Neue", Helvetica,Arial,sans-serif; - font-size: 24px; - font-weight: 400; - line-height: 50px; - color:#fff - background-color: #a1cfd7; -} .intro-small { font-family: 'Montserrat' ,'Raleway', "Open Sans Bold", Helvetica, Arial, "Arial Bold", sans-serif; font-size: 20px; @@ -1006,26 +972,7 @@ intro-cap { text-transform: uppercase; color: #FFF; } -intro-headline { - margin-bottom: 25px; - text-transform: uppercase; - font-family: 'Raleway', "Helvetica Neue", "Helvetica Neue", Helvetica,Arial,sans-serif; - font-size: 24px; - font-weight: 400; - line-height: 100px; - color:#fff - background-color: #a1cfd7; -} -h6 intro-smallcap { - margin-bottom: 25px; - text-transform: none; - font-family:'Raleway' , Montserrat,"Helvetica Neue",Helvetica,Arial,sans-serif; - font-size: 18px; - font-weight: 400; - line-height: 50px; - color:#fff - background-color: #a1cfd7; -} + .darkened-container { /* Fallback for web browsers that doesn't support RGBa */ background: rgb(0, 0, 0); @@ -1043,7 +990,7 @@ h6 intro-smallcap { font-size: 14px; line-height: 1.43; height: 86px; /* this is wrong */ - /*color: #484848;*/ + /*color: #484848;*/ } .carousel-indicators li { @@ -1143,7 +1090,7 @@ body { .carousel-control { height: 100%; - + } /* Background images are set within the HTML using inline CSS, not here */ @@ -1231,7 +1178,7 @@ hr { padding-top: 2em; } -.donate { +.donate { font-weight: 600; font-size: 24px; } diff --git a/digitalglarus/static/digitalglarus/css/agency1.css b/digitalglarus/static/digitalglarus/css/agency1.css index 67154295..6178630c 100755 --- a/digitalglarus/static/digitalglarus/css/agency1.css +++ b/digitalglarus/static/digitalglarus/css/agency1.css @@ -400,8 +400,8 @@ section h3.section-subheading { @media(min-width:768px) { section { padding: 50px 0; - } -} + } +} */ .service-heading { margin: 15px 0; @@ -412,7 +412,7 @@ section h3.section-subheading { .no-padding { padding:0; -} +} .no-gutter > [class*='col-'] { padding-top:0; @@ -960,40 +960,6 @@ section h3.section-comment { color: #494949; } -small-comment { - font-family: "Open Sans", "Droid Serif", "Helvetica Neue", Helvetica, Arial, sans-serif; - margin-bottom: none; - font-transform: none; - font-size:10px; - font-weight:400; - color: #777 -} - -logo-image { - z-index: 100; - position: absolute; - left: 0; - width: 80px; - height: 80px; - margin-left: 0; - border: 7px solid #f1f1f1; - border-radius: 100%; - text-align: center; - color: #fff; - background-color: #a1cfd7; -} - - -intro-cap { - margin-bottom: 25px; - text-transform: uppercase; - font-family: 'Raleway', "Helvetica Neue", "Helvetica Neue", Helvetica,Arial,sans-serif; - font-size: 24px; - font-weight: 400; - line-height: 50px; - color:#fff - background-color: #a1cfd7; -} .intro-small { font-family: 'Montserrat' ,'Raleway', "Open Sans Bold", Helvetica, Arial, "Arial Bold", sans-serif; font-size: 20px; @@ -1002,26 +968,7 @@ intro-cap { text-transform: uppercase; color: #FFF; } -intro-headline { - margin-bottom: 25px; - text-transform: uppercase; - font-family: 'Raleway', "Helvetica Neue", "Helvetica Neue", Helvetica,Arial,sans-serif; - font-size: 24px; - font-weight: 400; - line-height: 100px; - color:#fff - background-color: #a1cfd7; -} -h6 intro-smallcap { - margin-bottom: 25px; - text-transform: none; - font-family:'Raleway' , Montserrat,"Helvetica Neue",Helvetica,Arial,sans-serif; - font-size: 18px; - font-weight: 400; - line-height: 50px; - color:#fff - background-color: #a1cfd7; -} + .darkened-container { /* Fallback for web browsers that doesn't support RGBa */ background: rgb(0, 0, 0); @@ -1039,7 +986,7 @@ h6 intro-smallcap { font-size: 14px; line-height: 1.43; height: 86px; /* this is wrong */ - /*color: #484848;*/ + /*color: #484848;*/ } .carousel-indicators li { @@ -1139,7 +1086,7 @@ body { .carousel-control { height: 100%; - + } /* Background images are set within the HTML using inline CSS, not here */ diff --git a/digitalglarus/static/digitalglarus/css/history.css b/digitalglarus/static/digitalglarus/css/history.css index 91de1abf..fd32f198 100644 --- a/digitalglarus/static/digitalglarus/css/history.css +++ b/digitalglarus/static/digitalglarus/css/history.css @@ -88,7 +88,7 @@ header.history { line-height: 75px; } .supportus .intro-headline-big { - font-family: 'Raleway', "Open Sans Bold", Helvetica, Arial, "Arial Bold", + font-family: 'Raleway', "Open Sans Bold", Helvetica, Arial, "Arial Bold", font-size: 2.6em; font-style: normal; font-weight: 800; @@ -96,7 +96,7 @@ header.history { color: #ffffff; line-height: 1; opacity: 0.85; - + } .supportus-box { @@ -114,7 +114,7 @@ header.history { margin: 0; text-align: center; display: block; - max-width: 650px; + max-width: 650px; border: 1px; border-color: #ddd; } @@ -250,6 +250,7 @@ header.history { text-align:center; line-height: 2.5; color: #fff; + margin-bottom: 100px; } .supporter-intro { @@ -269,7 +270,7 @@ header.history { @media (max-width: 979px) .supporter-black{ - width: 100%; + width: 100%; } .supporter-headline { @@ -291,7 +292,7 @@ header.history { background-size: cover; -o-background-size: cover; } - + .glyphicon-star { font-size: 44px; display: block; @@ -339,7 +340,7 @@ header.history { -moz-transition: all .3s; transition: all .3s; }*/ - + #hr.grey { border-color: #ddd; border-width: 1px; diff --git a/digitalglarus/static/digitalglarus/css/ungleich.css b/digitalglarus/static/digitalglarus/css/ungleich.css index 03a2b47c..5d36c26b 100644 --- a/digitalglarus/static/digitalglarus/css/ungleich.css +++ b/digitalglarus/static/digitalglarus/css/ungleich.css @@ -1,4 +1,4 @@ -#page-top #services .container .row .col-lg-12.text-center .section-heading { +#page-top #services .section-heading { font-style: normal; color: #494949; padding-top: 50px; @@ -10,17 +10,13 @@ .intro-cap { font-family: 'Raleway', 'Helvetica Neue', 'Open Sans Bold', Helvetica, Arial, 'Arial Bold', sans-serif; - font-size: 26px; + font-size: 24px; font-style: normal; font-weight: 200; text-transform: uppercase; color: #FFF; } -.intro-cap { - font-size: 24px; -} - .intro-smallcap { font-family: 'Raleway' , "Open Sans Bold", Helvetica, Arial, "Arial Bold", sans-serif; font-size: 22px; diff --git a/digitalglarus/templates/digitalglarus/history.html b/digitalglarus/templates/digitalglarus/history.html index c54a4a72..760f8472 100755 --- a/digitalglarus/templates/digitalglarus/history.html +++ b/digitalglarus/templates/digitalglarus/history.html @@ -4,150 +4,148 @@ {% block content %} - -
-
-
-

-

-
- - Where great minds work - -
+
+
+
+
+ + Where great minds work +
-
-
-
+
+
+
- -
-
-
-
- -

the story of Digital Glarus

- -

- In search for a better environment for creativity, ungleich - arrived at a small village in Glarus. First we were driven by the - cheap real estate price, then we were genuinely surprised by the beauty of its nature. People were incredibly friendly as well. Working just became so relaxed and enjoyable in such a beautiful - surrounding..How come we are the only ones here?! We can't be - enjoying this alone, we need to let others know about this great - place. That's how it all started... -

- -

we fell in love

- -

- We didn't see this coming, but we really fell in love with Glarus. The lakes, the mountains, the mist, the (amazing) snow, - the fresh air, the stream, the people, the stars...how could we not? And before long, we found an 100 something years old house, - formerly a family home, but long time unused, next to a river in - Schwanden. Full of old furniture, the house and the neighborhood - was stepping in a time machine. There, we found our first - coworking space in Glarus.

- -

Our crowdfunding success

- -

- What comes with a very old house? Lots of charm, yes. Great - history, yes. A contract stating that we can park our goats in the - storage room, yes. And, yes, tons of things to be fixed. We - couldn't afford much of renovation-we are a young start up rich - with creativity but not much money (yet)-that is why we decided to ask for help. To our surprise, generous people found hope and - inspiration from our project. We got much supports from people we - know and we don't know. People wrote to us, called us, met us. We - were on the cover of newspaper. We were on TV. We became the talk - of the town. -

+ +
+
+
+ +

the story of Digital Glarus

+

+ In search for a better environment for creativity, ungleich + arrived at a small village in Glarus. First we were driven by the + cheap real estate price, then we were genuinely surprised by the + beauty of its nature. People were incredibly friendly as well. + Working just became so relaxed and enjoyable in such a beautiful + surrounding..How come we are the only ones here?! We can't be + enjoying this alone, we need to let others know about this great + place. That's how it all started... +

+ -
- -

And the story continues..!

-

- With the money we raised from our crowdfunding campaign, we - started renovating the hourse, ripping floors off and fixing - walls, giving a fresh coat of paint on old walls. We hired Samuel, - who came to Glarus as a refugee from Eritrea, as our intern to - renovate the house and learn computer science. We opened our door for students to live. Our coworking space is growing slowly but - meaningfully. Our journey only started! -

-
-
+

we fell in love

+

+ We didn't see this coming, but we really fell in love with Glarus. + The lakes, the mountains, the mist, the (amazing) snow, + the fresh air, the stream, the people, the stars...how could we + not? And before long, we found an 100 something years old house, + formerly a family home, but long time unused, next to a river in + Schwanden. Full of old furniture, the house and the neighborhood + was stepping in a time machine. There, we found our first + coworking space in Glarus. +

+ + +

Our crowdfunding success

+

+ What comes with a very old house? Lots of charm, yes. Great + history, yes. A contract stating that we can park our goats in the + storage room, yes. And, yes, tons of things to be fixed. We + couldn't afford much of renovation-we are a young start up rich + with creativity but not much money (yet)-that is why we decided to + ask for help. To our surprise, generous people found hope and + inspiration from our project. We got much supports from people we + know and we don't know. People wrote to us, called us, met us. We + were on the cover of newspaper. We were on TV. We became the talk + of the town. +

+ +
+ +
+ + +

And the story continues..!

+

+ With the money we raised from our crowdfunding campaign, we + started renovating the hourse, ripping floors off and fixing + walls, giving a fresh coat of paint on old walls. We hired Samuel, + who came to Glarus as a refugee from Eritrea, as our intern to + renovate the house and learn computer science. We opened our door + for students to live. Our coworking space is growing slowly but + meaningfully. Our journey only started! +

+
+
+
+
+ + +
+
+ +
+
+ + +
+
+
+
+

Our Supporters

+
+

+ Here are our proud supporters of project Digital Glarus. Thanks to our supporters, + the first cowerking space in Glarus is going to have a new look! +

+

+ {% for supporter in supporters %} + {{ supporter.name }} +
+ {% endfor %} +
+ Become a supporter +

-
+
+ - -
-
- -
- -
- -
-
-
-
-

Our Supporters

-
-

Here are our proud supporters of project Digital Glarus. Thanks to our supporters, the first cowerking space in Glarus - is going to have a new look!

-

- - {% for supporter in supporters %} - {{ supporter.name }} -
- {% endfor %} -
- Become a supporter -
-
-
-
-

-
-
-
- - -
-
-
-
-
- +
+
+
+
+

Contact Us

+
+
-
- Digital Glarus
- In der Au 7 Schwanden 8762 Switzerland +
+
+
+ Digital Glarus
+ + In der Au 7 Schwanden 8762 Switzerland
info@digitalglarus.ch
(044) 534-66-22 -

 

- -
-

 

+
+ +

 

-
- - +
+
{% endblock %} \ No newline at end of file diff --git a/digitalglarus/templates/digitalglarus/index.html b/digitalglarus/templates/digitalglarus/index.html index b57e54b5..03cb2bc0 100644 --- a/digitalglarus/templates/digitalglarus/index.html +++ b/digitalglarus/templates/digitalglarus/index.html @@ -3,251 +3,254 @@ {% block content %} - -
-
-
-

-

-
- - Where great minds work - -
-
-
- -
-

- Book a date today and dive in

- Join now - - -
+ - - -
- - -
-
-
-
-
-
-
Partner of
-
-
-
+ +
+
+
+
+ + Where great minds work + +
-
+
+ +
+

Book a date today and dive in

+ Join now + + {% comment %} +
+
+ + +
+ + +
+
+ +
+ {% endcomment %} +
+ +
+ + + +
+
+
+
Partner of
+
+ + + +
+
+

In Digital Glarus you can..

-
- -
-
-
- + + +
+
+
+ +
-
-
-
- +
+
+ +
-
-
-
- +
+
+ +
-
-
-
- -
-
-
-
-
- +
+
+ +
-
-
-
- -
-
-
-
- -
-
-
-
- +
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
- -
-
- -
    + +
    +
    + +
    3. -
    +
- -
+ +

- When we first moved our company HQ to Glarus, - we couldn't believe how beautiful and peaceful - a workplace could be. Then we thought, we can't be - the only ones appreciating it, more people should + When we first moved our company HQ to Glarus, + we couldn't believe how beautiful and peaceful + a workplace could be. Then we thought, we can't be + the only ones appreciating it, more people should know about this.

@@ -256,13 +259,13 @@

- After my first visit to Digital Glarus, I felt - right at home and at peace. Now that 200ok has a - mountain-side office, our meetings, workshops and - code-retreats are so much more intense and productive - for everyone. And in the end, when people came - over from the city for work, they want to come back - real soon, because it just feels like going on vacation. + After my first visit to Digital Glarus, I felt + right at home and at peace. Now that 200ok has a + mountain-side office, our meetings, workshops and + code-retreats are so much more intense and productive + for everyone. And in the end, when people came + over from the city for work, they want to come back + real soon, because it just feels like going on vacation.

- Alain Lafon , CEO of 200ok GmbH @@ -270,219 +273,199 @@

- You get on the train from the city and in an hour - you arrive at a completely different environment. - Just looking around, is amazing.We have this beautiful - nature like on a holiday, but it is still a working - environment and you can really focus and be productive. + You get on the train from the city and in an hour + you arrive at a completely different environment. + Just looking around, is amazing.We have this beautiful + nature like on a holiday, but it is still a working + environment and you can really focus and be productive. I really like this building. it's full of old charm.

- Gregor Martius, Swiss Federal Institute for Forest, Snow and Landscape Research WSL

-
-
- -
+
+
+ +
- - -
+ +
-
-
- - -
-
    -
  • - + +
    +
    +
      +
    • +
      - - -
      -
      • -
    -
    excursions
    - -
    - -
    +
    +
    • +
+
excursions
+
+ +
  • -
    -
    - -
    +
    +
    +
-
enjoy the great outdoors
-
+
enjoy the great outdoors
+
- -
-
    -
  • - -
    -
    - -
    -
    • -
-
cultural events
-
- -
-
    -
  • - -
    -
    - -
    -
    • -
-
be inspired
-
- - - -
-
    -
  • - +
    +
      +
    • +
      -
      • -
    -
    workshops
    -
    +
    • +
+
cultural events
+
-
-
    -
  • - +
    +
      +
    • +
      -
      -
      • -
    -
    recharge
    +
    +
    • +
+
be inspired
+
+ +
+
    +
  • + +
    +
    +
    +
    • +
+
workshops
+
+ +
+
    +
  • + +
    +
    +
    +
    • +
+
recharge
+
- - - -
+ - - - - - - - - -
-
-
-
-

Contact Us

-
-
-
- Digital Glarus
- In der Au 7 Schwanden 8762 Switzerland -
info@digitalglarus.ch + +
+ + + + +
+ +
+
+ Lorawan meetup :
+ connect with like-minded people and discuss your latest tech obsession. +
+
+
+ +
+
+ Cooking and Hacking at Digital Chalet Schwanden +
+
+
+ +
+
+ Dive into the beautiful nature around you anytime you want +
+
+
+ + + + + + + + +
+ +
+
+
+
+
+

Contact Us

+
+ +
+
+ Digital Glarus
+ In der Au 7 Schwanden 8762 Switzerland +
info@digitalglarus.ch +
+ (044) 534-66-22 +

 

+ +
+

 

+
+
+
+
+
- - - - - {% if request.user.is_authenticated %} - + {% else %}
{% include "datacenterlight/includes/_footer.html" %} diff --git a/hosting/templates/hosting/confirm_reset_password.html b/hosting/templates/hosting/confirm_reset_password.html index d7942455..a3c8d030 100644 --- a/hosting/templates/hosting/confirm_reset_password.html +++ b/hosting/templates/hosting/confirm_reset_password.html @@ -1,21 +1,17 @@ {% extends "hosting/base_short.html" %} -{% load staticfiles bootstrap3%} -{% load i18n %} +{% load staticfiles bootstrap3 i18n %} {% block navbar %} - {% include 'hosting/includes/_navbar_transparent.html' %} + {% include 'hosting/includes/_navbar_transparent.html' %} {% endblock navbar %} {% block content %} -
-
+
+
-
-

{% trans "Your VM hosted in Switzerland"%}

-
-
-
-
+
{% endblock %} diff --git a/hosting/templates/hosting/emails/new_booked_vm.html b/hosting/templates/hosting/emails/new_booked_vm.html index 864cf813..b80aebe0 100644 --- a/hosting/templates/hosting/emails/new_booked_vm.html +++ b/hosting/templates/hosting/emails/new_booked_vm.html @@ -1,14 +1,51 @@ -{% extends "datacenterlight/emails/base_email_datacenterlight.html" %} -{% load i18n %} -{% block email_head %}{{page_header}}{% endblock %} -{% block email_body %} -{% url 'hosting:orders' order.id as order_url %} -{% blocktrans with vm.name as vm_name %}You have ordered a new virtual machine! -
-Your order of [{{vm_name}}] has been charged.

-You can view your invoice by clicking the button below.

-{% endblocktrans %} -
- {% trans 'View Invoice' %} -
-{% endblock %} +{% load static i18n %} + + + + + + + {% blocktrans %}Your New VM {{vm_name}}{% endblocktrans %} + + + + + + + + + + + + + + + + + + + + + +
+ +
+

{% blocktrans %}Your New VM {{ vm_name }}{% endblocktrans %}

+
+

+ {% blocktrans %}You have ordered a new virtual machine!{% endblocktrans %} +

+

+ {% blocktrans %}Your order of {{ vm_name }} has been charged.{% endblocktrans %} +

+

+ {% blocktrans %}You can view your VM detail by clicking the button below.{% endblocktrans %} +

+
+ {% trans "View Detail" %} +
+

{% trans "Your Data Center Light Team" %}

+
+ + + \ No newline at end of file diff --git a/hosting/templates/hosting/emails/new_booked_vm.txt b/hosting/templates/hosting/emails/new_booked_vm.txt index b8e3eed1..cfd9c63a 100644 --- a/hosting/templates/hosting/emails/new_booked_vm.txt +++ b/hosting/templates/hosting/emails/new_booked_vm.txt @@ -1,11 +1,11 @@ -{% extends "datacenterlight/emails/base_email_datacenterlight.txt" %} {% load i18n %} -{% block email_head %}{{page_header}}{% endblock %} -{% block email_body %} -{% url 'hosting:orders' order.id as order_url %} -{% blocktrans with vm.name as vm_name %}You have ordered a new virtual machine! -Your order of [{{vm_name}}] has been charged. -You can view your invoice here. -{% endblocktrans %} -{{ base_url }}{{order_url}} -{% endblock %} + +{% blocktrans %}Your New VM {{vm_name}}{% endblocktrans %} + +{% blocktrans %}You have ordered a new virtual machine!{% endblocktrans %} +{% blocktrans %}Your order of {{vm_name}} has been charged.{% endblocktrans %} +{% blocktrans %}You can view your VM detail by following the link below.{% endblocktrans %} + +{{ base_url }}{{ order_url }} + +{% trans "Your Data Center Light Team" %} \ No newline at end of file diff --git a/hosting/templates/hosting/emails/password_reset_email.html b/hosting/templates/hosting/emails/password_reset_email.html index b83a08f2..57831228 100644 --- a/hosting/templates/hosting/emails/password_reset_email.html +++ b/hosting/templates/hosting/emails/password_reset_email.html @@ -1,14 +1,52 @@ -{% extends "datacenterlight/emails/base_email_datacenterlight.html" %} -{% load i18n %} -{% block email_head %} -{% trans 'Password Reset' %} -{% endblock %} -{% block email_body %} -{% url 'hosting:reset_password_confirm' uidb64=uid token=token as password_reset_url %} -{% blocktrans %} -You're receiving this email because you requested a password reset for your user account at {{site_name}}.
-Please go to the following page and choose a new password: {{base_url}}{{ password_reset_url }}
-If you didn't request a new password, ignore this e-mail.
-Thank you! -{% endblocktrans %} -{% endblock %} +{% load static i18n %} + + + + + + + {% trans "Password Reset" %} + + + + + + + + + + + + + + + + + + +
+ +
+

{% trans "Password Reset" %}

+
+

+ {% trans "We received a request to reset your password." %} +

+

+ {% trans "If you didn't make this request you can safely ignore this email." %} +

+ {% trans "Otherwise, click here to reset your password." %} +

+

+ {% url 'hosting:reset_password_confirm' uidb64=uid token=token as password_reset_url %} + {{base_url}}{{ password_reset_url }} +

+

+ {% trans "Thank you!" %} +

+
+

{% trans "Your Data Center Light Team" %}

+
+ + + \ No newline at end of file diff --git a/hosting/templates/hosting/emails/password_reset_email.txt b/hosting/templates/hosting/emails/password_reset_email.txt index 769166ed..f2ada3b2 100644 --- a/hosting/templates/hosting/emails/password_reset_email.txt +++ b/hosting/templates/hosting/emails/password_reset_email.txt @@ -1,11 +1,14 @@ -{% extends "datacenterlight/emails/base_email_datacenterlight.txt" %} {% load i18n %} -{% block email_head %}{% trans 'Password Reset' %}{% endblock %} -{% block email_body %} + +{% trans "Password Reset" %} + +{% trans "We received a request to reset your password." %} +{% trans "If you didn't make this request you can safely ignore this email." %} +{% trans "Otherwise, click here to reset your password." %} + {% url 'hosting:reset_password_confirm' uidb64=uid token=token as password_reset_url %} -{% blocktrans %}You're receiving this email because you requested a password reset for your user account at {{site_name}}. -Please go to the following page and choose a new password: {{base_url}}{{ password_reset_url }} -If you didn't request a new password, ignore this e-mail. -Thank you! -{% endblocktrans %} -{% endblock %} +{{base_url}}{{ password_reset_url }} + +{% trans "Thank you!" %} + +{% trans "Your Data Center Light Team" %} diff --git a/hosting/templates/hosting/emails/vm_canceled.html b/hosting/templates/hosting/emails/vm_canceled.html index 68c7b9fd..3142f6bc 100644 --- a/hosting/templates/hosting/emails/vm_canceled.html +++ b/hosting/templates/hosting/emails/vm_canceled.html @@ -1,15 +1,49 @@ -{% extends "datacenterlight/emails/base_email_datacenterlight.html" %} -{% load i18n %} -{% block email_head %}{{page_header}}{% endblock %} -{% block email_body %} -{% url 'hosting:virtual_machines' as my_virtual_machines_url %} -{% url 'hosting:orders' as vm_orders_url %} -{% blocktrans with vm.name as vm_name %}You're receiving this mail because your virtual machine [{{vm_name}}] has been cancelled.
-You can see your order status by clicking [my VM page] below.
-If you want to order a new virtual machine, you can do it by clicking this link.
-{% endblocktrans %} -
- {% trans 'My VM page' %} -
-{% endblock %} +{% load static i18n %} + + + + + + + {% trans "Virtual Machine Cancellation" %} + + + + + + + + + + + + + + + + + + + + + +
+ +
+

{% trans "Virtual Machine Cancellation" %}

+
+

+ {% blocktrans %}You are receiving this email because your virutal machine {{ vm_name }} has been cancelled.{% endblocktrans %} +

+

+ {% blocktrans %}You can always order a new VM by clicking the button below.{% endblocktrans %} +

+
+ {% trans "CREATE VM" %} +
+

{% trans "Your Data Center Light Team" %}

+
+ + + diff --git a/hosting/templates/hosting/emails/vm_canceled.txt b/hosting/templates/hosting/emails/vm_canceled.txt index e20e639c..9149a554 100644 --- a/hosting/templates/hosting/emails/vm_canceled.txt +++ b/hosting/templates/hosting/emails/vm_canceled.txt @@ -1,13 +1,10 @@ -{% extends "datacenterlight/emails/base_email_datacenterlight.txt" %} {% load i18n %} -{% block email_head %}{{page_header}}{% endblock %} -{% block email_body %} -{% url 'hosting:virtual_machines' as my_virtual_machines_url %} -{% url 'hosting:orders' order.id as vm_order_url %} -{% blocktrans with vm.name as vm_name %}You're receiving this mail because your virtual machine [{{vm_name}}] has been cancelled. -You can see your order status by clicking here -{{base_url}}{{vm_order_url}} -If you want to order a new virtual machine, you can do it by clicking this link. -{{base_url}}{{my_virtual_machines_url}} -{% endblocktrans %} -{% endblock %} \ No newline at end of file + +{% trans "Virtual Machine Cancellation" %} + +{% blocktrans %}You are receiving this email because your virutal machine {{vm_name}} has been cancelled.{% endblocktrans %} +{% blocktrans %}You can always order a new VM by following the link below.{% endblocktrans %} + +{{ base_url }}{% url 'hosting:create_virtual_machine' %} + +{% trans "Your Data Center Light Team" %} \ No newline at end of file diff --git a/hosting/templates/hosting/includes/_messages.html b/hosting/templates/hosting/includes/_messages.html index 13500fdb..12540558 100644 --- a/hosting/templates/hosting/includes/_messages.html +++ b/hosting/templates/hosting/includes/_messages.html @@ -1,8 +1,7 @@ {% if messages %} {% endif %} \ No newline at end of file diff --git a/hosting/templates/hosting/includes/_navbar_transparent.html b/hosting/templates/hosting/includes/_navbar_transparent.html index dec9cd49..8a97ae11 100644 --- a/hosting/templates/hosting/includes/_navbar_transparent.html +++ b/hosting/templates/hosting/includes/_navbar_transparent.html @@ -1,11 +1,13 @@ {% load static i18n %} \ No newline at end of file diff --git a/hosting/templates/hosting/login.html b/hosting/templates/hosting/login.html index eda3fffa..7832ec7d 100644 --- a/hosting/templates/hosting/login.html +++ b/hosting/templates/hosting/login.html @@ -1,49 +1,43 @@ {% extends "hosting/base_short.html" %} -{% load i18n %} -{% load staticfiles bootstrap3%} +{% load i18n staticfiles bootstrap3%} {% block navbar %} - {% include 'hosting/includes/_navbar_transparent.html' %} + {% include 'hosting/includes/_navbar_transparent.html' %} {% endblock navbar %} {% block content %} -
-
-
-
-

{% trans "Your VM hosted in Switzerland"%}

-
-
-
-

{% trans "Login"%}

- {% include 'hosting/includes/_messages.html' %} -
- {% csrf_token %} - {% for field in form %} - {% bootstrap_field field show_label=False type='fields'%} - {% endfor %} -

{{form.non_field_errors|striptags}}

- {% buttons %} - - {% endbuttons %} - -
-
-
- {% trans "Don't have an account yet ? "%} -
-
- {% trans "Sign up"%} - or - {% trans "Forgot your password ? "%} - or
- {% trans "Resend activation link"%} +
+
+
+
+
+

{% trans "Log in" %}

+ {% include 'hosting/includes/_messages.html' %} +
+ {% csrf_token %} + {% for field in form %} + {% bootstrap_field field show_label=False type='fields'%} + {% endfor %} +

{{form.non_field_errors|striptags}}

+
+ +
+ +
+
+
+ {% trans "Don't have an account yet ?" %}  + {% trans "Sign up" %} +
+
-
{% endblock %} diff --git a/hosting/templates/hosting/order_detail.html b/hosting/templates/hosting/order_detail.html index c81a893f..fe200f6e 100644 --- a/hosting/templates/hosting/order_detail.html +++ b/hosting/templates/hosting/order_detail.html @@ -32,11 +32,11 @@ {% endif %}

{% trans "Date" %}: - + {% if order %} - {{order.created_at|date:'Y-m-d H:i'}} + {{order.created_at|date:'Y-m-d h:i a'}} {% else %} - {% now "Y-m-d H:i" %} + {% now "Y-m-d h:i a" %} {% endif %}

@@ -107,7 +107,9 @@ {% if vm.created_at %}

{% trans "Period" %}: - {{ vm.created_at|date:'Y/m/d' }} - {% if vm.terminated_at %}{{ vm.terminated_at|date:'Y/m/d' }}{% else %}{% now 'Y/m/d' %}{% endif %} + + {{ vm.created_at|date:'Y-m-d h:i a' }} - {{ subscription_end_date|date:'Y-m-d h:i a' }} +

{% endif %}

@@ -194,12 +196,16 @@ {%endblock%} diff --git a/hosting/templates/hosting/resend_activation_link.html b/hosting/templates/hosting/resend_activation_link.html index c3f76f76..b9fe6f49 100644 --- a/hosting/templates/hosting/resend_activation_link.html +++ b/hosting/templates/hosting/resend_activation_link.html @@ -1,37 +1,40 @@ {% extends "hosting/base_short.html" %} -{% load staticfiles bootstrap3%} -{% load i18n %} +{% load staticfiles bootstrap3 i18n %} {% block navbar %} - {% include 'hosting/includes/_navbar_transparent.html' %} + {% include 'hosting/includes/_navbar_transparent.html' %} {% endblock navbar %} - {% block content %} -

-
+
+
-
-

{% trans "Your VM hosted in Switzerland"%}

-
-
-
-
+
{% endblock %} diff --git a/hosting/templates/hosting/reset_password.html b/hosting/templates/hosting/reset_password.html index a4986b5b..87cb24e4 100644 --- a/hosting/templates/hosting/reset_password.html +++ b/hosting/templates/hosting/reset_password.html @@ -1,44 +1,37 @@ {% extends "hosting/base_short.html" %} -{% load staticfiles bootstrap3%} -{% load i18n %} +{% load i18n staticfiles bootstrap3%} {% block navbar %} - {% include 'hosting/includes/_navbar_transparent.html' %} + {% include 'hosting/includes/_navbar_transparent.html' %} {% endblock navbar %} - {% block content %} -
-
+
+
-
-

{% trans "Your VM hosted in Switzerland"%}

-
-
-
+
{% endblock %} diff --git a/hosting/templates/hosting/signup.html b/hosting/templates/hosting/signup.html index a6f6f592..59d0957a 100644 --- a/hosting/templates/hosting/signup.html +++ b/hosting/templates/hosting/signup.html @@ -2,41 +2,36 @@ {% load staticfiles bootstrap3 i18n %} {% block navbar %} - {% include 'hosting/includes/_navbar_transparent.html' %} + {% include 'hosting/includes/_navbar_transparent.html' %} {% endblock navbar %} {% block content %} -
-

Sie müssen dann nur noch Ihre Geräte anschliessen und schon surfen Sie bllitzschnell im Internet!

+

Sie müssen dann nur noch Ihre Geräte anschliessen und schon surfen Sie blitzschnell im Internet!

diff --git a/ungleich_page/templates/ungleich_page/glasfaser/_about_item.html b/ungleich_page/templates/ungleich_page/glasfaser/_about_item.html new file mode 100644 index 00000000..6b619579 --- /dev/null +++ b/ungleich_page/templates/ungleich_page/glasfaser/_about_item.html @@ -0,0 +1,12 @@ +
  • + {% if instance.link_url %}{% endif %} +
    + +
    + {% if instance.link_url %}    {% endif %} +
    +
    +

    {{ instance.title }}

    +
    +
    +
    • \ No newline at end of file diff --git a/ungleich_page/templates/ungleich_page/glasfaser/_services_item.html b/ungleich_page/templates/ungleich_page/glasfaser/_services_item.html new file mode 100644 index 00000000..e2433953 --- /dev/null +++ b/ungleich_page/templates/ungleich_page/glasfaser/_services_item.html @@ -0,0 +1,7 @@ +
    + +
    +

    {{ instance.title }}

    +

    {{ instance.description }}

    +
    +
    \ No newline at end of file diff --git a/ungleich_page/templates/ungleich_page/glasfaser/menus.html b/ungleich_page/templates/ungleich_page/glasfaser/menus.html new file mode 100644 index 00000000..aa5d8abf --- /dev/null +++ b/ungleich_page/templates/ungleich_page/glasfaser/menus.html @@ -0,0 +1,12 @@ +{% load menu_tags %} + +{% for child in children %} +
  • + {{ child.get_menu_title }} + {% if child.children %} +
      + {% show_menu from_level to_level extra_inactive extra_active template "" "" child %} +
    + {% endif %} +
    • +{% endfor %} \ No newline at end of file diff --git a/ungleich_page/templates/ungleich_page/glasfaser/section_about.html b/ungleich_page/templates/ungleich_page/glasfaser/section_about.html new file mode 100644 index 00000000..5e3f0410 --- /dev/null +++ b/ungleich_page/templates/ungleich_page/glasfaser/section_about.html @@ -0,0 +1,18 @@ +{% load cms_tags %} +
    +
    +
    +

    {{ about_instance.title }}

    +

    {{ about_instance.sub_title }}

    +
    +
    +
    +
      + {% for plugin in about_instance.child_plugin_instances %} + {% render_plugin plugin %} + {% endfor %} +
    +
    +
    +
    +
    \ No newline at end of file diff --git a/ungleich_page/templates/ungleich_page/glasfaser/section_contact.html b/ungleich_page/templates/ungleich_page/glasfaser/section_contact.html new file mode 100644 index 00000000..26a3275c --- /dev/null +++ b/ungleich_page/templates/ungleich_page/glasfaser/section_contact.html @@ -0,0 +1,83 @@ +{% load i18n %} + +
    +
    +
    +
    +
    +
    +

    {{instance.contact_text}}

    +
    +
    +
    +

    {{instance.organization_name}}

    +
    +
    +

    {{instance.email}}

    +

    {{instance.address}}

    +

    {{instance.country}}

    +
    +
    + +
    +
    +
    + {% if success %} +
    +
    +

    {% trans "Thank you for contacting us." %}

    +
    +

    + {% trans "Your message was successfully sent to our team." %} +

    +
    + {% else %} +
    +
    +
    +

    {{instance.contact_form_header_text}}

    +
    +
    +
    +
    + {% csrf_token %} + +
    + +
    + + {{contact_form.name.errors}} +
    +
    +
    + +
    + + {{contact_form.email.errors}} +
    +
    +
    + +
    + + {{contact_form.message.errors}} +
    +
    +
    +
    +
    {% trans "Sorry, there was an unexpected error. Kindly retry." %}
    + +
    +
    +
    + {% endif %} +
    +
    +
    +
    +
    +
    \ No newline at end of file diff --git a/ungleich_page/templates/ungleich_page/glasfaser/section_services.html b/ungleich_page/templates/ungleich_page/glasfaser/section_services.html new file mode 100644 index 00000000..4f373653 --- /dev/null +++ b/ungleich_page/templates/ungleich_page/glasfaser/section_services.html @@ -0,0 +1,16 @@ +{% load static i18n cms_tags %} +
    +
    +
    +

    {{ service_instance.title }}

    +

    {{ service_instance.sub_title }}

    +
    +
    + {% for plugin in service_instance.child_plugin_instances %} +
    + {% render_plugin plugin %} +
    + {% endfor %} +
    +
    +
    \ No newline at end of file diff --git a/ungleich_page/templates/ungleich_page/glasfaser/section_text_dcl.html b/ungleich_page/templates/ungleich_page/glasfaser/section_text_dcl.html new file mode 100644 index 00000000..e45504f3 --- /dev/null +++ b/ungleich_page/templates/ungleich_page/glasfaser/section_text_dcl.html @@ -0,0 +1,12 @@ +
    +
    +
    +
    +

    {{instance.title}}

    +
    +
    +

    {{instance.description}}

    +
    +
    +
    +
    \ No newline at end of file diff --git a/ungleich_page/templates/ungleich_page/glasfaser/section_text_glasfaser.html b/ungleich_page/templates/ungleich_page/glasfaser/section_text_glasfaser.html new file mode 100644 index 00000000..d3d83dfc --- /dev/null +++ b/ungleich_page/templates/ungleich_page/glasfaser/section_text_glasfaser.html @@ -0,0 +1,13 @@ +
    +
    +
    +
    +

    {{instance.title}}

    +

    +
    +
    +

    {{instance.description}}

    +
    +
    +
    +
    \ No newline at end of file diff --git a/ungleich_page/templates/ungleich_page/glasfaser/section_with_image.html b/ungleich_page/templates/ungleich_page/glasfaser/section_with_image.html new file mode 100644 index 00000000..20090fa2 --- /dev/null +++ b/ungleich_page/templates/ungleich_page/glasfaser/section_with_image.html @@ -0,0 +1,10 @@ +
    +
    + {% if object.price_tag_url %}{% endif %}{% if object.price_tag_image %}
    {% endif %}{% if object.price_tag_url %}    {% endif %} +
    +
    +
    +

    {{ object.title }}

    +
    +
    +
    \ No newline at end of file diff --git a/ungleich_page/templates/ungleich_page/glasfaser_cms_page.html b/ungleich_page/templates/ungleich_page/glasfaser_cms_page.html new file mode 100644 index 00000000..03c1ed12 --- /dev/null +++ b/ungleich_page/templates/ungleich_page/glasfaser_cms_page.html @@ -0,0 +1,107 @@ +{% load static bootstrap3 i18n cms_tags sekizai_tags menu_tags %} +{% get_current_language as LANGUAGE_CODE %} + + + + + + + + + + {% page_attribute "page_title" %} + + + + + + + + + + + + + + + + + {% addtoblock "css" %} + + {% endaddtoblock %} + {% render_block "css" postprocessor "compressor.contrib.sekizai.compress" %} + {% render_block "js" postprocessor "compressor.contrib.sekizai.compress" %} + + + {% include "google_analytics.html" %} + + + + + + +{% cms_toolbar %} + + + {% placeholder 'Top Section' %} + + {% placeholder 'Middle Section' %} + + {% placeholder 'Glasfaser Services' %} + + {% placeholder 'Glasfaser About' %} + + {% placeholder 'Contact Section' %} + + + {% include "ungleich_page/includes/_footer.html" %} + + + + + + + + + + + + + + + + + + + + diff --git a/ungleich_page/templates/ungleich_page/includes/_about.html b/ungleich_page/templates/ungleich_page/includes/_about.html index 0b8218d9..88f8a023 100644 --- a/ungleich_page/templates/ungleich_page/includes/_about.html +++ b/ungleich_page/templates/ungleich_page/includes/_about.html @@ -1,5 +1,4 @@ -{% load static %} -{% load i18n %} +{% load static i18n %}
    @@ -10,7 +9,7 @@
    • - +
      @@ -20,11 +19,11 @@

      {% trans "The first incarnation of ungleich" %}

      {% trans "in Germany" %}

      -
      +
  • - +
    @@ -32,13 +31,13 @@

    {% trans "ungleich founded" %}

    -

    {% trans "in Switzerland" %}

    +

    {% trans "in Switzerland" %}

  • - +
    @@ -52,40 +51,68 @@
  • - +
    -

    2015

    +

    2015

    {% trans "ungleich introduces HA-Hosting" %}

    {% trans "and introduces affordable 24X7 support." %}

    -

    {% trans "ungleich launches" %} - {% trans "Digital Glarus project" %}

    +

    + {% trans "ungleich launches" %} + {% trans "Digital Glarus project" %} +

  • - +
    -

    2016

    +

    2016

    {% blocktrans %}ungleich launches Alplora, an animal tracking service with LoraWAN technology.{% endblocktrans %}

    • +
  • +
    + +
    +
    +
    +

    2016

    +
    +
    +

    {% trans "ungleich starts to give basic computer courses for refugees." %}

    +
    +
    +
  • - +
    -

    2017

    +

    2017

    +
    +
    +

    {% trans 'ungleich starts computer learning club for locals, "Digitale Building ungleich."' %}

    +
    +
    +
    • +
  • +
    + +
    +
    +
    +

    2017

    {% blocktrans %}ungleich sells Alplora to an IoT startup in canton Zürich.{% endblocktrans %}

    @@ -95,8 +122,11 @@
  • -

    {% trans "and" %}
    {% trans "the story continues!" %}

    -

     

    +
    +
    +
    +

    {% trans "and" %}
    {% trans "the story continues!" %}

    +
    • diff --git a/ungleich_page/templates/ungleich_page/includes/_contact_us.html b/ungleich_page/templates/ungleich_page/includes/_contact_us.html index 5c4d2da0..1038f358 100644 --- a/ungleich_page/templates/ungleich_page/includes/_contact_us.html +++ b/ungleich_page/templates/ungleich_page/includes/_contact_us.html @@ -2,27 +2,27 @@ {% load i18n %}
    +
    -
    -
    +
    +
    {% for message in messages %} {% endfor %}

    {% trans "Contact Us" %}

    -
    - -

    {% trans "Join us at" %} {% trans "Digital Glarus" %}, - {% trans "a great co-working space in the middle of Alps!" %} -

    {% trans "You can contact us at" %}

    -

    info@ungleich.ch +

    + {% trans "Join us at" %} {% trans "Digital Glarus" %}, {% trans "a great co-working space in the middle of Alps!" %}
    + {% trans "You can contact us at" %} +

    +

    + info@ungleich.ch

    -

    (044) 534-66-22

    +

    (044) 534-66-22

    @@ -62,12 +62,6 @@
    -->
    -

     

    -
    -
    -
    - -
    \ No newline at end of file diff --git a/ungleich_page/templates/ungleich_page/includes/_footer.html b/ungleich_page/templates/ungleich_page/includes/_footer.html index 1b0eb595..014a99e5 100644 --- a/ungleich_page/templates/ungleich_page/includes/_footer.html +++ b/ungleich_page/templates/ungleich_page/includes/_footer.html @@ -9,17 +9,21 @@
    diff --git a/ungleich_page/templates/ungleich_page/includes/_header.html b/ungleich_page/templates/ungleich_page/includes/_header.html index a86f2f24..e9a8a62a 100644 --- a/ungleich_page/templates/ungleich_page/includes/_header.html +++ b/ungleich_page/templates/ungleich_page/includes/_header.html @@ -1,17 +1,53 @@ -{% load static %} -{% load i18n %} +{% load static i18n %} -
    -
    -
    - -


    -
    - - {% trans "We Design, Configure & Maintain
    Your Linux Infrastructure " %} -     -
    +
    + + +
    +
    +
    +
    +
    + {% trans "We Design, Configure & Maintain
    Your Linux Infrastructure " %} +
    +

    Ruby on Rails, Django, Java, Webserver, Mailserver, any infrastructure that needs to configured, we provide comprehensive solutions. Amazon, rackspace or bare metal servers, we configure for you.

    + Learn More +
    +
    +
    +
    +
    +
    + {% trans "We Design, Configure & Maintain
    Your Linux Infrastructure " %} +
    +

    Ruby on Rails, Django, Nothing else.

    + Learn More +
    +
    +
    +
    +
    +
    + {% trans "We Design, Configure & Maintain
    Your Linux Infrastructure " %} +
    + Learn More +
    +
    -
    \ No newline at end of file + + + Previous + + + + Next + +
    +
    diff --git a/ungleich_page/templates/ungleich_page/includes/_portfolio.html b/ungleich_page/templates/ungleich_page/includes/_portfolio.html index de27d731..b30993be 100644 --- a/ungleich_page/templates/ungleich_page/includes/_portfolio.html +++ b/ungleich_page/templates/ungleich_page/includes/_portfolio.html @@ -3,35 +3,30 @@
    +
    +

    {% trans "Our Products" %}

    +

    {% blocktrans %}Our products include an innovative datacenter,
    affordable VM hosting, and high speed fiber internet for canton Glarus.{% endblocktrans %}

    +
    -
    -

    {% trans "Hosting Products " %}

    -

    {% trans "Hosting Products " %}

    -
    -
    -
    -
    +

    {% trans "Data Center Light" %}

    -

     

    -

    {% trans "We offer the most affordable hosting in Switzerland. Data Center Light has full FOSS stack, 100% IPv6 and 100% SSD. Choose any configuration among CentOS, Debian, Ubuntu, Devuan, and FreeBSD." %}

    +

    {% trans "We offer the most affordable hosting in Switzerland. Data Center Light has full FOSS stack, 100% IPv6 and 100% SSD. Choose any configuration among CentOS, Debian, Ubuntu, Devuan, and FreeBSD." %}

    -
    +

    {% trans "Rails Hosting" %}

    -

     

    -

    {% trans "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." %}

    +

    {% trans "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." %}

    -
    +

    {% trans "High Speed Internet" %}

    -

     

    -

    {% trans "We offer high speed fiber internet in Glarus Süd, Glarus and Glarus Nord. Experience 100 Mbit/s and see how speed can change everything." %}

    +

    {% trans "We offer high speed fiber internet in Glarus Süd, Glarus and Glarus Nord. Experience 100 Mbit/s and see how speed can change everything." %}

    diff --git a/ungleich_page/templates/ungleich_page/includes/_services.html b/ungleich_page/templates/ungleich_page/includes/_services.html index 5a0ef848..3f2311f0 100644 --- a/ungleich_page/templates/ungleich_page/includes/_services.html +++ b/ungleich_page/templates/ungleich_page/includes/_services.html @@ -2,48 +2,42 @@ {% load i18n %}
    -
    -
    -
    -

    {% trans "our services" %}

    -

    - {% trans "We support our clients in all areas of Unix infrastructure." %}
    - {% trans "Our top notch configuration management is refreshingly simple and reliable." %} -

    -
    -
    +
    +
    +

    {% trans "our services" %}

    +

    + {% trans "We support our clients in all areas of Unix infrastructure." %}
    + {% trans "Our top notch configuration management is refreshingly simple and reliable." %} +

    +
    -
    +
    -

    {% trans "Hosting" %}

    -

     

    -

    {% trans "Ruby on Rails. Java hosting, Django hosting, we make it everything run smooth and safe." %}

    +

    {% trans "Hosting" %}

    +

    {% trans "Ruby on Rails. Java hosting, Django hosting, we make it everything run smooth and safe." %}

    -
    +
    -

    {% trans "Configuration as a Service" %}

    -

     

    -

    {% trans "Ruby on Rails, Django, Java, Webserver, Mailserver, any infrastructure that needs to configured, we provide comprehensive solutions. Amazon, rackspace or bare metal servers, we configure for you." %}

    -

     

    +

    {% trans "Configuration as a Service" %}

    +

    {% trans "Ruby on Rails, Django, Java, Webserver, Mailserver, any infrastructure that needs to configured, we provide comprehensive solutions. Amazon, rackspace or bare metal servers, we configure for you." %}

    -
    +
    -

    {% trans "Linux System Engineering" %}

    -

     

    -

    {% trans "Let your developers develop! We take care of your system administration. Gentoo, Archlinux, Debian, Ubuntu, and many more." %}

    +

    {% trans "Linux System Engineering" %}

    +

    {% trans "Let your developers develop! We take care of your system administration. Gentoo, Archlinux, Debian, Ubuntu, and many more." %}

    -
    +
    diff --git a/ungleich_page/templates/ungleich_page/includes/_softwares.html b/ungleich_page/templates/ungleich_page/includes/_softwares.html index b5ece4d8..669e5f32 100644 --- a/ungleich_page/templates/ungleich_page/includes/_softwares.html +++ b/ungleich_page/templates/ungleich_page/includes/_softwares.html @@ -4,112 +4,112 @@
    - - + +
    - - + +
    - - + +
    - - + +
    - - + +
    - - + +
    - - + +
    - - + +
    - - + +
    - - + +
    - - + +
    - - + +
    - - + +
    - - + +
    - - + +
    - - + +
    - - + +
    - - + +
    - - + +
    - - + +
    diff --git a/ungleich_page/templates/ungleich_page/includes/_team.html b/ungleich_page/templates/ungleich_page/includes/_team.html index a9a32c74..339008aa 100644 --- a/ungleich_page/templates/ungleich_page/includes/_team.html +++ b/ungleich_page/templates/ungleich_page/includes/_team.html @@ -3,29 +3,27 @@
    -
    -
    -

    {% trans "Why ungleich?*" %}

    -

    {% trans "What our customers say" %}

    -
    -
    +
    +

    {% trans "Why ungleich?*" %}

    +

    {% trans "What our customers say" %}

    +
    -
    +
      -
    1. -
    2. -
    3. +
    4. +
    5. +
    -
    - -

    +

    + +

    {% blocktrans %} "ungleich helped us getting started with our internal infrastructure, hosted on physical servers in a @@ -40,14 +38,14 @@ engineers to work more efficiently and comfortable than before." {% endblocktrans %} -

    -

    - - Luciano Franceschina, CTO at Teralytics -

    -
    -
    - -

    +

    +

    + - Luciano Franceschina, CTO at Teralytics +

    +
    +
    + +

    {% blocktrans %} "Thanks to ungleich team, who has designed and configured our company's Linux infrastructure, our @@ -56,14 +54,14 @@ significantly not only in cost but also in time saving, which is crucial for IT companies like ours." {% endblocktrans %} -

    -

    - - Beat Seeliger , CTO at Panter AG -

    -
    -
    - -

    +

    +

    + - Beat Seeliger , CTO at Panter AG +

    +
    +
    + +

    {% blocktrans %} "ungleich provided an excellent service in designing our system architecture and created secure and stable @@ -77,21 +75,21 @@ recommend them to any companies with high demand in solid infrastructures." {% endblocktrans %} -

    -

    +

    +

    {% blocktrans %} - Sebastian Plattner, Teamleader Development Cyber Security Products at RUAG {% endblocktrans %} -

    -
    +

    +
    -
    -

    {% blocktrans %}*ungleich means not equal to (≠) U+2260.{% endblocktrans %}

    +
    +

    {% blocktrans %}*ungleich means not equal to (≠) U+2260.{% endblocktrans %}

    \ 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 ebfd346c..a1434929 100644 --- a/ungleich_page/templates/ungleich_page/landing.html +++ b/ungleich_page/templates/ungleich_page/landing.html @@ -1,6 +1,5 @@ -{% load static %} -{% load bootstrap3 %} -{% load i18n %} +{% load static i18n %} + @@ -13,10 +12,10 @@ ungleich GmbH - - + + @@ -45,16 +44,15 @@
    -

    - -

     

    + + +
    @@ -64,13 +62,11 @@
  • - {% trans "Services"%}
    • -
  • -
  • -
  • + {% trans "Services"%} +
  • - {% trans "products"%}
    • -
  • + {% trans "products"%} +
  • {% trans "About"%}
    • @@ -78,7 +74,7 @@ {% trans "WHY UNGLEICH?"%}
  • - {% trans "BLOG"%} + {% trans "BLOG"%}
  • {% trans "CONTACT"%} @@ -114,19 +110,6 @@ {% include "ungleich_page/includes/_footer.html" %} - - - - - - - - - - - - - - + - - + + - - + - - - - - - - + diff --git a/ungleich_page/templates/ungleich_page/ungleich/_customer_item.html b/ungleich_page/templates/ungleich_page/ungleich/_customer_item.html new file mode 100644 index 00000000..d49183ae --- /dev/null +++ b/ungleich_page/templates/ungleich_page/ungleich/_customer_item.html @@ -0,0 +1,2 @@ + +{{ instance.description }} \ No newline at end of file diff --git a/ungleich_page/templates/ungleich_page/ungleich/_header_item.html b/ungleich_page/templates/ungleich_page/ungleich/_header_item.html new file mode 100644 index 00000000..a770d1ed --- /dev/null +++ b/ungleich_page/templates/ungleich_page/ungleich/_header_item.html @@ -0,0 +1,14 @@ +
    +
    + {% if instance.image %} + +
    + {% endif %} +
    + + {{ instance.description }} + +
    +
    +
    diff --git a/ungleich_page/templates/ungleich_page/ungleich/_header_with_background_image_slider_item.html b/ungleich_page/templates/ungleich_page/ungleich/_header_with_background_image_slider_item.html new file mode 100644 index 00000000..063a0a7b --- /dev/null +++ b/ungleich_page/templates/ungleich_page/ungleich/_header_with_background_image_slider_item.html @@ -0,0 +1,4 @@ +
    +
    + {{ instance.description }} +
    \ No newline at end of file diff --git a/ungleich_page/templates/ungleich_page/ungleich/_products_item.html b/ungleich_page/templates/ungleich_page/ungleich/_products_item.html new file mode 100644 index 00000000..0a09640d --- /dev/null +++ b/ungleich_page/templates/ungleich_page/ungleich/_products_item.html @@ -0,0 +1,6 @@ + +
    +

    {{ instance.title }}

    +

     

    +

    {{ instance.description }}

    +
    \ No newline at end of file diff --git a/ungleich_page/templates/ungleich_page/ungleich/_services_item.html b/ungleich_page/templates/ungleich_page/ungleich/_services_item.html new file mode 100644 index 00000000..62d462e4 --- /dev/null +++ b/ungleich_page/templates/ungleich_page/ungleich/_services_item.html @@ -0,0 +1,8 @@ +
    + +
    +

    {{ instance.title }}

    +

     

    +

    {{ instance.description }}

    +
    +
    \ No newline at end of file diff --git a/ungleich_page/templates/ungleich_page/ungleich/header.html b/ungleich_page/templates/ungleich_page/ungleich/header.html new file mode 100644 index 00000000..77c7ffdf --- /dev/null +++ b/ungleich_page/templates/ungleich_page/ungleich/header.html @@ -0,0 +1,15 @@ +{% load cms_tags %} + +
    +
    +
    + +


    +
    + + {{ instance.text }} + +
    +
    +
    +
    diff --git a/ungleich_page/templates/ungleich_page/ungleich/header_with_background_image_slider.html b/ungleich_page/templates/ungleich_page/ungleich/header_with_background_image_slider.html new file mode 100644 index 00000000..a3ee0d37 --- /dev/null +++ b/ungleich_page/templates/ungleich_page/ungleich/header_with_background_image_slider.html @@ -0,0 +1,31 @@ +{% load cms_tags %} +
    + +
    \ No newline at end of file diff --git a/ungleich_page/templates/ungleich_page/ungleich/header_with_slider.html b/ungleich_page/templates/ungleich_page/ungleich/header_with_slider.html new file mode 100644 index 00000000..9cf759e6 --- /dev/null +++ b/ungleich_page/templates/ungleich_page/ungleich/header_with_slider.html @@ -0,0 +1,21 @@ +{% load cms_tags %} +
    + +
    \ No newline at end of file diff --git a/ungleich_page/templates/ungleich_page/ungleich/html_block.html b/ungleich_page/templates/ungleich_page/ungleich/html_block.html new file mode 100644 index 00000000..65c7b792 --- /dev/null +++ b/ungleich_page/templates/ungleich_page/ungleich/html_block.html @@ -0,0 +1,5 @@ +{% load cms_tags static %} +{{instance.HTML}} +{% for plugin in instance.child_plugin_instances %} + {% render_plugin plugin %} +{% endfor %} diff --git a/ungleich_page/templates/ungleich_page/ungleich/section_customers.html b/ungleich_page/templates/ungleich_page/ungleich/section_customers.html new file mode 100644 index 00000000..afe67b2a --- /dev/null +++ b/ungleich_page/templates/ungleich_page/ungleich/section_customers.html @@ -0,0 +1,35 @@ +{% load cms_tags custom_tags %} +
    +
    +
    +

    {{ customer_instance.title }}

    +

    {{ customer_instance.sub_title }}

    +
    +
    +
    + +
    + +
      + {% for plugin in customer_instance.child_plugin_instances %} +
    1. + {% endfor %} +
    + + +
    + {% for plugin in customer_instance.child_plugin_instances %} +
    + {% render_plugin plugin %} +
    + {% endfor %} +
    +
    + +
    +
    +
    +
    + {{customer_instance.bottom_text}} +
    +
    \ No newline at end of file diff --git a/ungleich_page/templates/ungleich_page/ungleich/section_products.html b/ungleich_page/templates/ungleich_page/ungleich/section_products.html new file mode 100644 index 00000000..a87d6493 --- /dev/null +++ b/ungleich_page/templates/ungleich_page/ungleich/section_products.html @@ -0,0 +1,20 @@ +{% load cms_tags custom_tags %} +
    +
    +
    +
    +
    +

    {{ product_instance.title }}

    + {{ product_instance.sub_title }} +
    +
    +
    + {% for plugin in product_instance.child_plugin_instances %} +
    + {% render_plugin plugin %} +
    + {% endfor %} +
    +
    +
    +
    \ No newline at end of file diff --git a/ungleich_page/templates/ungleich_page/ungleich/section_services.html b/ungleich_page/templates/ungleich_page/ungleich/section_services.html new file mode 100644 index 00000000..20be5ec8 --- /dev/null +++ b/ungleich_page/templates/ungleich_page/ungleich/section_services.html @@ -0,0 +1,16 @@ +{% load cms_tags %} +
    +
    +
    +

    {{ service_instance.title }}

    + {{ service_instance.sub_title }} +
    +
    + {% for plugin in service_instance.child_plugin_instances %} +
    + {% render_plugin plugin %} +
    + {% endfor %} +
    +
    +
    diff --git a/ungleich_page/templates/ungleich_page/ungleich_cms_page.html b/ungleich_page/templates/ungleich_page/ungleich_cms_page.html new file mode 100644 index 00000000..707d0dab --- /dev/null +++ b/ungleich_page/templates/ungleich_page/ungleich_cms_page.html @@ -0,0 +1,75 @@ +{% load static i18n cms_tags sekizai_tags %} + + + + + + + + + + + + {% page_attribute "page_title" %} + + + + + + + + + + + + + + {% render_block "css" postprocessor "compressor.contrib.sekizai.compress" %} + {% render_block "js" postprocessor "compressor.contrib.sekizai.compress" %} + + {% include "google_analytics.html" %} + + + + + + +{% cms_toolbar %} + {% placeholder 'Ungleich Page Contents' %} + + + {% include "ungleich_page/includes/_footer.html" %} + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/utils/locale/de/LC_MESSAGES/django.po b/utils/locale/de/LC_MESSAGES/django.po index a8926cd0..f18fc9c2 100644 --- a/utils/locale/de/LC_MESSAGES/django.po +++ b/utils/locale/de/LC_MESSAGES/django.po @@ -736,7 +736,7 @@ msgid "Unknown or unspecified country" msgstr "" msgid "Enter your name or company name" -msgstr "Geben Sie Ihren Namen oder der Ihrer Firma ein" +msgstr "Gib Deinen Namen oder den Name Deines Unternehmens ein" msgid "Your username and/or password were incorrect." msgstr "Dein Benutzername und/oder Dein Passwort ist falsch." @@ -795,7 +795,7 @@ msgstr "Es wurde eine E-Mail mit dem Aktivierungslink an Dich gesendet." msgid "Account Activation" msgstr "Accountaktivierung" -msgid "The link to reset your email has been sent to your email" +msgid "The link to reset your password has been sent to your email" msgstr "" "Der Link zum Zurücksetzen deines Passwortes wurde an deine E-Mail gesendet" diff --git a/utils/test_forms.py b/utils/test_forms.py index 46285fc5..5bca7f32 100644 --- a/utils/test_forms.py +++ b/utils/test_forms.py @@ -75,6 +75,7 @@ class BillingAddressFormTest(TestCase): def setUp(self): self.completed_data = { + 'cardholder_name': 'test', 'street_address': 'street name', 'city': 'MyCity', 'postal_code': '32123123123123', diff --git a/utils/tests.py b/utils/tests.py index d5c2d726..ce54800a 100644 --- a/utils/tests.py +++ b/utils/tests.py @@ -28,8 +28,8 @@ class BaseTestCase(TestCase): # Users self.customer, self.another_customer = mommy.make( - 'membership.CustomUser', - _quantity=2) + 'membership.CustomUser', validated=1, _quantity=2 + ) self.customer.set_password(self.dummy_password) self.customer.save() self.another_customer.set_password(self.dummy_password) @@ -97,6 +97,9 @@ class BaseTestCase(TestCase): return view +@skipIf(settings.STRIPE_API_PRIVATE_KEY_TEST is None or + settings.STRIPE_API_PRIVATE_KEY_TEST is "", + """Skip because STRIPE_API_PRIVATE_KEY_TEST is not set""") class TestStripeCustomerDescription(TestCase): """ A class to test setting the description field of the stripe customer @@ -139,6 +142,10 @@ class TestStripeCustomerDescription(TestCase): self.assertEqual(customer_data.description, self.customer_name) +@skipIf(settings.STRIPE_API_PRIVATE_KEY_TEST == "" or + settings.TEST_MANAGE_SSH_KEY_HOST == "", + """Skipping test_save_ssh_key_add because either host + or public key were not specified or were empty""") class StripePlanTestCase(TestStripeCustomerDescription): """ A class to test Stripe plans @@ -161,6 +168,10 @@ class StripePlanTestCase(TestStripeCustomerDescription): self.assertIsNone(stripe_plan.get('error')) self.assertIsInstance(stripe_plan.get('response_object'), StripePlan) + @skipIf(settings.TEST_MANAGE_SSH_KEY_PUBKEY == "" or + settings.TEST_MANAGE_SSH_KEY_HOST == "", + """Skipping test_save_ssh_key_add because either host + or public key were not specified or were empty""") @patch('utils.stripe_utils.logger') def test_create_duplicate_plans_error_handling(self, mock_logger): """ @@ -254,10 +265,10 @@ class SaveSSHKeyTestCase(TestCase): self.public_key = settings.TEST_MANAGE_SSH_KEY_PUBKEY self.hosts = settings.TEST_MANAGE_SSH_KEY_HOST - @skipIf(settings.TEST_MANAGE_SSH_KEY_PUBKEY is None or - settings.TEST_MANAGE_SSH_KEY_PUBKEY == "" or - settings.TEST_MANAGE_SSH_KEY_HOST is None or - settings.TEST_MANAGE_SSH_KEY_HOST is "", + @skipIf(settings.TEST_MANAGE_SSH_KEY_PUBKEY is "" or + settings.TEST_MANAGE_SSH_KEY_PUBKEY is None or + settings.TEST_MANAGE_SSH_KEY_HOST is "" or + settings.TEST_MANAGE_SSH_KEY_HOST is None, """Skipping test_save_ssh_key_add because either host or public key were not specified or were empty""") def test_save_ssh_key_add(self): diff --git a/utils/views.py b/utils/views.py index a7d8c1c1..6e54cde6 100644 --- a/utils/views.py +++ b/utils/views.py @@ -104,7 +104,7 @@ class ResendActivationLinkViewMixin(FormView): class PasswordResetViewMixin(FormView): success_message = _( - "The link to reset your email has been sent to your email") + "The link to reset your password has been sent to your email") site = '' def test_generate_email_context(self, user):