diff --git a/Changelog b/Changelog index d39dbd4f..77c53a4b 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,10 @@ +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 @@ -19,7 +26,6 @@ * 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/datacenterlight/locale/de/LC_MESSAGES/django.po b/datacenterlight/locale/de/LC_MESSAGES/django.po index ac796b95..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-16 00:57+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" @@ -270,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" @@ -513,6 +517,9 @@ 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..." 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/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/hosting/forms.py b/hosting/forms.py index 7be7a588..d1c9d03a 100644 --- a/hosting/forms.py +++ b/hosting/forms.py @@ -50,15 +50,17 @@ class HostingUserLoginForm(forms.Form): class HostingUserSignupForm(forms.ModelForm): - confirm_password = forms.CharField(widget=forms.PasswordInput()) - password = forms.CharField(widget=forms.PasswordInput()) + confirm_password = forms.CharField(label=_("Confirm Password"), + widget=forms.PasswordInput()) + password = forms.CharField(label=_("Password"), + widget=forms.PasswordInput()) class Meta: model = CustomUser fields = ['name', 'email', 'password'] widgets = { 'name': forms.TextInput( - attrs={'placeholder': 'Enter your name or company name'}), + attrs={'placeholder': _('Enter your name or company name')}), } def clean_confirm_password(self): @@ -106,7 +108,7 @@ class UserHostingKeyForm(forms.ModelForm): public_key=openssh_pubkey_str).first().name KEY_EXISTS_MESSAGE = _( "This key exists already with the name \"%(name)s\"") % { - 'name': key_name} + 'name': key_name} raise forms.ValidationError(KEY_EXISTS_MESSAGE) with tempfile.NamedTemporaryFile(delete=True) as tmp_public_key_file: diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po index fa24637a..2be2ae6d 100644 --- a/hosting/locale/de/LC_MESSAGES/django.po +++ b/hosting/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-16 01:06+0530\n" +"POT-Creation-Date: 2017-10-26 03:21+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -27,6 +27,15 @@ msgstr "Dein Account wurde noch nicht aktiviert." msgid "User does not exist" msgstr "Der Benutzer existiert nicht" +msgid "Confirm Password" +msgstr "Passwort Bestätigung" + +msgid "Password" +msgstr "Passwort" + +msgid "Enter your name or company name" +msgstr "Gib Deinen Namen oder den Name Deines Unternehmens ein" + msgid "Paste here your public key" msgstr "Füge Deinen Public Key ein" diff --git a/ungleich/templates/cms/ungleichch/_menu.html b/ungleich/templates/cms/ungleichch/_menu.html index 05acc787..e17e90d6 100644 --- a/ungleich/templates/cms/ungleichch/_menu.html +++ b/ungleich/templates/cms/ungleichch/_menu.html @@ -10,7 +10,7 @@ - +
diff --git a/ungleich_page/locale/de/LC_MESSAGES/django.po b/ungleich_page/locale/de/LC_MESSAGES/django.po index 2c432b5f..80e3af64 100644 --- a/ungleich_page/locale/de/LC_MESSAGES/django.po +++ b/ungleich_page/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,11 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< HEAD "POT-Creation-Date: 2017-10-26 03:32+0530\n" +======= +"POT-Creation-Date: 2017-11-06 00:24+0530\n" +>>>>>>> master "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -21,6 +25,12 @@ msgstr "" msgid "Glasfaser menu" msgstr "" +<<<<<<< HEAD +======= +msgid "\"Sorry, we could not find the page you are looking for!\"" +msgstr "" + +>>>>>>> master msgid "Toggle navigation" msgstr "Umschalten" diff --git a/ungleich_page/static/ungleich_page/css/agency.css b/ungleich_page/static/ungleich_page/css/agency.css index c898aa9f..8e6f4155 100755 --- a/ungleich_page/static/ungleich_page/css/agency.css +++ b/ungleich_page/static/ungleich_page/css/agency.css @@ -264,7 +264,8 @@ fieldset[disabled] .btn-xl.active { } .navbar-default.navbar-shrink .navbar-brand { - font-size: 1.5em; + font-size: 1.5em; + padding: 8px; } } diff --git a/ungleich_page/static/ungleich_page/js/ungleich.js b/ungleich_page/static/ungleich_page/js/ungleich.js index e5e4ed34..ca6a71e3 100644 --- a/ungleich_page/static/ungleich_page/js/ungleich.js +++ b/ungleich_page/static/ungleich_page/js/ungleich.js @@ -2,16 +2,16 @@ $(function(){ new WOW().init(); - $('.img-toggle').one('mouseover', toggleImage); + $('.img-toggle').one('mouseenter', toggleImage); }); function toggleImage(e) { var $this = $(this), toggle_img = $this.attr('data-replaced'), current_img = $this.attr('src'); - $this.fadeOut(600, function() { + $this.fadeOut(200, function() { $this.attr('src', toggle_img); $this.attr('data-replaced', current_img); - $this.fadeIn(900); + $this.fadeIn(300); }); }; diff --git a/ungleich_page/templates/ungleich_page/404.html b/ungleich_page/templates/ungleich_page/404.html index bcd2260b..316a2e3c 100644 --- a/ungleich_page/templates/ungleich_page/404.html +++ b/ungleich_page/templates/ungleich_page/404.html @@ -1,4 +1,4 @@ -{% load staticfiles%} +{% load staticfiles i18n %} @@ -11,7 +11,7 @@ Page not found | ungleich - + @@ -33,27 +33,21 @@ - - +
-
-
+

 

404

- "Sorry, we could not find the page you are looking for!" -

-
+ {% trans '"Sorry, we could not find the page you are looking for!"' %} +

-
- - diff --git a/ungleich_page/templates/ungleich_page/glasfaser.html b/ungleich_page/templates/ungleich_page/glasfaser.html index 486e4334..6bcb0746 100644 --- a/ungleich_page/templates/ungleich_page/glasfaser.html +++ b/ungleich_page/templates/ungleich_page/glasfaser.html @@ -14,7 +14,7 @@ ungleich GmbH - + @@ -91,8 +91,8 @@

Surfen Sie mit 100 Mbit/s im Internet!

-

Mit dem neuen Glasfaser-Angebot der ungleich macht das Arbeiten im Internet richtig Spass. Das beste daran: die Geschwindigkeit symmetrisch in beide Richtungen verfügbar. Damit kann ihr Firmennetzwerk auch Dienste bereitstellen.

-

Dieses Angebot ist im Moment ausschliesslich für Firmenkunden verfügbar. Die Aufschaltkosten der Glasfaserleitung sind von der Entfernung zum nächsten Anschlusspunkt abhängig. Fragen Sie noch heute nach einem individuellem Angebot.

+

Mit dem neuen Glasfaser-Angebot der ungleich macht das Arbeiten im Internet richtig Spass. Das beste daran: die Geschwindigkeit ist symmetrisch in beide Richtungen verfügbar. Damit kann Ihr Firmennetzwerk auch Dienste bereitstellen.

+

Dieses Angebot ist im Moment ausschliesslich für Firmenkunden verfügbar. Die Aufschaltkosten der Glasfaserleitung sind von der Entfernung zum nächsten Anschlusspunkt abhängig. Fragen Sie noch heute nach einem individuellem Angebot. Gerne stellen wir Ihnen eine persönliche Offerte zusammen.

@@ -144,7 +144,7 @@

Einfach zu nutzen

-

2 vorkonfigurierte Endgeräte (benötigt zwei Steckdosen auf Ihrer Seite)

+

2 bereits für Sie konfigurierte Endgeräte (benötigt zwei Ihrer Steckdosen)

Einfach einstecken und los!

@@ -199,7 +199,7 @@
-

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/includes/_about.html b/ungleich_page/templates/ungleich_page/includes/_about.html index e01b22e3..e9dd45c5 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 %}
@@ -32,7 +31,7 @@

{% trans "ungleich founded" %}

-

{% trans "in Switzerland" %}

+

{% trans "in Switzerland" %}

diff --git a/ungleich_page/templates/ungleich_page/includes/_contact_us.html b/ungleich_page/templates/ungleich_page/includes/_contact_us.html index 5c4d2da0..5d59c757 100644 --- a/ungleich_page/templates/ungleich_page/includes/_contact_us.html +++ b/ungleich_page/templates/ungleich_page/includes/_contact_us.html @@ -3,26 +3,27 @@
-
-
+
+
{% 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 +63,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/_portfolio.html b/ungleich_page/templates/ungleich_page/includes/_portfolio.html index 0df3b4c2..2c439a5d 100644 --- a/ungleich_page/templates/ungleich_page/includes/_portfolio.html +++ b/ungleich_page/templates/ungleich_page/includes/_portfolio.html @@ -10,7 +10,7 @@
-
+

{% trans "Data Center Light" %}

@@ -18,7 +18,7 @@

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

@@ -26,7 +26,7 @@

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

diff --git a/ungleich_page/templates/ungleich_page/includes/_services.html b/ungleich_page/templates/ungleich_page/includes/_services.html index 5a0ef848..2c3a8f62 100644 --- a/ungleich_page/templates/ungleich_page/includes/_services.html +++ b/ungleich_page/templates/ungleich_page/includes/_services.html @@ -2,48 +2,45 @@ {% 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/_team.html b/ungleich_page/templates/ungleich_page/includes/_team.html index a9a32c74..e207e336 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/utils/locale/de/LC_MESSAGES/django.po b/utils/locale/de/LC_MESSAGES/django.po index 8a961e7a..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."