From a8be59d7a220630c51193c49dc137a51d28dee57 Mon Sep 17 00:00:00 2001
From: Andrii Marynets <andrii.marynets@gmail.com>
Date: Thu, 13 Jul 2017 22:53:15 +0300
Subject: [PATCH 1/2] Add GA to all important apps

---
 digitalglarus/templates/new_base_glarus.html  | 19 ++++++----
 dynamicweb/settings/base.py                   |  5 ++-
 hosting/templates/hosting/base.html           | 19 ++++++----
 hosting/templates/hosting/base_short.html     |  3 ++
 hosting/templates/hosting/beta.html           | 19 ++++++----
 .../templates/hosting/hosting_pricing.html    |  4 +-
 .../cms/ungleichch/base_ungleich.html         | 20 ++++++----
 .../templates/ungleich_page/landing.html      | 37 ++++++++++---------
 8 files changed, 75 insertions(+), 51 deletions(-)

diff --git a/digitalglarus/templates/new_base_glarus.html b/digitalglarus/templates/new_base_glarus.html
index 826b49c0..1c4cd4c4 100644
--- a/digitalglarus/templates/new_base_glarus.html
+++ b/digitalglarus/templates/new_base_glarus.html
@@ -46,16 +46,19 @@
     <![endif]-->
     <!-- <link href="css/ungleich.css" rel="stylesheet" type="text/css"></link> -->
     <!-- Google tracking -->
-    <script src="//www.google-analytics.com/analytics.js" async></script><script>
-      (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-      m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-      })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+    <!--<script src="//www.google-analytics.com/analytics.js" async></script><script>-->
+      <!--(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){-->
+      <!--(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),-->
+      <!--m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)-->
+      <!--})(window,document,'script','//www.google-analytics.com/analytics.js','ga');-->
 
-      ga('create', 'UA-62285904-1', 'auto');
-      ga('send', 'pageview');
+      <!--ga('create', 'UA-62285904-1', 'auto');-->
+      <!--ga('send', 'pageview');-->
 
-    </script>
+    <!--</script>-->
+    <!-- Google analytics -->
+    {% include 'google_analytics.html' %}
+    <!-- End Google Analytics -->
     <link rel="shortcut icon" href="{% static 'digitalglarus/img/favicon.ico' %}" type="image/x-icon">
     <style id="igtranslator-color" type="text/css"></style>
     <style type="text/css">
diff --git a/dynamicweb/settings/base.py b/dynamicweb/settings/base.py
index 56c1e589..9ff09b8d 100644
--- a/dynamicweb/settings/base.py
+++ b/dynamicweb/settings/base.py
@@ -515,8 +515,11 @@ DCL_SUPPORT_FROM_ADDRESS = env('DCL_SUPPORT_FROM_ADDRESS')
 
 # Settings for Google analytics
 GOOGLE_ANALYTICS_PROPERTY_IDS = {
-    'datacenterlight.ch': 'UA-62285904-9',
+    'ungleich.ch': 'UA-62285904-1',
     'digitalglarus.ch': 'UA-62285904-2',
+    'blog.ungleich.ch': 'UA-62285904-4',
+    'datacenterlight.ch': 'UA-62285904-9',
+
     '127.0.0.1:8000': 'localhost',
     'dynamicweb-development.ungleich.ch': 'development',
     'dynamicweb-staging.ungleich.ch': 'staging'
diff --git a/hosting/templates/hosting/base.html b/hosting/templates/hosting/base.html
index 8d7036e5..43147323 100644
--- a/hosting/templates/hosting/base.html
+++ b/hosting/templates/hosting/base.html
@@ -45,16 +45,19 @@
     }
 </style>
 {% endwith %}   
-<script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+<!--<script>-->
+  <!--(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){-->
+  <!--(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),-->
+  <!--m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)-->
+  <!--})(window,document,'script','//www.google-analytics.com/analytics.js','ga');-->
 
-  ga('create', 'UA-62285904-5', 'auto');
-  ga('send', 'pageview');
+  <!--ga('create', 'UA-62285904-5', 'auto');-->
+  <!--ga('send', 'pageview');-->
 
-</script>
+<!--</script>-->
+    <!-- Google analytics -->
+    {% include "google_analytics.html" %}
+    <!-- End Google Analytics -->
 
 </head>
 <body>
diff --git a/hosting/templates/hosting/base_short.html b/hosting/templates/hosting/base_short.html
index c3b19c8c..6a08b97b 100644
--- a/hosting/templates/hosting/base_short.html
+++ b/hosting/templates/hosting/base_short.html
@@ -40,6 +40,9 @@
         <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
     <![endif]-->
 
+    <!-- Google analytics -->
+    {% include "google_analytics.html" %}
+    <!-- End Google Analytics -->
 </head>
 
 <body>
diff --git a/hosting/templates/hosting/beta.html b/hosting/templates/hosting/beta.html
index 68cbb5a9..caecdb82 100644
--- a/hosting/templates/hosting/beta.html
+++ b/hosting/templates/hosting/beta.html
@@ -31,16 +31,19 @@
         <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
         <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
     <![endif]-->
-<script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+<!--<script>-->
+  <!--(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){-->
+  <!--(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),-->
+  <!--m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)-->
+  <!--})(window,document,'script','//www.google-analytics.com/analytics.js','ga');-->
 
-  ga('create', 'UA-62285904-5', 'auto');
-  ga('send', 'pageview');
+  <!--ga('create', 'UA-62285904-5', 'auto');-->
+  <!--ga('send', 'pageview');-->
 
-</script>
+<!--</script>-->
+    <!-- Google analytics -->
+    {% include 'google_analytics.html' %}
+    <!-- End Google Analytics -->
 
 </head>
 
diff --git a/hosting/templates/hosting/hosting_pricing.html b/hosting/templates/hosting/hosting_pricing.html
index c6ae33d0..9032ddd6 100644
--- a/hosting/templates/hosting/hosting_pricing.html
+++ b/hosting/templates/hosting/hosting_pricing.html
@@ -18,7 +18,9 @@
     <link href="{% static 'hosting/font-awesome/css/font-awesome.min.css' %}" rel="stylesheet" type="text/css">
     <link href="//fonts.googleapis.com/css?family=Lato:300,400,700,300italic,400italic,700italic" rel="stylesheet" type="text/css">
     <link rel="shortcut icon" href="{% static 'hosting/img/favicon.ico' %}" type="image/x-icon" />
-
+    <!-- Google analytics -->
+    {% include 'google_analytics.html' %}
+    <!-- End Google Analytics -->
 </head>
 <body>
 
diff --git a/ungleich/templates/cms/ungleichch/base_ungleich.html b/ungleich/templates/cms/ungleichch/base_ungleich.html
index 30dfdeb9..2acadfce 100644
--- a/ungleich/templates/cms/ungleichch/base_ungleich.html
+++ b/ungleich/templates/cms/ungleichch/base_ungleich.html
@@ -34,6 +34,10 @@
     {% endblock %}
     {% render_block "external-css" %}
     {% render_block "css" postprocessor "compressor.contrib.sekizai.compress" %}
+
+    <!-- Google analytics -->
+    {% include "google_analytics.html" %}
+    <!-- End Google Analytics -->
   </head>
   <body>
 
@@ -60,16 +64,16 @@
     {% bootstrap_javascript %}
     {% endaddtoblock %}
     {% addtoblock "js" %}
-    <script>
-      (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-      m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-      })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+    <!--<script>-->
+      <!--(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){-->
+      <!--(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),-->
+      <!--m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)-->
+      <!--})(window,document,'script','//www.google-analytics.com/analytics.js','ga');-->
 
-      ga('create', 'UA-62285904-4', 'auto');
-      ga('send', 'pageview');
+      <!--ga('create', 'UA-62285904-4', 'auto');-->
+      <!--ga('send', 'pageview');-->
 
-    </script>
+    <!--</script>-->
 
     <script src="{% static 'blog.ungleich.ch/vendor/js/jquery.min.js' %}" type="text/javascript" />
     <script src="{% static 'blog.ungleich.ch/js/navbar-scroll-up.js' %}" type="text/javascript" />
diff --git a/ungleich_page/templates/ungleich_page/landing.html b/ungleich_page/templates/ungleich_page/landing.html
index 0eaf0a2c..8e09ac2d 100644
--- a/ungleich_page/templates/ungleich_page/landing.html
+++ b/ungleich_page/templates/ungleich_page/landing.html
@@ -32,25 +32,28 @@
     <link href="{% static 'ungleich_page/css/ungleich.css' %}" rel="stylesheet">
 
 
-    <!-- Google tracking -->
-    <script src="//www.google-analytics.com/analytics.js" async></script>
-    <script>
-        (function (i, s, o, g, r, a, m) {
-            i['GoogleAnalyticsObject'] = r;
-            i[r] = i[r] || function () {
-                        (i[r].q = i[r].q || []).push(arguments)
-                    }, i[r].l = 1 * new Date();
-            a = s.createElement(o),
-                    m = s.getElementsByTagName(o)[0];
-            a.async = 1;
-            a.src = g;
-            m.parentNode.insertBefore(a, m)
-        })(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
+    <!--&lt;!&ndash; Google tracking &ndash;&gt;-->
+    <!--<script src="//www.google-analytics.com/analytics.js" async></script>-->
+    <!--<script>-->
+        <!--(function (i, s, o, g, r, a, m) {-->
+            <!--i['GoogleAnalyticsObject'] = r;-->
+            <!--i[r] = i[r] || function () {-->
+                        <!--(i[r].q = i[r].q || []).push(arguments)-->
+                    <!--}, i[r].l = 1 * new Date();-->
+            <!--a = s.createElement(o),-->
+                    <!--m = s.getElementsByTagName(o)[0];-->
+            <!--a.async = 1;-->
+            <!--a.src = g;-->
+            <!--m.parentNode.insertBefore(a, m)-->
+        <!--})(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');-->
 
-        ga('create', 'UA-62285904-1', 'auto');
-        ga('send', 'pageview');
+        <!--ga('create', 'UA-62285904-1', 'auto');-->
+        <!--ga('send', 'pageview');-->
 
-    </script>
+    <!--</script>-->
+    <!-- Google analytics -->
+    {% include "google_analytics.html" %}
+    <!-- End Google Analytics -->
     <link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
     <style id="igtranslator-color" type="text/css"></style>
 </head>

From c7feed6a7354c8ca9e45383fa6edd464d532bf42 Mon Sep 17 00:00:00 2001
From: Andrii Marynets <andrii.marynets@gmail.com>
Date: Thu, 13 Jul 2017 23:50:11 +0300
Subject: [PATCH 2/2] Delete commented code

---
 digitalglarus/templates/new_base_glarus.html  | 10 ----------
 dynamicweb/settings/base.py                   |  1 +
 hosting/templates/hosting/base.html           |  9 ---------
 hosting/templates/hosting/beta.html           |  9 ---------
 .../cms/ungleichch/base_ungleich.html         |  9 ---------
 .../templates/ungleich_page/landing.html      | 20 -------------------
 6 files changed, 1 insertion(+), 57 deletions(-)

diff --git a/digitalglarus/templates/new_base_glarus.html b/digitalglarus/templates/new_base_glarus.html
index 1c4cd4c4..3b18756d 100644
--- a/digitalglarus/templates/new_base_glarus.html
+++ b/digitalglarus/templates/new_base_glarus.html
@@ -45,17 +45,7 @@
     <script src="{% static 'digitalglarus/https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
     <![endif]-->
     <!-- <link href="css/ungleich.css" rel="stylesheet" type="text/css"></link> -->
-    <!-- Google tracking -->
-    <!--<script src="//www.google-analytics.com/analytics.js" async></script><script>-->
-      <!--(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){-->
-      <!--(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),-->
-      <!--m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)-->
-      <!--})(window,document,'script','//www.google-analytics.com/analytics.js','ga');-->
 
-      <!--ga('create', 'UA-62285904-1', 'auto');-->
-      <!--ga('send', 'pageview');-->
-
-    <!--</script>-->
     <!-- Google analytics -->
     {% include 'google_analytics.html' %}
     <!-- End Google Analytics -->
diff --git a/dynamicweb/settings/base.py b/dynamicweb/settings/base.py
index 9ff09b8d..bd6e30e3 100644
--- a/dynamicweb/settings/base.py
+++ b/dynamicweb/settings/base.py
@@ -518,6 +518,7 @@ GOOGLE_ANALYTICS_PROPERTY_IDS = {
     'ungleich.ch': 'UA-62285904-1',
     'digitalglarus.ch': 'UA-62285904-2',
     'blog.ungleich.ch': 'UA-62285904-4',
+    'hosting': 'UA-62285904-5',
     'datacenterlight.ch': 'UA-62285904-9',
 
     '127.0.0.1:8000': 'localhost',
diff --git a/hosting/templates/hosting/base.html b/hosting/templates/hosting/base.html
index 43147323..b485451f 100644
--- a/hosting/templates/hosting/base.html
+++ b/hosting/templates/hosting/base.html
@@ -45,16 +45,7 @@
     }
 </style>
 {% endwith %}   
-<!--<script>-->
-  <!--(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){-->
-  <!--(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),-->
-  <!--m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)-->
-  <!--})(window,document,'script','//www.google-analytics.com/analytics.js','ga');-->
 
-  <!--ga('create', 'UA-62285904-5', 'auto');-->
-  <!--ga('send', 'pageview');-->
-
-<!--</script>-->
     <!-- Google analytics -->
     {% include "google_analytics.html" %}
     <!-- End Google Analytics -->
diff --git a/hosting/templates/hosting/beta.html b/hosting/templates/hosting/beta.html
index caecdb82..bdf37f58 100644
--- a/hosting/templates/hosting/beta.html
+++ b/hosting/templates/hosting/beta.html
@@ -31,16 +31,7 @@
         <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
         <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
     <![endif]-->
-<!--<script>-->
-  <!--(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){-->
-  <!--(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),-->
-  <!--m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)-->
-  <!--})(window,document,'script','//www.google-analytics.com/analytics.js','ga');-->
 
-  <!--ga('create', 'UA-62285904-5', 'auto');-->
-  <!--ga('send', 'pageview');-->
-
-<!--</script>-->
     <!-- Google analytics -->
     {% include 'google_analytics.html' %}
     <!-- End Google Analytics -->
diff --git a/ungleich/templates/cms/ungleichch/base_ungleich.html b/ungleich/templates/cms/ungleichch/base_ungleich.html
index 2acadfce..ac073c4c 100644
--- a/ungleich/templates/cms/ungleichch/base_ungleich.html
+++ b/ungleich/templates/cms/ungleichch/base_ungleich.html
@@ -64,16 +64,7 @@
     {% bootstrap_javascript %}
     {% endaddtoblock %}
     {% addtoblock "js" %}
-    <!--<script>-->
-      <!--(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){-->
-      <!--(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),-->
-      <!--m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)-->
-      <!--})(window,document,'script','//www.google-analytics.com/analytics.js','ga');-->
 
-      <!--ga('create', 'UA-62285904-4', 'auto');-->
-      <!--ga('send', 'pageview');-->
-
-    <!--</script>-->
 
     <script src="{% static 'blog.ungleich.ch/vendor/js/jquery.min.js' %}" type="text/javascript" />
     <script src="{% static 'blog.ungleich.ch/js/navbar-scroll-up.js' %}" type="text/javascript" />
diff --git a/ungleich_page/templates/ungleich_page/landing.html b/ungleich_page/templates/ungleich_page/landing.html
index 8e09ac2d..6d9e4a5e 100644
--- a/ungleich_page/templates/ungleich_page/landing.html
+++ b/ungleich_page/templates/ungleich_page/landing.html
@@ -31,26 +31,6 @@
 
     <link href="{% static 'ungleich_page/css/ungleich.css' %}" rel="stylesheet">
 
-
-    <!--&lt;!&ndash; Google tracking &ndash;&gt;-->
-    <!--<script src="//www.google-analytics.com/analytics.js" async></script>-->
-    <!--<script>-->
-        <!--(function (i, s, o, g, r, a, m) {-->
-            <!--i['GoogleAnalyticsObject'] = r;-->
-            <!--i[r] = i[r] || function () {-->
-                        <!--(i[r].q = i[r].q || []).push(arguments)-->
-                    <!--}, i[r].l = 1 * new Date();-->
-            <!--a = s.createElement(o),-->
-                    <!--m = s.getElementsByTagName(o)[0];-->
-            <!--a.async = 1;-->
-            <!--a.src = g;-->
-            <!--m.parentNode.insertBefore(a, m)-->
-        <!--})(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');-->
-
-        <!--ga('create', 'UA-62285904-1', 'auto');-->
-        <!--ga('send', 'pageview');-->
-
-    <!--</script>-->
     <!-- Google analytics -->
     {% include "google_analytics.html" %}
     <!-- End Google Analytics -->