Merge branch 'master' into task/3594/digitalglarus_responsive_scrollbar_fix

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

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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -270,8 +270,12 @@ msgstr ""
 "Einfach und bezahlbar: Teste nun unsere virtuellen Maschinen mit "
 "federleichten Preisen."
 
-msgid "Affordable VM hosting based in Switzerland"
+msgid ""
-msgstr "Bezahlbares VM Hosting in der Schweiz"
+"Ready in 30 seconds.<br/>Experience the unbeatable speed from Data Center "
+"Light."
+msgstr ""
+"Fertig in 30 Sekunden.<br/>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..."
 

datacenterlight/templates/datacenterlight/index.html

@@ -130,7 +130,7 @@
             <div class="row text-center">
                 <div class="col-xs-12 col-md-6 text">
                     <h2 class="section-heading">{% trans "Simple and affordable: Try our virtual machine with featherlight price." %}</h2>
-                    <p class="lead new-lead">{% trans "Affordable VM hosting based in Switzerland" %}</p>
+                    <p class="lead new-lead">{% blocktrans %}Ready in 30 seconds.<br/>Experience the unbeatable speed from Data Center Light.{% endblocktrans %}</p>
                 </div>
 
                 <div class="col-xs-12 col-md-6 hero-feature">

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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -95,6 +95,9 @@ msgstr "Seite"
 msgid "Data Center Light"
 msgstr ""
 
+msgid "Glasfaser"
+msgstr ""
+
 msgid "English"
 msgstr ""
 

ungleich/templates/cms/ungleichch/_menu.html

@@ -10,7 +10,7 @@
 	<span class="icon-bar"></span>
 	<span class="icon-bar"></span>
       </button>
-      <a class="navbar-brand" href="/">
+      <a class="navbar-brand" href="https://www.ungleich.ch">
 	<img src="{% static "blog.ungleich.ch/img/logo_white.svg" %}" />
       </a>
     </div>

ungleich_page/locale/de/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-13 02:21+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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,6 +18,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+msgid "Glasfaser menu"
+msgstr ""
+
+msgid "\"Sorry, we could not find the page you are looking for!\""
+msgstr ""
+
 msgid "Toggle navigation"
 msgstr "Umschalten"
 

ungleich_page/static/ungleich_page/css/agency.css

@@ -265,6 +265,7 @@ fieldset[disabled] .btn-xl.active {
 
     .navbar-default.navbar-shrink .navbar-brand {
 	   font-size: 1.5em;
+       padding: 8px;
     }
 }
 

ungleich_page/templates/ungleich_page/404.html

@@ -1,4 +1,4 @@
-{% load staticfiles%}
+{% load staticfiles i18n %}
 <!DOCTYPE html>
 <html lang="en">
 
@@ -33,27 +33,21 @@
 
 </head>
 
-<body>
 <body class="error404">
   <div class="content-404">
-   <div class="container">
+    <div class="container text-center">
-    <div class="text-center">
       <h1>&nbsp;</h1>
       <h1>404</h1>
       <p class="lead">
-       "Sorry, we could not find the page you are looking for!"
+       {% trans '"Sorry, we could not find the page you are looking for!"' %}
       </p>
     </div>
-    </div>
-     </div>
 
     <!-- Footer --><!-- jQuery -->
     <script src="{% static 'hosting/js/jquery.js' %}"></script>
 
     <!-- Bootstrap Core JavaScript -->
     <script src="js/bootstrap.min.js"></script>
-
 </body>
-
 </html>
 

ungleich_page/templates/ungleich_page/glasfaser.html

@@ -14,7 +14,7 @@
     <title>ungleich GmbH</title>
 
     <!-- Bootstrap Core CSS -->
-    <link href="{% static 'ungleich_page/css/bootstrap.min.css' %}" rel="stylesheet">
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
     <link href="{% static 'ungleich_page/css/lib/animate.min.css' %}" rel="stylesheet">
 
     <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->

ungleich_page/templates/ungleich_page/includes/_contact_us.html

@@ -3,8 +3,8 @@
 
 <section id="contact">
     <div class="container">
-        <div class="row" class="wow fadeInDown">
+        <div class="wow fadeInDown">
-            <div class="col-lg-12 text-center wow fadeInDown">
+            <div class="text-center wow fadeInDown">
                 {% for message in messages %}
                     <div class="alert alert-success alert-dismissible" role="alert">
                         <button type="button" class="close" data-dismiss="alert" aria-label="Close"
@@ -15,14 +15,15 @@
                 <h2 class="section-heading">{% trans "Contact Us" %}</h2>
                 <br>
 
-                <h3 class="intro-smallcap">{% trans "Join us at" %} <a
+                <h3 class="intro-smallcap">
-                    href="{% url 'digitalglarus:landing' %}">{% trans "Digital Glarus" %}</a>,
+                    {% trans "Join us at" %} <a href="{% url 'digitalglarus:landing' %}">{% trans "Digital Glarus" %}</a>, {% trans "a great co-working space in the middle of Alps!" %} <br>
-                    {% trans "a great co-working space in the middle of Alps!" %}
+                    {% trans "You can contact us at" %}
-                    <p></p> {% trans "You can contact us at" %} </h3>
+                </h3>
-                <h3 class="intro-smallcap"><a href="mailto:info@ungleich.ch"><i class="fa fa-envelope">info@ungleich.ch</i></a>
+                <h3 class="intro-smallcap">
+                    <a href="mailto:info@ungleich.ch"><i class="fa fa-envelope"></i> info@ungleich.ch</a>
                 </h3>
 
-                <h3 class="intro-smallcap"><i class="fa fa-phone"></i> (044) 534-66-22<p></p></h3>
+                <h3 class="intro-smallcap"><i class="fa fa-phone"></i> (044) 534-66-22</h3>
                 <!-- <h3 class="intro-smallcap">{% trans "or" %}</h3> -->
 
                 <!-- <h3 class="intro-smallcap">{% trans "Contact Us" %}</h3> -->

ungleich_page/templates/ungleich_page/includes/_footer.html

@@ -9,17 +9,21 @@
 		  </div>
 		  <div class="col-md-4">
 		    <ul class="list-inline social-buttons">
-		      <li><a href="https://twitter.com/ungleich"><i class="fa fa-twitter"></i></a>
+		      <li>
+		      	<a href="https://twitter.com/ungleich"><i class="fa fa-twitter"></i></a>
 		      </li>
-		      <li><a href="https://github.com/ungleich"><i class="fa fa-github"></i></a>
+		      <li>
+		      	<a href="https://github.com/ungleich"><i class="fa fa-github"></i></a>
 		      </li>
-		      <li><a href="https://www.linkedin.com/company/ungleich-gmbh?trk=nav_account_sub_nav_company_admin/"><i class="fa fa-linkedin"></i></a>
+		      <li>
+		      	<a href="https://www.linkedin.com/company/ungleich-gmbh?trk=nav_account_sub_nav_company_admin/"><i class="fa fa-linkedin"></i></a>
 		      </li>
 		    </ul>
 		  </div>
 		  <div class="col-md-4">
 		    <ul class="list-inline quicklinks">
-		      <li><a href="http://www.ungleich.ch/">{% trans "ungleich Home" %} </a>
+		      <li>
+		      	<a href="http://www.ungleich.ch/">{% trans "ungleich Home" %}</a>
 		      </li>
 		    </ul>
 		  </div>

ungleich_page/templates/ungleich_page/includes/_team.html

@@ -3,15 +3,13 @@
 
 <section id="team" class="bg-light-gray">
 	<div class="container">
-		<div class="row">
+	  <div class="text-center wow fadeInDown">
-		  <div class="col-sm-16 text-center center-block wow fadeInDown">
 	    <h2 class="section-heading">{% trans "Why ungleich?*" %}</h2>
 	    <h3 class="text-muted">{% trans "What our customers say" %}</h3>
 	  </div>
-		</div>
 
 		<div class="row">
-		  <div class="col-sm-10 center-block wow fadeInDown">
+		  <div class="col-sm-10 col-sm-offset-1 wow fadeInDown">
 		    <!-- start:recommendationSlider -->
 		    <div id="carousel-recommendation-ungleich" class="carousel slide ungleich ungleich-gallery ungleich-gallery-text-carousel" data-ride="carousel" data-interval="3000">
 		      <!-- Indicators -->
@@ -91,7 +89,7 @@
 		  </div>
 		</div>
 	</div>
-	<div class="col-sm-16 text-center center-block">
+	<div class="text-center">
 		<h3 class="section-subheading text-muted">{% blocktrans %}*ungleich means not equal to (≠) U+2260.{% endblocktrans %}</h3>
 	</div>
 </section>

ungleich_page/templates/ungleich_page/landing.html

@@ -1,6 +1,5 @@
-{% load static %}
+{% load static i18n %}
-{% load  bootstrap3 %}
+
-{% load i18n %}
 <!DOCTYPE html>
 <html lang="en">
 <head>
@@ -13,10 +12,10 @@
 
     <title>ungleich GmbH</title>
 
-
     <!-- Bootstrap Core CSS -->
-    <link href="{% static 'ungleich_page/css/bootstrap.min.css' %}" rel="stylesheet">
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
     <link href="{% static 'ungleich_page/css/lib/animate.min.css' %}" rel="stylesheet">
+    <link href="//fonts.googleapis.com/css?family=Raleway|Montserrat:400,700|Droid+Serif:400,700,400italic,700italic|Roboto+Slab:400,100,300,700" rel="stylesheet" type="text/css">
 
     <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
@@ -51,10 +50,9 @@
                     <span class="icon-bar"></span>
                     <span class="icon-bar"></span>
                 </button>
-                <p><a class="navbar-brand page-scroll" href="#page-top"><img
+                <a class="navbar-brand page-scroll" href="#page-top">
-                        src="{% static 'ungleich_page/img/logo_white.svg' %}"></a></p>
+                    <img src="{% static 'ungleich_page/img/logo_white.svg' %}">
-
+                </a>
-                <p>&nbsp;</p>
             </div>
 
             <!-- Collect the nav links, forms, and other content for toggling -->
@@ -64,13 +62,11 @@
                         <a href="#page-top"></a>
                     </li>
                     <li>
-                        <a class="page-scroll" href="#services">{% trans "Services"%}</a></li>
+                        <a class="page-scroll" href="#services">{% trans "Services"%}</a>
-                    <li></li>
+                    </li>
-                    <li></li>
-                    <li></li>
                     <li>
-                        <a class="page-scroll" href="#portfolio">{% trans "products"%}</a></li>
+                        <a class="page-scroll" href="#portfolio">{% trans "products"%}</a>
-                    <li></li>
+                    </li>
                     <li>
                         <a class="page-scroll" href="#about">{% trans "About"%}</a>
                     </li>
@@ -78,7 +74,7 @@
                         <a class="page-scroll" href="#team">{% trans "WHY UNGLEICH?"%}</a>
                     </li>
                     <li>
-                        <a class="page-scroll" href="http://blog.ungleich.ch">{% trans "BLOG"%}</a>
+                        <a class="page-scroll" href="https://blog.ungleich.ch">{% trans "BLOG"%}</a>
                     </li>
                     <li>
                         <a class="page-scroll" href="#contact">{% trans "CONTACT"%} </a>
@@ -114,19 +110,6 @@
     <!-- Footer -->
     {% include "ungleich_page/includes/_footer.html" %}
 
-    <!-- Portfolio Modals -->
-    <!-- Use the modals below to showcase details about your portfolio projects! -->
-
-    <!-- Portfolio Modal 1 -->
-
-    <!-- Portfolio Modal 2 -->
-
-    <!-- Portfolio Modal 3 -->
-
-    <!-- Portfolio Modal 4 -->
-
-    <!-- Portfolio Modal 6 -->
-
     <!-- jQuery -->
     <script src="{% static 'ungleich_page/js/jquery.js' %}" type="text/javascript"></script>
     <script type="text/javascript">
@@ -138,32 +121,22 @@
     </script>
 
     <!-- Bootstrap Core JavaScript -->
-    <script src="{% static 'ungleich_page/js/bootstrap.min.js' %}" type="text/javascript"></script>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/js/bootstrap.min.js" type="text/javascript"></script>
 
     <!-- Plugin JavaScript -->
-    <script src="http://cdnjs.cloudflare.com/ajax/libs/jquery-easing/1.3/jquery.easing.min.js"
+    <script src="//cdnjs.cloudflare.com/ajax/libs/jquery-easing/1.3/jquery.easing.min.js" type="text/javascript"></script>
-            type="text/javascript"></script>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/classie/1.0.1/classie.min.js" type="text/javascript"></script>
-    <script src="{% static 'ungleich_page/js/classie.js' %}" type="text/javascript"></script>
     <script src="{% static 'ungleich_page/js/cbpAnimatedHeader.js' %}" type="text/javascript"></script>
 
-
     <!-- Contact Form JavaScript -->
     <script src="{% static 'ungleich_page/js/jqBootstrapValidation.js' %}" type="text/javascript"></script>
     <!-- <script src="{% static 'ungleich_page/js/contact_me.js' %}" type="text/javascript"></script> -->
-    <script src="{% static 'ungleich_page/js/lib/wow.min.js' %}" type="text/javascript"></script>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/wow/1.1.2/wow.min.js" type="text/javascript"></script>
 
     <!-- Custom Theme JavaScript -->
     <script src="{% static 'ungleich_page/js/ungleich.js' %}" type="text/javascript"></script>
 
-
     <!-- Custom Fonts -->
-    <link href="//fonts.googleapis.com/css?family=Raleway" rel="stylesheet" type="text/css">
+    <link href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" type="text/css">
-    <link href="{% static  'ungleich_page/font-awesome-4.1.0/css/font-awesome.min.css' %}" rel="stylesheet"
-          type="text/css">
-    <link href="//fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css">
-    <link href="//fonts.googleapis.com/css?family=Kaushan+Script" rel="stylesheet" type="text/css">
-    <link href="//fonts.googleapis.com/css?family=Droid+Serif:400,700,400italic,700italic" rel="stylesheet"
-          type="text/css">
-    <link href="//fonts.googleapis.com/css?family=Roboto+Slab:400,100,300,700" rel="stylesheet" type="text/css">
 </body>
 </html>