diff --git a/Changelog b/Changelog index 5a3d2e12..cc93fa32 100644 --- a/Changelog +++ b/Changelog @@ -1,8 +1,11 @@ +1.2.6: 2017-10-10 + * Bugfix: [dcl] Refactor and optimize images, links in glasfaser page + * Bugfix: [dcl] Fix email not being sent issue 1.2.5: 2017-10-10 * #3785: [hosting] update 'my bills' page design * Bugfix: [hosting] card details input form alignment fix * #3823: [hosting] favicon link fixed - * #3844 [dcl] Add Glasfaser page for advertisement + * #3844: [dcl] Add Glasfaser page for advertisement 1.2.4: 2017-10-02 * #3780: [hosting] Store VM details locally @@ -197,6 +200,3 @@ * [datacenterlight] Fix initially shown price 1.0.0: 2017-05-25 * Initial stable release - - Next: - [datacenterlight] Fixed credit card input issue diff --git a/datacenterlight/static/datacenterlight/img/header-nico-sans-Recovered.jpg b/datacenterlight/static/datacenterlight/img/header-nico-sans-Recovered.jpg deleted file mode 100644 index 6dc9318e..00000000 Binary files a/datacenterlight/static/datacenterlight/img/header-nico-sans-Recovered.jpg and /dev/null differ diff --git a/datacenterlight/static/datacenterlight/img/header-nico-sans.jpg b/datacenterlight/static/datacenterlight/img/header-nico-sans.jpg deleted file mode 100644 index 32fd0b73..00000000 Binary files a/datacenterlight/static/datacenterlight/img/header-nico-sans.jpg and /dev/null differ diff --git a/datacenterlight/static/datacenterlight/img/header-pricetag.png b/datacenterlight/static/datacenterlight/img/header-pricetag.png deleted file mode 100644 index d4837563..00000000 Binary files a/datacenterlight/static/datacenterlight/img/header-pricetag.png and /dev/null differ diff --git a/datacenterlight/views.py b/datacenterlight/views.py index 5c5a9953..eec9fcf6 100644 --- a/datacenterlight/views.py +++ b/datacenterlight/views.py @@ -49,15 +49,17 @@ class ContactUsView(FormView): def form_valid(self, form): form.save() + from_emails = { + 'glasfaser': 'glasfaser@ungleich.ch' + } + from_page = self.request.POST.get('from_page') email_data = { 'subject': "{dcl_text} Message from {sender}".format( dcl_text=settings.DCL_TEXT, sender=form.cleaned_data.get('email') ), 'from_email': settings.DCL_SUPPORT_FROM_ADDRESS, - 'to': '{}@ungleich.ch'.format( - self.request.POST.get('from_page', 'info') - ), + 'to': [from_emails.get(from_page, 'info@ungleich.ch')], 'body': "\n".join( ["%s=%s" % (k, v) for (k, v) in form.cleaned_data.items()]), 'reply_to': [form.cleaned_data.get('email')], diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po index 4a2c80b7..20100308 100644 --- a/hosting/locale/de/LC_MESSAGES/django.po +++ b/hosting/locale/de/LC_MESSAGES/django.po @@ -173,10 +173,8 @@ msgstr "Anmelden" msgid "Create VM" msgstr "VM erstellen" -#, fuzzy -#| msgid "Your VM hosted in Switzerland" msgid "Affordable VM hosting based in Switzerland" -msgstr "Deine VM in der Schweiz" +msgstr "Bezahlbares VM Hosting in der Schweiz" msgid "My Dashboard" msgstr "Mein Dashboard" diff --git a/datacenterlight/static/datacenterlight/css/glasfaser.css b/ungleich_page/static/ungleich_page/css/glasfaser.css similarity index 95% rename from datacenterlight/static/datacenterlight/css/glasfaser.css rename to ungleich_page/static/ungleich_page/css/glasfaser.css index fd38e49e..a6518611 100644 --- a/datacenterlight/static/datacenterlight/css/glasfaser.css +++ b/ungleich_page/static/ungleich_page/css/glasfaser.css @@ -37,7 +37,7 @@ } .intro-header { - background: url(../img/header-nico-sans.jpg) no-repeat center center; + background: url(../img/glasfaser/header-nico-sans.jpg) no-repeat center center; background-size: cover; background-position: left; background-color: rgb(118, 140, 163); @@ -65,7 +65,7 @@ } .price-tag { - background: url(../img/header-pricetag.png) no-repeat center center; + background: url(../img/glasfaser/header-pricetag.png) no-repeat center center; height: 225px; width: 225px; background-size: cover; @@ -121,6 +121,7 @@ } .split-section { padding: 90px 0; + overflow: hidden; } .split-section.right { padding: 100px 0; diff --git a/ungleich_page/static/ungleich_page/img/glasfaser/a.jpg b/ungleich_page/static/ungleich_page/img/glasfaser/a.jpg new file mode 100644 index 00000000..d4b03578 Binary files /dev/null and b/ungleich_page/static/ungleich_page/img/glasfaser/a.jpg differ diff --git a/ungleich_page/static/ungleich_page/img/glasfaser/a.png b/ungleich_page/static/ungleich_page/img/glasfaser/a.png deleted file mode 100644 index fc53f20b..00000000 Binary files a/ungleich_page/static/ungleich_page/img/glasfaser/a.png and /dev/null differ diff --git a/ungleich_page/static/ungleich_page/img/glasfaser/b.jpg b/ungleich_page/static/ungleich_page/img/glasfaser/b.jpg new file mode 100644 index 00000000..5c23814d Binary files /dev/null and b/ungleich_page/static/ungleich_page/img/glasfaser/b.jpg differ diff --git a/ungleich_page/static/ungleich_page/img/glasfaser/b.png b/ungleich_page/static/ungleich_page/img/glasfaser/b.png deleted file mode 100644 index ff7947c0..00000000 Binary files a/ungleich_page/static/ungleich_page/img/glasfaser/b.png and /dev/null differ diff --git a/ungleich_page/static/ungleich_page/img/glasfaser/business.png b/ungleich_page/static/ungleich_page/img/glasfaser/business.png deleted file mode 100644 index 90990eaa..00000000 Binary files a/ungleich_page/static/ungleich_page/img/glasfaser/business.png and /dev/null differ diff --git a/ungleich_page/static/ungleich_page/img/glasfaser/business.svg b/ungleich_page/static/ungleich_page/img/glasfaser/business.svg new file mode 100644 index 00000000..ee18a4e3 --- /dev/null +++ b/ungleich_page/static/ungleich_page/img/glasfaser/business.svg @@ -0,0 +1,66 @@ + + + + diff --git a/ungleich_page/static/ungleich_page/img/glasfaser/c.jpg b/ungleich_page/static/ungleich_page/img/glasfaser/c.jpg new file mode 100644 index 00000000..ba890bd3 Binary files /dev/null and b/ungleich_page/static/ungleich_page/img/glasfaser/c.jpg differ diff --git a/ungleich_page/static/ungleich_page/img/glasfaser/c.png b/ungleich_page/static/ungleich_page/img/glasfaser/c.png deleted file mode 100644 index a145b839..00000000 Binary files a/ungleich_page/static/ungleich_page/img/glasfaser/c.png and /dev/null differ diff --git a/ungleich_page/static/ungleich_page/img/glasfaser/d.jpg b/ungleich_page/static/ungleich_page/img/glasfaser/d.jpg new file mode 100644 index 00000000..284216d0 Binary files /dev/null and b/ungleich_page/static/ungleich_page/img/glasfaser/d.jpg differ diff --git a/ungleich_page/static/ungleich_page/img/glasfaser/d.png b/ungleich_page/static/ungleich_page/img/glasfaser/d.png deleted file mode 100644 index d22a82d7..00000000 Binary files a/ungleich_page/static/ungleich_page/img/glasfaser/d.png and /dev/null differ diff --git a/ungleich_page/static/ungleich_page/img/glasfaser/header-nico-sans.jpg b/ungleich_page/static/ungleich_page/img/glasfaser/header-nico-sans.jpg new file mode 100644 index 00000000..d6398b05 Binary files /dev/null and b/ungleich_page/static/ungleich_page/img/glasfaser/header-nico-sans.jpg differ diff --git a/ungleich_page/static/ungleich_page/img/glasfaser/header-pricetag.png b/ungleich_page/static/ungleich_page/img/glasfaser/header-pricetag.png new file mode 100644 index 00000000..68a93682 Binary files /dev/null and b/ungleich_page/static/ungleich_page/img/glasfaser/header-pricetag.png differ diff --git a/ungleich_page/static/ungleich_page/img/glasfaser/ip.png b/ungleich_page/static/ungleich_page/img/glasfaser/ip.png deleted file mode 100644 index d20bff19..00000000 Binary files a/ungleich_page/static/ungleich_page/img/glasfaser/ip.png and /dev/null differ diff --git a/ungleich_page/static/ungleich_page/img/glasfaser/ip.svg b/ungleich_page/static/ungleich_page/img/glasfaser/ip.svg new file mode 100644 index 00000000..8067f11d --- /dev/null +++ b/ungleich_page/static/ungleich_page/img/glasfaser/ip.svg @@ -0,0 +1,168 @@ + + + + diff --git a/ungleich_page/static/ungleich_page/img/glasfaser/switch.png b/ungleich_page/static/ungleich_page/img/glasfaser/switch.png deleted file mode 100644 index 6b1af11e..00000000 Binary files a/ungleich_page/static/ungleich_page/img/glasfaser/switch.png and /dev/null differ diff --git a/ungleich_page/static/ungleich_page/img/glasfaser/switch.svg b/ungleich_page/static/ungleich_page/img/glasfaser/switch.svg new file mode 100644 index 00000000..dde4ca5a --- /dev/null +++ b/ungleich_page/static/ungleich_page/img/glasfaser/switch.svg @@ -0,0 +1,50 @@ + + + + diff --git a/ungleich_page/templates/ungleich_page/glasfaser.html b/ungleich_page/templates/ungleich_page/glasfaser.html index d4542a4f..486e4334 100644 --- a/ungleich_page/templates/ungleich_page/glasfaser.html +++ b/ungleich_page/templates/ungleich_page/glasfaser.html @@ -1,7 +1,8 @@ {% load static bootstrap3 i18n %} +{% get_current_language as LANGUAGE_CODE %} - +
@@ -23,13 +24,13 @@ - + - + {% include "google_analytics.html" %} @@ -39,8 +40,7 @@ - {% get_current_language as LANGUAGE_CODE %} -