Merge branch 'master' into task/3829/handle_landing_login_fail_in_same_page

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

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(
+            'to': [from_emails.get(from_page, 'info@ungleich.ch')],
-                self.request.POST.get('from_page', 'info')
-            ),
             'body': "\n".join(
                 ["%s=%s" % (k, v) for (k, v) in form.cleaned_data.items()]),
             'reply_to': [form.cleaned_data.get('email')],

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"

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;

ungleich_page/static/ungleich_page/img/glasfaser/business.svg

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="196px"
+	 height="196px" viewBox="0 0 196 196" enable-background="new 0 0 196 196" xml:space="preserve">
+<g id="Layer_1">
+	<g>
+		<ellipse fill="#0D2849" cx="96.871" cy="97.632" rx="68.442" ry="67.431"/>
+		
+			<ellipse opacity="0.57" fill="none" stroke="#47B9E8" stroke-width="2" stroke-miterlimit="10" cx="96.719" cy="97.321" rx="62.32" ry="61.179"/>
+	</g>
+	<g>
+		<path fill-rule="evenodd" clip-rule="evenodd" fill="#47B9E8" d="M57.043,130.8c0-20.398,0-40.777,0-61.19
+			c9.176,0,18.341,0,27.533,0c0-0.142-0.001-0.25,0-0.36c0.021-1.162,0.002-2.325,0.069-3.485c0.066-1.101,0.483-2.09,1.144-2.978
+			c0.923-1.239,2.173-1.945,3.664-2.244c0.416-0.082,0.85-0.11,1.275-0.112c4.061-0.007,8.123-0.007,12.179-0.002
+			c1.668,0.002,3.154,0.521,4.364,1.683c0.668,0.641,1.144,1.424,1.442,2.312c0.28,0.833,0.355,1.69,0.351,2.561
+			c-0.007,0.865-0.003,1.73-0.003,2.616c9.187,0,18.341,0,27.523,0c0,20.406,0,40.794,0,61.201
+			C110.086,130.8,83.578,130.8,57.043,130.8z M130.484,75.751c-22.465,0-44.889,0-67.331,0c0,0.123,0,0.224,0,0.325
+			c0,5.925,0,11.853,0,17.78c0,0.212,0.001,0.428,0.019,0.641c0.138,1.929,0.936,3.506,2.536,4.634
+			c1.15,0.811,2.456,1.086,3.846,1.086c18.178-0.003,36.358-0.002,54.534-0.003c0.225,0,0.449-0.002,0.672-0.018
+			c1.933-0.139,3.509-0.933,4.638-2.529c0.8-1.132,1.091-2.417,1.091-3.785c-0.004-5.937-0.004-11.873-0.004-17.81
+			C130.484,75.971,130.484,75.87,130.484,75.751z M130.469,104.805c-0.041,0.003-0.063,0-0.078,0.007
+			c-1.979,1.076-4.105,1.528-6.347,1.528c-18.199-0.007-36.398-0.003-54.597-0.003c-1.986,0-3.885-0.378-5.675-1.264
+			c-0.196-0.098-0.396-0.186-0.594-0.28c0,6.646,0,13.271,0,19.892c22.442,0,44.859,0,67.291,0
+			C130.469,118.053,130.469,111.436,130.469,104.805z M90.708,69.586c4.091,0,8.154,0,12.215,0c0-1.017,0-2.012,0-3.011
+			c-4.083,0-8.145,0-12.215,0C90.708,67.589,90.708,68.575,90.708,69.586z"/>
+		<path fill-rule="evenodd" clip-rule="evenodd" fill="#0D2849" d="M130.484,75.751c0,0.119,0,0.22,0,0.321
+			c0,5.937,0,11.873,0.004,17.81c0,1.369-0.291,2.653-1.091,3.785c-1.129,1.597-2.705,2.391-4.638,2.529
+			c-0.223,0.016-0.447,0.018-0.672,0.018c-18.176,0.001-36.356,0-54.534,0.003c-1.39,0-2.695-0.275-3.846-1.086
+			c-1.6-1.128-2.397-2.705-2.536-4.634c-0.017-0.213-0.019-0.428-0.019-0.641c0-5.928,0-11.855,0-17.78c0-0.101,0-0.202,0-0.325
+			C85.595,75.751,108.02,75.751,130.484,75.751z M81.511,87.99c-2.049,0-4.07,0-6.093,0c0,3.061,0,6.104,0,9.138
+			c2.043,0,4.064,0,6.093,0C81.511,94.078,81.511,91.05,81.511,87.99z M112.144,87.984c0,3.069,0,6.112,0,9.144
+			c2.048,0,4.068,0,6.083,0c0-3.06,0-6.095,0-9.144C116.194,87.984,114.18,87.984,112.144,87.984z"/>
+		<path fill-rule="evenodd" clip-rule="evenodd" fill="#0D2849" d="M130.469,104.805c0,6.631,0,13.248,0,19.88
+			c-22.432,0-44.848,0-67.291,0c0-6.621,0-13.245,0-19.892c0.198,0.095,0.398,0.183,0.594,0.28c1.79,0.886,3.689,1.264,5.675,1.264
+			c18.199,0,36.397-0.004,54.597,0.003c2.241,0,4.367-0.452,6.347-1.528C130.405,104.805,130.428,104.808,130.469,104.805z"/>
+		<path fill-rule="evenodd" clip-rule="evenodd" fill="#0D2849" d="M90.708,69.586c0-1.011,0-1.997,0-3.011c4.07,0,8.132,0,12.215,0
+			c0,1,0,1.995,0,3.011C98.862,69.586,94.799,69.586,90.708,69.586z"/>
+		<path fill-rule="evenodd" clip-rule="evenodd" fill="#47B9E8" d="M81.511,87.99c0,3.06,0,6.088,0,9.138c-2.029,0-4.05,0-6.093,0
+			c0-3.034,0-6.077,0-9.138C77.441,87.99,79.462,87.99,81.511,87.99z"/>
+		<path fill-rule="evenodd" clip-rule="evenodd" fill="#47B9E8" d="M112.144,87.984c2.036,0,4.051,0,6.083,0
+			c0,3.049,0,6.084,0,9.144c-2.015,0-4.035,0-6.083,0C112.144,94.097,112.144,91.054,112.144,87.984z"/>
+	</g>
+	
+		<image display="none" overflow="visible" width="170" height="166" id="Layer_4_xA0_Image_1_" xlink:href="3DFCBC34760ACD66.png"  transform="matrix(1 0 0 1 12.8145 16.6162)">
+	</image>
+	
+		<rect x="61.251" y="73.602" display="none" fill="none" stroke="#FFFFFF" stroke-width="5.5" stroke-miterlimit="10" width="28.351" height="52.284"/>
+	
+		<rect x="103.226" y="74.338" display="none" fill="none" stroke="#FFFFFF" stroke-width="5.5" stroke-miterlimit="10" width="28.351" height="52.284"/>
+	<rect x="72.665" y="85.384" display="none" fill="#FFFFFF" width="5.155" height="6.996"/>
+	<rect x="72.665" y="107.477" display="none" fill="#FFFFFF" width="5.155" height="6.995"/>
+	<rect x="103.226" y="97.321" display="none" fill="#FFFFFF" width="28.351" height="5"/>
+</g>
+<g id="Layer_2" display="none">
+	<g display="inline">
+		
+			<text transform="matrix(1 0 0 1 54.2861 73.6836)" fill="#FFFFFF" font-family="'HelveticaNeue-CondensedBold'" font-size="17.6318">IP-Adressen</text>
+		<line fill="none" stroke="#FFFFFF" stroke-width="2" stroke-miterlimit="10" x1="46.373" y1="116.581" x2="147.75" y2="116.581"/>
+		<text transform="matrix(1 0 0 1 67.772 108.3828)" fill="#FFFFFF" font-family="'HelveticaNeue-Bold'" font-size="26.4477">IPv6</text>
+		<line fill="none" stroke="#FFFFFF" stroke-width="2" stroke-miterlimit="10" x1="46.373" y1="81.142" x2="147.75" y2="81.142"/>
+	</g>
+	
+		<text transform="matrix(1 0 0 1 67.772 141.3809)" display="inline" fill="#FFFFFF" font-family="'HelveticaNeue-Bold'" font-size="26.4477">IPv4</text>
+</g>
+</svg>

ungleich_page/static/ungleich_page/img/glasfaser/ip.svg

@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="196px" height="196px" viewBox="0 0 196 196" enable-background="new 0 0 196 196" xml:space="preserve">
+<g id="Layer_1_1_">
+	<g>
+		<ellipse fill="#0D2849" cx="96.871" cy="97.632" rx="68.441" ry="67.431"/>
+		
+			<ellipse opacity="0.57" fill="none" stroke="#47B9E8" stroke-width="2" stroke-miterlimit="10" enable-background="new    " cx="96.719" cy="97.321" rx="62.32" ry="61.179"/>
+	</g>
+	<g display="none">
+		<path display="inline" fill="#FFFFFF" d="M57.043,130.8c0-20.397,0-40.777,0-61.19c9.176,0,18.341,0,27.533,0
+			c0-0.142-0.001-0.25,0-0.36c0.021-1.162,0.002-2.325,0.069-3.485c0.066-1.101,0.483-2.09,1.144-2.978
+			c0.923-1.239,2.173-1.945,3.664-2.244c0.416-0.082,0.85-0.11,1.275-0.112c4.061-0.007,8.124-0.007,12.179-0.002
+			c1.668,0.002,3.153,0.521,4.364,1.683c0.668,0.641,1.144,1.424,1.441,2.312c0.28,0.833,0.355,1.69,0.352,2.561
+			c-0.008,0.865-0.004,1.73-0.004,2.616c9.188,0,18.342,0,27.523,0c0,20.406,0,40.793,0,61.201
+			C110.086,130.8,83.578,130.8,57.043,130.8z M130.484,75.751c-22.465,0-44.889,0-67.332,0c0,0.123,0,0.224,0,0.325
+			c0,5.925,0,11.853,0,17.78c0,0.212,0.001,0.428,0.019,0.641c0.138,1.929,0.936,3.506,2.536,4.634
+			c1.15,0.811,2.456,1.086,3.846,1.086c18.178-0.003,36.358-0.002,54.534-0.003c0.225,0,0.449-0.002,0.672-0.019
+			c1.934-0.139,3.51-0.932,4.639-2.528c0.8-1.132,1.09-2.417,1.09-3.785c-0.004-5.937-0.004-11.873-0.004-17.81
+			C130.484,75.971,130.484,75.87,130.484,75.751z M130.469,104.805c-0.041,0.004-0.062,0-0.078,0.008
+			c-1.979,1.076-4.104,1.527-6.347,1.527c-18.198-0.007-36.398-0.003-54.597-0.003c-1.986,0-3.885-0.378-5.675-1.264
+			c-0.196-0.099-0.396-0.187-0.594-0.28c0,6.646,0,13.271,0,19.893c22.442,0,44.859,0,67.291,0
+			C130.469,118.053,130.469,111.436,130.469,104.805z M90.708,69.586c4.091,0,8.153,0,12.215,0c0-1.017,0-2.012,0-3.011
+			c-4.083,0-8.145,0-12.215,0C90.708,67.589,90.708,68.575,90.708,69.586z"/>
+		<path display="inline" fill="#3077A3" d="M130.484,75.751c0,0.119,0,0.22,0,0.321c0,5.937,0,11.873,0.004,17.81
+			c0,1.369-0.291,2.653-1.092,3.785c-1.129,1.597-2.705,2.392-4.638,2.528c-0.223,0.017-0.446,0.019-0.672,0.019
+			c-18.176,0.001-36.356,0-54.534,0.003c-1.39,0-2.695-0.275-3.846-1.086c-1.6-1.128-2.397-2.705-2.536-4.634
+			c-0.017-0.213-0.019-0.428-0.019-0.641c0-5.928,0-11.855,0-17.78c0-0.101,0-0.202,0-0.325
+			C85.595,75.751,108.02,75.751,130.484,75.751z M81.511,87.99c-2.049,0-4.07,0-6.093,0c0,3.061,0,6.104,0,9.138
+			c2.043,0,4.064,0,6.093,0C81.511,94.078,81.511,91.05,81.511,87.99z M112.145,87.984c0,3.069,0,6.112,0,9.144
+			c2.047,0,4.067,0,6.082,0c0-3.06,0-6.095,0-9.144C116.193,87.984,114.18,87.984,112.145,87.984z"/>
+		<path display="inline" fill="#3077A3" d="M130.469,104.805c0,6.631,0,13.248,0,19.881c-22.432,0-44.848,0-67.291,0
+			c0-6.621,0-13.246,0-19.893c0.198,0.096,0.398,0.184,0.594,0.28c1.79,0.886,3.689,1.264,5.675,1.264
+			c18.199,0,36.397-0.004,54.597,0.003c2.241,0,4.367-0.451,6.347-1.527C130.404,104.805,130.428,104.809,130.469,104.805z"/>
+		<path display="inline" fill="#3077A3" d="M90.708,69.586c0-1.011,0-1.997,0-3.011c4.07,0,8.132,0,12.215,0c0,1,0,1.995,0,3.011
+			C98.861,69.586,94.799,69.586,90.708,69.586z"/>
+		<path display="inline" fill="#FFFFFF" d="M81.511,87.99c0,3.06,0,6.088,0,9.138c-2.029,0-4.05,0-6.093,0c0-3.034,0-6.077,0-9.138
+			C77.441,87.99,79.462,87.99,81.511,87.99z"/>
+		<path display="inline" fill="#FFFFFF" d="M112.145,87.984c2.035,0,4.051,0,6.082,0c0,3.049,0,6.084,0,9.144
+			c-2.015,0-4.035,0-6.082,0C112.145,94.097,112.145,91.054,112.145,87.984z"/>
+	</g>
+	
+		<image display="none" overflow="visible" enable-background="new    " width="171" height="167" id="Layer_4_xA0_Image_2_" xlink:href="B1D654609C24A42D.png"  transform="matrix(0.9941 0 0 0.9941 12.8198 16.6104)">
+	</image>
+	
+		<rect x="61.251" y="73.602" display="none" fill="none" stroke="#FFFFFF" stroke-width="5.5" stroke-miterlimit="10" width="28.351" height="52.284"/>
+	
+		<rect x="103.227" y="74.338" display="none" fill="none" stroke="#FFFFFF" stroke-width="5.5" stroke-miterlimit="10" width="28.351" height="52.284"/>
+	<rect x="72.665" y="85.384" display="none" fill="#FFFFFF" width="5.155" height="6.996"/>
+	<rect x="72.665" y="107.477" display="none" fill="#FFFFFF" width="5.155" height="6.996"/>
+	<rect x="103.227" y="97.321" display="none" fill="#FFFFFF" width="28.351" height="5"/>
+</g>
+<g id="Layer_2">
+	<g>
+		<g enable-background="new    ">
+			<path fill="#47B9E8" d="M55.291,61.095h2.539v12.589h-2.539V61.095z"/>
+			<path fill="#47B9E8" d="M64.16,61.095c0.646,0,1.19,0.108,1.631,0.326c0.441,0.218,0.796,0.502,1.067,0.854
+				c0.271,0.354,0.464,0.756,0.582,1.208c0.117,0.453,0.176,0.914,0.176,1.385c0,0.646-0.097,1.21-0.291,1.692
+				c-0.194,0.481-0.464,0.876-0.811,1.181c-0.347,0.307-0.767,0.535-1.261,0.688c-0.494,0.152-1.04,0.229-1.64,0.229h-1.358v5.025
+				h-2.539V61.095H64.16z M63.384,66.79c0.505,0,0.914-0.153,1.226-0.459s0.467-0.781,0.467-1.428c0-0.635-0.135-1.117-0.406-1.446
+				s-0.723-0.493-1.357-0.493h-1.058v3.826H63.384z"/>
+			<path fill="#47B9E8" d="M73.734,69.628h-4.972v-2.08h4.972V69.628z"/>
+			<path fill="#47B9E8" d="M80.98,61.095l3.333,12.589h-2.645l-0.582-2.662h-3.35l-0.582,2.662H74.51l3.333-12.589H80.98z
+				 M80.646,68.94l-1.216-5.659h-0.036l-1.216,5.659H80.646z"/>
+			<path fill="#47B9E8" d="M89.955,72.679c-0.271,0.446-0.573,0.758-0.908,0.935c-0.335,0.176-0.75,0.265-1.243,0.265
+				c-1,0-1.734-0.382-2.204-1.146c-0.47-0.764-0.705-2.027-0.705-3.791c0-1.763,0.235-3.035,0.705-3.817
+				c0.47-0.781,1.205-1.172,2.204-1.172c0.458,0,0.849,0.094,1.172,0.282c0.323,0.188,0.614,0.47,0.873,0.846h0.035v-3.984h2.433
+				v12.589H89.99v-1.005H89.955z M87.566,71.276c0.159,0.523,0.502,0.785,1.032,0.785c0.541,0,0.89-0.262,1.049-0.785
+				c0.159-0.522,0.238-1.301,0.238-2.336c0-1.034-0.08-1.812-0.238-2.336s-0.508-0.785-1.049-0.785
+				c-0.529,0-0.873,0.262-1.032,0.785s-0.238,1.302-0.238,2.336C87.328,69.976,87.407,70.754,87.566,71.276z"/>
+			<path fill="#47B9E8" d="M96.268,64.197v1.27h0.035c0.247-0.458,0.546-0.825,0.899-1.102c0.353-0.276,0.782-0.414,1.287-0.414
+				c0.071,0,0.144,0.003,0.22,0.009s0.15,0.015,0.221,0.026v2.327c-0.129-0.012-0.256-0.021-0.379-0.026
+				c-0.124-0.006-0.25-0.009-0.379-0.009c-0.211,0-0.423,0.029-0.635,0.088c-0.211,0.06-0.405,0.156-0.582,0.291
+				c-0.176,0.136-0.317,0.312-0.423,0.529c-0.105,0.218-0.159,0.484-0.159,0.802v5.695H93.94v-9.486H96.268z"/>
+			<path fill="#47B9E8" d="M101.892,70.069c0,0.282,0.021,0.555,0.062,0.819s0.109,0.5,0.203,0.705
+				c0.094,0.206,0.217,0.371,0.37,0.494s0.341,0.186,0.564,0.186c0.411,0,0.711-0.147,0.899-0.441
+				c0.188-0.293,0.316-0.74,0.388-1.34h2.187c-0.047,1.105-0.342,1.945-0.882,2.521c-0.541,0.576-1.394,0.864-2.557,0.864
+				c-0.882,0-1.569-0.147-2.063-0.441c-0.493-0.293-0.857-0.682-1.093-1.163c-0.235-0.482-0.379-1.023-0.433-1.622
+				c-0.053-0.6-0.078-1.199-0.078-1.799c0-0.635,0.043-1.246,0.132-1.834c0.088-0.588,0.265-1.11,0.528-1.569
+				c0.266-0.458,0.645-0.822,1.138-1.093s1.151-0.405,1.975-0.405c0.706,0,1.284,0.114,1.737,0.344
+				c0.452,0.229,0.808,0.553,1.066,0.97c0.258,0.417,0.435,0.923,0.529,1.516c0.094,0.594,0.141,1.255,0.141,1.984v0.546h-4.813
+				V70.069z M104.307,66.904c-0.035-0.276-0.097-0.512-0.185-0.705c-0.089-0.194-0.212-0.341-0.37-0.441
+				c-0.158-0.1-0.361-0.149-0.608-0.149s-0.45,0.056-0.608,0.167c-0.158,0.112-0.285,0.259-0.379,0.441
+				c-0.094,0.182-0.162,0.385-0.203,0.608c-0.041,0.223-0.062,0.446-0.062,0.67v0.37h2.486
+				C104.365,67.501,104.342,67.181,104.307,66.904z"/>
+			<path fill="#47B9E8" d="M109.756,70.897c0,0.412,0.107,0.744,0.326,0.996c0.217,0.253,0.531,0.38,0.943,0.38
+				c0.375,0,0.676-0.095,0.898-0.282c0.224-0.188,0.336-0.471,0.336-0.847c0-0.306-0.089-0.538-0.266-0.696
+				c-0.176-0.159-0.381-0.285-0.617-0.379l-1.709-0.617c-0.671-0.235-1.176-0.567-1.518-0.996c-0.34-0.43-0.511-0.979-0.511-1.648
+				c0-0.389,0.064-0.756,0.194-1.103c0.129-0.347,0.334-0.649,0.617-0.908c0.281-0.258,0.643-0.464,1.084-0.617
+				c0.441-0.152,0.973-0.229,1.596-0.229c1.104,0,1.922,0.235,2.451,0.705c0.528,0.47,0.793,1.135,0.793,1.992v0.388h-2.187
+				c0-0.493-0.079-0.854-0.237-1.084c-0.159-0.229-0.438-0.344-0.838-0.344c-0.307,0-0.573,0.085-0.803,0.256
+				c-0.229,0.17-0.344,0.426-0.344,0.767c0,0.235,0.074,0.447,0.221,0.635c0.146,0.188,0.426,0.347,0.838,0.476l1.463,0.494
+				c0.764,0.259,1.305,0.597,1.622,1.014c0.317,0.418,0.476,0.984,0.476,1.701c0,0.506-0.088,0.943-0.264,1.314
+				c-0.176,0.37-0.42,0.679-0.732,0.925c-0.311,0.247-0.682,0.424-1.11,0.529s-0.902,0.159-1.419,0.159
+				c-0.682,0-1.25-0.065-1.701-0.194c-0.453-0.129-0.812-0.323-1.076-0.582c-0.265-0.258-0.449-0.573-0.555-0.943
+				c-0.106-0.37-0.159-0.784-0.159-1.243V70.58h2.187V70.897z"/>
+			<path fill="#47B9E8" d="M117.584,70.897c0,0.412,0.107,0.744,0.326,0.996c0.217,0.253,0.531,0.38,0.943,0.38
+				c0.375,0,0.676-0.095,0.898-0.282c0.224-0.188,0.336-0.471,0.336-0.847c0-0.306-0.089-0.538-0.266-0.696
+				c-0.176-0.159-0.381-0.285-0.617-0.379l-1.709-0.617c-0.671-0.235-1.176-0.567-1.518-0.996c-0.34-0.43-0.511-0.979-0.511-1.648
+				c0-0.389,0.064-0.756,0.194-1.103c0.129-0.347,0.334-0.649,0.617-0.908c0.281-0.258,0.643-0.464,1.084-0.617
+				c0.441-0.152,0.973-0.229,1.596-0.229c1.104,0,1.922,0.235,2.451,0.705c0.528,0.47,0.793,1.135,0.793,1.992v0.388h-2.187
+				c0-0.493-0.079-0.854-0.237-1.084c-0.159-0.229-0.438-0.344-0.838-0.344c-0.307,0-0.573,0.085-0.803,0.256
+				c-0.229,0.17-0.344,0.426-0.344,0.767c0,0.235,0.074,0.447,0.221,0.635c0.146,0.188,0.426,0.347,0.838,0.476l1.463,0.494
+				c0.764,0.259,1.305,0.597,1.622,1.014c0.317,0.418,0.476,0.984,0.476,1.701c0,0.506-0.088,0.943-0.264,1.314
+				c-0.176,0.37-0.42,0.679-0.732,0.925c-0.311,0.247-0.682,0.424-1.11,0.529s-0.902,0.159-1.419,0.159
+				c-0.682,0-1.25-0.065-1.701-0.194c-0.453-0.129-0.812-0.323-1.076-0.582c-0.265-0.258-0.449-0.573-0.555-0.943
+				c-0.106-0.37-0.159-0.784-0.159-1.243V70.58h2.187V70.897z"/>
+			<path fill="#47B9E8" d="M125.711,70.069c0,0.282,0.021,0.555,0.062,0.819s0.108,0.5,0.203,0.705
+				c0.094,0.206,0.217,0.371,0.369,0.494c0.153,0.123,0.342,0.186,0.564,0.186c0.412,0,0.711-0.147,0.899-0.441
+				c0.188-0.293,0.317-0.74,0.388-1.34h2.187c-0.047,1.105-0.341,1.945-0.882,2.521s-1.393,0.864-2.557,0.864
+				c-0.881,0-1.568-0.147-2.062-0.441c-0.494-0.293-0.858-0.682-1.094-1.163c-0.234-0.482-0.379-1.023-0.432-1.622
+				c-0.053-0.6-0.079-1.199-0.079-1.799c0-0.635,0.044-1.246,0.132-1.834s0.265-1.11,0.529-1.569
+				c0.265-0.458,0.644-0.822,1.137-1.093c0.494-0.271,1.152-0.405,1.975-0.405c0.706,0,1.285,0.114,1.737,0.344
+				c0.452,0.229,0.808,0.553,1.067,0.97c0.258,0.417,0.434,0.923,0.528,1.516c0.095,0.594,0.142,1.255,0.142,1.984v0.546h-4.814
+				V70.069z M128.127,66.904c-0.035-0.276-0.098-0.512-0.186-0.705c-0.088-0.194-0.211-0.341-0.369-0.441
+				c-0.159-0.1-0.362-0.149-0.609-0.149c-0.246,0-0.449,0.056-0.607,0.167c-0.159,0.112-0.285,0.259-0.379,0.441
+				c-0.095,0.182-0.162,0.385-0.203,0.608c-0.041,0.223-0.062,0.446-0.062,0.67v0.37h2.486
+				C128.186,67.501,128.162,67.181,128.127,66.904z"/>
+			<path fill="#47B9E8" d="M134.122,64.197v1.111h0.035c0.259-0.47,0.593-0.813,1.005-1.031c0.411-0.218,0.882-0.326,1.41-0.326
+				c0.776,0,1.373,0.211,1.79,0.635c0.417,0.423,0.626,1.11,0.626,2.062v7.035h-2.434v-6.541c0-0.494-0.082-0.838-0.246-1.032
+				c-0.165-0.193-0.43-0.291-0.794-0.291c-0.858,0-1.287,0.523-1.287,1.569v6.295h-2.433v-9.486H134.122z"/>
+		</g>
+		<line fill="none" stroke="#47B9E8" stroke-width="2" stroke-miterlimit="10" x1="46.373" y1="116.581" x2="147.75" y2="116.581"/>
+		<g enable-background="new    ">
+			<path fill="#47B9E8" d="M76.196,90.247v17.136h-3.768V90.247H76.196z"/>
+			<path fill="#47B9E8" d="M87.236,90.247c1.072,0,1.984,0.155,2.736,0.468c0.752,0.312,1.364,0.724,1.836,1.236
+				c0.472,0.512,0.816,1.096,1.032,1.752c0.216,0.656,0.324,1.336,0.324,2.04c0,0.688-0.108,1.364-0.324,2.027
+				c-0.216,0.664-0.56,1.252-1.032,1.765c-0.472,0.512-1.084,0.924-1.836,1.235c-0.752,0.312-1.665,0.469-2.736,0.469h-3.96v6.144
+				h-3.768V90.247H87.236z M86.205,98.311c0.432,0,0.848-0.031,1.248-0.096c0.399-0.063,0.752-0.188,1.056-0.372
+				c0.304-0.184,0.548-0.444,0.732-0.78c0.184-0.336,0.276-0.775,0.276-1.319s-0.092-0.984-0.276-1.32
+				c-0.184-0.336-0.428-0.596-0.732-0.78c-0.304-0.184-0.656-0.308-1.056-0.372c-0.4-0.063-0.816-0.096-1.248-0.096h-2.928v5.136
+				H86.205z"/>
+			<path fill="#47B9E8" d="M98.229,107.383L93.98,94.975h3.576l2.616,8.473h0.049l2.615-8.473h3.385l-4.2,12.408H98.229z"/>
+			<path fill="#47B9E8" d="M114.884,93.438c-0.399-0.416-0.896-0.624-1.487-0.624c-0.609,0-1.117,0.181-1.524,0.54
+				c-0.408,0.36-0.732,0.801-0.972,1.32c-0.24,0.521-0.417,1.076-0.528,1.668c-0.112,0.592-0.177,1.12-0.192,1.584l0.049,0.048
+				c0.463-0.672,1.008-1.151,1.631-1.439c0.625-0.288,1.344-0.433,2.16-0.433c0.721,0,1.424,0.156,2.112,0.469
+				c0.688,0.312,1.272,0.731,1.752,1.26c0.448,0.512,0.776,1.096,0.983,1.752c0.209,0.656,0.312,1.319,0.312,1.992
+				c0,0.863-0.141,1.668-0.42,2.411c-0.28,0.744-0.68,1.393-1.199,1.944c-0.521,0.552-1.141,0.984-1.861,1.296
+				c-0.719,0.312-1.52,0.468-2.399,0.468c-1.265,0-2.312-0.252-3.144-0.756s-1.496-1.164-1.992-1.979
+				c-0.496-0.816-0.84-1.74-1.032-2.772c-0.192-1.031-0.288-2.084-0.288-3.155c0-1.04,0.12-2.08,0.359-3.12
+				c0.24-1.04,0.625-1.98,1.152-2.82c0.528-0.84,1.208-1.524,2.041-2.052c0.831-0.528,1.848-0.792,3.047-0.792
+				c0.721,0,1.393,0.104,2.017,0.312s1.176,0.509,1.655,0.9c0.48,0.392,0.873,0.876,1.177,1.452c0.304,0.575,0.504,1.24,0.6,1.991
+				h-3.239C115.539,94.343,115.283,93.855,114.884,93.438z M112.016,98.923c-0.344,0.168-0.628,0.396-0.852,0.684
+				c-0.225,0.288-0.393,0.621-0.504,0.996c-0.112,0.376-0.168,0.772-0.168,1.188c0,0.384,0.06,0.764,0.18,1.14
+				s0.296,0.712,0.527,1.008c0.232,0.297,0.517,0.532,0.853,0.708c0.336,0.177,0.72,0.265,1.151,0.265
+				c0.416,0,0.781-0.088,1.093-0.265c0.312-0.176,0.579-0.407,0.804-0.695s0.393-0.616,0.504-0.984
+				c0.112-0.368,0.168-0.744,0.168-1.128c0-0.399-0.052-0.788-0.156-1.164c-0.104-0.376-0.26-0.712-0.467-1.008
+				c-0.209-0.296-0.477-0.536-0.805-0.72c-0.328-0.185-0.708-0.276-1.141-0.276C112.756,98.671,112.359,98.755,112.016,98.923z"/>
+		</g>
+		<line fill="none" stroke="#47B9E8" stroke-width="2" stroke-miterlimit="10" x1="46.373" y1="81.142" x2="147.75" y2="81.142"/>
+	</g>
+	<g enable-background="new    ">
+		<path fill="#47B9E8" d="M76.196,123.245v17.136h-3.768v-17.136H76.196z"/>
+		<path fill="#47B9E8" d="M87.236,123.245c1.072,0,1.984,0.155,2.736,0.468c0.752,0.312,1.364,0.724,1.836,1.236
+			c0.472,0.512,0.816,1.096,1.032,1.752c0.216,0.656,0.324,1.336,0.324,2.04c0,0.688-0.108,1.364-0.324,2.027
+			c-0.216,0.664-0.56,1.252-1.032,1.765c-0.472,0.512-1.084,0.924-1.836,1.235c-0.752,0.312-1.665,0.469-2.736,0.469h-3.96v6.144
+			h-3.768v-17.136H87.236z M86.205,131.309c0.432,0,0.848-0.031,1.248-0.096c0.399-0.063,0.752-0.188,1.056-0.372
+			c0.304-0.184,0.548-0.444,0.732-0.78c0.184-0.336,0.276-0.775,0.276-1.319s-0.092-0.984-0.276-1.32
+			c-0.184-0.336-0.428-0.596-0.732-0.78c-0.304-0.184-0.656-0.308-1.056-0.372c-0.4-0.063-0.816-0.096-1.248-0.096h-2.928v5.136
+			H86.205z"/>
+		<path fill="#47B9E8" d="M98.229,140.381l-4.248-12.408h3.576l2.616,8.473h0.049l2.615-8.473h3.385l-4.2,12.408H98.229z"/>
+		<path fill="#47B9E8" d="M106.724,136.493v-3.12l7.296-9.792h3.049v10.104h2.231v2.809h-2.231v3.888h-3.24v-3.888H106.724z
+			 M113.756,127.853l-4.344,5.832h4.416v-5.832H113.756z"/>
+	</g>
+</g>
+</svg>

ungleich_page/static/ungleich_page/img/glasfaser/switch.svg

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="196px" height="196px" viewBox="0 0 196 196" enable-background="new 0 0 196 196" xml:space="preserve">
+<g>
+	<ellipse fill="#0D2849" cx="96.871" cy="97.632" rx="68.441" ry="67.431"/>
+	
+		<ellipse opacity="0.57" fill="none" stroke="#47B9E8" stroke-width="2" stroke-miterlimit="10" enable-background="new    " cx="96.719" cy="97.321" rx="62.32" ry="61.179"/>
+</g>
+<g display="none">
+	<path display="inline" opacity="0.84" fill="#FFFFFF" enable-background="new    " d="M40.517,144.309c0-29.391,0-58.75,0-88.158
+		c13.22,0,26.423,0,39.667,0c0-0.204-0.002-0.36,0-0.519c0.03-1.674,0.003-3.351,0.1-5.022c0.094-1.585,0.694-3.012,1.647-4.29
+		c1.329-1.784,3.13-2.802,5.277-3.232c0.6-0.118,1.225-0.159,1.838-0.161c5.851-0.011,11.702-0.011,17.547-0.003
+		c2.4,0.003,4.544,0.751,6.286,2.425c0.964,0.923,1.646,2.051,2.078,3.329c0.402,1.201,0.512,2.436,0.506,3.69
+		c-0.011,1.246-0.005,2.492-0.005,3.768c13.235,0,26.423,0,39.653,0c0,29.4,0,58.772,0,88.173
+		C116.934,144.309,78.744,144.309,40.517,144.309z M146.322,64.998c-32.365,0-64.672,0-97.002,0c0,0.177,0,0.323,0,0.468
+		c0,8.537,0,17.076,0,25.616c0,0.307,0.003,0.616,0.027,0.923c0.199,2.78,1.349,5.052,3.652,6.677
+		c1.658,1.168,3.539,1.563,5.542,1.563c26.189-0.005,52.38-0.003,78.566-0.005c0.324,0,0.646-0.004,0.97-0.024
+		c2.782-0.198,5.055-1.343,6.68-3.644c1.152-1.631,1.572-3.48,1.572-5.453c-0.006-8.553-0.006-17.106-0.006-25.659
+		C146.322,65.315,146.322,65.169,146.322,64.998z M146.301,106.855c-0.06,0.004-0.092,0-0.113,0.011
+		c-2.853,1.55-5.914,2.2-9.145,2.2c-26.219-0.01-52.438-0.004-78.656-0.004c-2.861,0-5.598-0.545-8.176-1.819
+		c-0.283-0.142-0.571-0.271-0.856-0.404c0,9.576,0,19.119,0,28.657c32.333,0,64.627,0,96.946,0
+		C146.301,125.941,146.301,116.409,146.301,106.855z M89.017,56.116c5.894,0,11.747,0,17.599,0c0-1.464,0-2.898,0-4.338
+		c-5.884,0-11.734,0-17.599,0C89.017,53.239,89.017,54.66,89.017,56.116z"/>
+	<path display="inline" fill="#3077A3" d="M146.322,64.998c0,0.172,0,0.317,0,0.463c0,8.553,0,17.106,0.006,25.659
+		c0,1.973-0.42,3.822-1.572,5.453c-1.625,2.301-3.896,3.444-6.68,3.644c-0.323,0.021-0.646,0.024-0.969,0.024
+		c-26.188,0.002-52.378,0-78.567,0.005c-2.002,0-3.884-0.396-5.542-1.562c-2.304-1.625-3.453-3.897-3.652-6.678
+		c-0.024-0.307-0.027-0.616-0.027-0.923c0-8.54,0-17.079,0-25.616c0-0.146,0-0.291,0-0.468
+		C81.65,64.998,113.957,64.998,146.322,64.998z M75.768,82.631c-2.953,0-5.865,0-8.779,0c0,4.411,0,8.795,0,13.166
+		c2.944,0,5.856,0,8.779,0C75.768,91.402,75.768,87.039,75.768,82.631z M119.898,82.623c0,4.422,0,8.806,0,13.174
+		c2.949,0,5.861,0,8.764,0c0-4.408,0-8.781,0-13.174C125.734,82.623,122.833,82.623,119.898,82.623z"/>
+	<path display="inline" fill="#3077A3" d="M146.301,106.855c0,9.554,0,19.086,0,28.641c-32.316,0-64.613,0-96.946,0
+		c0-9.538,0-19.081,0-28.657c0.285,0.136,0.573,0.265,0.856,0.404c2.578,1.274,5.315,1.819,8.176,1.819
+		c26.219,0,52.438-0.006,78.656,0.004c3.229,0,6.292-0.65,9.145-2.2C146.209,106.855,146.241,106.859,146.301,106.855z"/>
+	<path display="inline" fill="#3077A3" d="M89.017,56.116c0-1.456,0-2.877,0-4.338c5.864,0,11.715,0,17.599,0
+		c0,1.44,0,2.874,0,4.338C100.764,56.116,94.911,56.116,89.017,56.116z"/>
+	<path display="inline" opacity="0.84" fill="#FFFFFF" enable-background="new    " d="M75.768,82.631c0,4.408,0,8.771,0,13.166
+		c-2.923,0-5.835,0-8.779,0c0-4.371,0-8.754,0-13.166C69.903,82.631,72.815,82.631,75.768,82.631z"/>
+	<path display="inline" opacity="0.84" fill="#FFFFFF" enable-background="new    " d="M119.898,82.623c2.935,0,5.836,0,8.764,0
+		c0,4.393,0,8.766,0,13.174c-2.9,0-5.812,0-8.764,0C119.898,91.429,119.898,87.044,119.898,82.623z"/>
+</g>
+<image display="none" overflow="visible" enable-background="new    " width="171" height="167" id="Layer_4_xA0_Image_2_" xlink:href="C949B290C0D038A2.png"  transform="matrix(0.9941 0 0 0.9941 12.8198 16.6104)">
+</image>
+<rect x="61.251" y="73.602" fill="none" stroke="#47B9E8" stroke-width="5.5" stroke-miterlimit="10" width="28.351" height="52.284"/>
+<rect x="103.227" y="74.338" fill="none" stroke="#47B9E8" stroke-width="5.5" stroke-miterlimit="10" width="28.351" height="52.284"/>
+<rect x="72.665" y="85.384" fill="#47B9E8" width="5.155" height="6.996"/>
+<rect x="72.665" y="107.477" fill="#47B9E8" width="5.155" height="6.996"/>
+<rect x="103.227" y="97.321" fill="#47B9E8" width="28.351" height="5"/>
+</svg>

ungleich_page/templates/ungleich_page/glasfaser.html

@@ -1,7 +1,8 @@
 {% load static bootstrap3 i18n %}
+{% get_current_language as LANGUAGE_CODE %}
 
 <!DOCTYPE html>
-<html lang="{{LANGUAGE_CODE}}">
+<html lang="de">
 
 <head>
     <meta charset="utf-8">
@@ -23,13 +24,13 @@
     <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
     <![endif]-->
 
-    <link href="//fonts.googleapis.com/css?family=Open+Sans+Condensed:700|Lato:300,400,700,300italic,400italic,700italic|Montserrat:400,700" rel="stylesheet" type="text/css">
+    <link href="//fonts.googleapis.com/css?family=Open+Sans+Condensed:700|Lato:300,400,700|Montserrat:400,700" rel="stylesheet" type="text/css">
 
     <!-- Custom CSS -->
     <link href="{% static 'ungleich_page/css/agency.css' %}" rel="stylesheet">
     <link href="{% static 'ungleich_page/css/ungleich.css' %}" rel="stylesheet">
     <link href="{% static 'datacenterlight/css/landing-page.css' %}" rel="stylesheet">
-    <link href="{% static 'datacenterlight/css/glasfaser.css' %}" rel="stylesheet">
+    <link href="{% static 'ungleich_page/css/glasfaser.css' %}" rel="stylesheet">
 
     <!-- Google analytics -->
     {% include "google_analytics.html" %}
@@ -39,8 +40,7 @@
 </head>
 
 <body id="page-top" class="index">
-    {% get_current_language as LANGUAGE_CODE %}
+    <nav class="navbar navbar-default navbar-fixed-top topnav navbar-transparent">
-    <nav class="navbar navbar-default navbar-fixed-top topnav">
       <div class="topnav">
         <!-- Brand and toggle get grouped for better mobile display -->
         <div class="navbar-header">
@@ -50,8 +50,8 @@
               <span class="icon-bar"></span>
               <span class="icon-bar"></span>
             </button>
-            <a href="{% url 'datacenterlight:index' %}" id="logoBlack" class="navbar-brand topnav"><img src="{% static 'ungleich_page/img/logo_black.svg' %}"></a>
+            <a href="{% url 'ungleich_page:landing' %}" id="logoBlack" class="navbar-brand topnav"><img src="{% static 'ungleich_page/img/logo_black.svg' %}"></a>
-            <a href="{% url 'datacenterlight:index' %}" id="logoWhite" class="navbar-brand topnav"><img src="{% static 'ungleich_page/img/logo_white.svg' %}"></a>
+            <a href="{% url 'ungleich_page:landing' %}" id="logoWhite" class="navbar-brand topnav"><img src="{% static 'ungleich_page/img/logo_white.svg' %}"></a>
         </div>
         <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
           <!-- Start Navbar collapse-->
@@ -86,7 +86,7 @@
     <div class="split-section left" id="your">
       <div class="container">
         <div class="split-text">
-          <div class="split-title wow fadeInDown">
+          <div class="split-title">
             <h2>Unser Glasfaser-Angebot für Glarus Nord, Glarus und Glarus Süd</h2>
           </div>
           <div class="split-description wow fadeInUp">
@@ -120,8 +120,8 @@
         </div>
         <div class="row text-center">
           <div class="col-sm-4">
-            <div class="team-member wow fadeInleft" data-wow-delay="0.5s">
+            <div class="team-member wow fadeInUp" data-wow-delay="0.25s">
-              <img src="{% static 'ungleich_page/img/glasfaser/business.png' %}" class="img-responsive img-circle" alt="">
+              <img src="{% static 'ungleich_page/img/glasfaser/business.svg' %}" class="img-responsive img-circle" alt="">
               <div class="team-member-caption inline-block">
                 <h4 class="portfolio-caption">Business-Internet</h4>
                 <p class="text-muted">Symmetrische Internetleitung 100 Mbit/s upload und 100 Mbit/s download</p>
@@ -130,8 +130,8 @@
             </div>
           </div>
           <div class="col-sm-4">
-            <div class="team-member wow fadeInUp" data-wow-delay="1s">
+            <div class="team-member wow fadeInUp" data-wow-delay="0.5s">
-              <img src="{% static 'ungleich_page/img/glasfaser/ip.png' %}" class="img-responsive img-circle" alt="">
+              <img src="{% static 'ungleich_page/img/glasfaser/ip.svg' %}" class="img-responsive img-circle" alt="">
               <div class="team-member-caption inline-block">
                 <h4 class="portfolio-caption">Erreichbarkeit im Internet</h4>
                 <p class="text-muted">1 öffentliches IPv6-Netzwerk (/64)</p>
@@ -140,8 +140,8 @@
             </div>
           </div>
           <div class="col-sm-4">
-            <div class="team-member wow fadeInRight" data-wow-delay="1.5s">
+            <div class="team-member wow fadeInUp" data-wow-delay="0.75s">
-              <img src="{% static 'ungleich_page/img/glasfaser/switch.png' %}" class="img-responsive img-circle" alt="">
+              <img src="{% static 'ungleich_page/img/glasfaser/switch.svg' %}" class="img-responsive img-circle" alt="">
               <div class="team-member-caption inline-block">
                 <h4 class="portfolio-caption">Einfach zu nutzen</h4>
                 <p class="text-muted">2 vorkonfigurierte Endgeräte (benötigt zwei Steckdosen auf Ihrer Seite)</p>
@@ -165,7 +165,7 @@
             <ul class="timeline">
               <li>
                 <div class="timeline-image">
-                  <img class="img-circle img-responsive" src="{% static 'ungleich_page/img/glasfaser/a.png' %}" alt="">
+                  <img class="img-circle img-responsive" src="{% static 'ungleich_page/img/glasfaser/a.jpg' %}" alt="">
                 </div>
                 <div class="timeline-panel wow slideInLeft">
                   <div class="timeline-body">
@@ -175,7 +175,7 @@
               </li>
               <li class="timeline-inverted">
                 <div class="timeline-image">
-                  <img class="img-circle img-responsive" src="{% static 'ungleich_page/img/glasfaser/b.png' %}" alt="">
+                  <img class="img-circle img-responsive" src="{% static 'ungleich_page/img/glasfaser/b.jpg' %}" alt="">
                 </div>
                 <div class="timeline-panel wow slideInRight">
                   <div class="timeline-body">
@@ -185,7 +185,7 @@
               </li>
               <li>
                 <div class="timeline-image">
-                  <img class="img-circle img-responsive" src="{% static 'ungleich_page/img/glasfaser/c.png' %}" alt="">
+                  <img class="img-circle img-responsive" src="{% static 'ungleich_page/img/glasfaser/c.jpg' %}" alt="">
                 </div>
                 <div class="timeline-panel wow slideInLeft">
                   <div class="timeline-body">
@@ -193,9 +193,9 @@
                   </div>
                 </div>
               </li>
-              <li class="timeline-inverted">
+              <li class="timeline-inverted" style="background: #fff;">
                 <div class="timeline-image">
-                  <img class="img-circle img-responsive" src="{% static 'ungleich_page/img/glasfaser/d.png' %}" alt="">
+                  <img class="img-circle img-responsive" src="{% static 'ungleich_page/img/glasfaser/d.jpg' %}" alt="">
                 </div>
                 <div class="timeline-panel wow slideInDown">
                   <div class="timeline-body">
@@ -297,7 +297,7 @@
     {% include "ungleich_page/includes/_footer.html" %}
 
     <!-- jQuery -->
-    <script src="{% static 'ungleich_page/js/jquery.js' %}" type="text/javascript"></script>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.1.1/jquery.min.js" type="text/javascript"></script>
     <script type="text/javascript">
         $(document).ready(function () {
             if ($(".has-error").length != 0) {
@@ -305,26 +305,19 @@
             }
         });
     </script>
-
+    <script src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/js/bootstrap.min.js" type="text/javascript"></script>
-    <!-- Bootstrap Core JavaScript -->
-    <script src="{% static 'ungleich_page/js/bootstrap.min.js' %}" type="text/javascript"></script>
 
     <!-- Plugin JavaScript -->
-    <script src="//cdnjs.cloudflare.com/ajax/libs/jquery-easing/1.3/jquery.easing.min.js" type="text/javascript"></script>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/1000hz-bootstrap-validator/0.11.9/validator.min.js"></script>
-    <script src="{% static 'ungleich_page/js/classie.js' %}" 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/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>
+    <script src="{% static 'datacenterlight/js/main.js' %}"></script>
 
     <!-- Custom Fonts -->
-
-    <script src="{% static 'datacenterlight/js/main.js' %}"></script>
-    <!-- Load form js -->
-    <script src="{% static 'datacenterlight/js/form.js' %}"></script>
-    <script src="//cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.16.0/jquery.validate.min.js"></script>
-    <script src="//cdnjs.cloudflare.com/ajax/libs/1000hz-bootstrap-validator/0.11.9/validator.min.js"></script>
     <link href="//fonts.googleapis.com/css?family=Raleway" 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="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" type="text/css">
 </body>
 </html>

ungleich_page/templates/ungleich_page/includes/_portfolio.html

@@ -11,7 +11,7 @@
 		</div>
 		<div class="row">
 		  <div class="col-md-4 col-sm-6 portfolio-item wow fadeInDown" data-wow-delay="0.5s">
-		    <img src="{% static 'ungleich_page/img/portfolio/datacenterlight.png' %}" class="img-responsive inline-block" alt="">
+		    <a href="{% url 'datacenterlight:index' %}"><img src="{% static 'ungleich_page/img/portfolio/datacenterlight.png' %}" class="img-responsive inline-block" alt=""></a>
 		    <div class="portfolio-caption inline-block">
 		      <h4>{% trans "Data Center Light" %}</h4>
 		      <p>&nbsp;</p>
@@ -19,7 +19,7 @@
 		    </div>
 		  </div>
 		  <div class="col-md-4 col-sm-6 portfolio-item wow fadeInDown" data-wow-delay="1s">
-		    <img src="{% static 'ungleich_page/img/portfolio/startup-framework.png' %}" class="img-responsive inline-block" alt="">
+		    <a href="{% url 'rails.hosting' %}"><img src="{% static 'ungleich_page/img/portfolio/startup-framework.png' %}" class="img-responsive inline-block" alt=""></a>
 		    <div class="portfolio-caption inline-block">
 		      <h4>{% trans "Rails Hosting" %} </h4>
 		      <p>&nbsp;</p>
@@ -27,7 +27,7 @@
 		    </div>
 		  </div>
 		  <div class="col-md-4 col-sm-6 portfolio-item wow fadeInDown" data-wow-delay="1.5s">
-		    <img src="{% static 'ungleich_page/img/portfolio/glasfaser.png' %}" class="img-responsive inline-block" alt="">
+		    <a href="{% url 'datacenterlight:glasfaser' %}"><img src="{% static 'ungleich_page/img/portfolio/glasfaser.png' %}" class="img-responsive inline-block" alt=""></a>
 		    <div class="portfolio-caption inline-block">
 		      <h4>{% trans "High Speed Internet" %}</h4>
 		      <p>&nbsp;</p>