From 17256e7059752fc225236d2bf7fa0e3ee77ca671 Mon Sep 17 00:00:00 2001
From: Ivlev Denis <di-erz@yandex.ru>
Date: Thu, 19 Jul 2018 10:54:11 +0300
Subject: [PATCH] Simlify index template

---
 project/templates/blocks/calc_viewport.html   | 12 +++
 .../templates/blocks/facebook_pixel_code.html | 20 +++++
 project/templates/blocks/ga.html              |  9 +++
 project/templates/blocks/yandex_metrika.html  | 33 ++++++++
 project/templates/lilcity/index.html          | 77 ++-----------------
 5 files changed, 82 insertions(+), 69 deletions(-)
 create mode 100644 project/templates/blocks/calc_viewport.html
 create mode 100644 project/templates/blocks/facebook_pixel_code.html
 create mode 100644 project/templates/blocks/ga.html
 create mode 100644 project/templates/blocks/yandex_metrika.html

diff --git a/project/templates/blocks/calc_viewport.html b/project/templates/blocks/calc_viewport.html
new file mode 100644
index 00000000..afb58876
--- /dev/null
+++ b/project/templates/blocks/calc_viewport.html
@@ -0,0 +1,12 @@
+<script>
+  var viewportmeta = document.querySelector('meta[name="viewport"]');
+  if (viewportmeta) {
+    if (screen.width <= 360) {
+      var newScale = screen.width / 360;
+      viewportmeta.content = 'width=360, minimum-scale=' + newScale + ', user-scalable=0, maximum-scale=1, initial-scale=' + newScale + '';
+    }
+    else {
+      viewportmeta.content = 'width=device-width, maximum-scale=1.6, initial-scale=1.0';
+    }
+  }
+</script>
diff --git a/project/templates/blocks/facebook_pixel_code.html b/project/templates/blocks/facebook_pixel_code.html
new file mode 100644
index 00000000..9ef2e0e4
--- /dev/null
+++ b/project/templates/blocks/facebook_pixel_code.html
@@ -0,0 +1,20 @@
+<!-- Facebook Pixel Code -->
+<script>
+  !function (f, b, e, v, n, t, s) {
+    if (f.fbq) return; n = f.fbq = function () {
+      n.callMethod ?
+        n.callMethod.apply(n, arguments) : n.queue.push(arguments)
+    };
+    if (!f._fbq) f._fbq = n; n.push = n; n.loaded = !0; n.version = '2.0';
+    n.queue = []; t = b.createElement(e); t.async = !0;
+    t.src = v; s = b.getElementsByTagName(e)[0];
+    s.parentNode.insertBefore(t, s)
+  }(window, document, 'script',
+    'https://connect.facebook.net/en_US/fbevents.js');
+  fbq('init', '194961257900508');
+  fbq('track', 'PageView');
+</script>
+<noscript>
+  <img height="1" width="1" src="https://www.facebook.com/tr?id=194961257900508&ev=PageView&noscript=1" />
+</noscript>
+<!-- End Facebook Pixel Code -->
diff --git a/project/templates/blocks/ga.html b/project/templates/blocks/ga.html
new file mode 100644
index 00000000..2ee7b520
--- /dev/null
+++ b/project/templates/blocks/ga.html
@@ -0,0 +1,9 @@
+<!-- Global site tag (gtag.js) - Google Analytics -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=UA-121923960-1"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag() { dataLayer.push(arguments); }
+  gtag('js', new Date());
+
+  gtag('config', 'UA-121923960-1');
+</script>
diff --git a/project/templates/blocks/yandex_metrika.html b/project/templates/blocks/yandex_metrika.html
new file mode 100644
index 00000000..8a9a7b48
--- /dev/null
+++ b/project/templates/blocks/yandex_metrika.html
@@ -0,0 +1,33 @@
+<!-- Yandex.Metrika counter -->
+<script type="text/javascript">
+  (function (d, w, c) {
+    (w[c] = w[c] || []).push(function () {
+      try {
+        w.yaCounter49354039 = new Ya.Metrika2({
+          id: 49354039,
+          clickmap: true,
+          trackLinks: true,
+          accurateTrackBounce: true,
+          webvisor: true
+        });
+      } catch (e) { }
+    });
+
+    var n = d.getElementsByTagName("script")[0],
+      s = d.createElement("script"),
+      f = function () { n.parentNode.insertBefore(s, n); };
+    s.type = "text/javascript";
+    s.async = true;
+    s.src = "https://mc.yandex.ru/metrika/tag.js";
+
+    if (w.opera == "[object Opera]") {
+      d.addEventListener("DOMContentLoaded", f, false);
+    } else { f(); }
+  })(document, window, "yandex_metrika_callbacks2");
+</script>
+<noscript>
+  <div>
+    <img src="https://mc.yandex.ru/watch/49354039" style="position:absolute; left:-9999px;" alt="" />
+  </div>
+</noscript>
+<!-- /Yandex.Metrika counter -->
diff --git a/project/templates/lilcity/index.html b/project/templates/lilcity/index.html
index 5d7b9d2d..7b8ecdd2 100644
--- a/project/templates/lilcity/index.html
+++ b/project/templates/lilcity/index.html
@@ -38,18 +38,9 @@
     {% endcompress %}
 
     <link rel="shortcut icon" type="image/png" href="{% static 'img/favicon.png' %}"/>
-    <script>
-        var viewportmeta = document.querySelector('meta[name="viewport"]');
-        if (viewportmeta) {
-            if (screen.width <= 360) {
-                var newScale = screen.width / 360;
-                viewportmeta.content = 'width=360, minimum-scale=' + newScale + ', user-scalable=0, maximum-scale=1, initial-scale=' + newScale + '';
-            }
-            else {
-                viewportmeta.content = 'width=device-width, maximum-scale=1.6, initial-scale=1.0';
-            }
-        }
-    </script>
+
+    {% include "templates/blocks/calc_viewport.html" %}
+
     <script>
       LIL_SERVER_TIME = "{% now 'U' %}";
       LIL_SERVER_TIME_DIFF = Math.floor((new Date().getTime()) / 1000) - parseInt(LIL_SERVER_TIME);
@@ -57,64 +48,12 @@
       COURSE_ID = "{{ course.id }}";
       MIXPANEL_CUSTOM_LIB_URL = "/static/mixpanel-2-latest.js";
     </script>
-    <!-- Facebook Pixel Code -->
-    <script>
-      !function(f,b,e,v,n,t,s)
-      {if(f.fbq)return;n=f.fbq=function(){n.callMethod?
-      n.callMethod.apply(n,arguments):n.queue.push(arguments)};
-      if(!f._fbq)f._fbq=n;n.push=n;n.loaded=!0;n.version='2.0';
-      n.queue=[];t=b.createElement(e);t.async=!0;
-      t.src=v;s=b.getElementsByTagName(e)[0];
-      s.parentNode.insertBefore(t,s)}(window,document,'script',
-      'https://connect.facebook.net/en_US/fbevents.js');
-        fbq('init', '194961257900508');
-      fbq('track', 'PageView');
-    </script>
-    <noscript>
-      <img height="1" width="1"
-      src="https://www.facebook.com/tr?id=194961257900508&ev=PageView
-      &noscript=1"/>
-    </noscript>
-    <!-- End Facebook Pixel Code -->
-    <!-- Global site tag (gtag.js) - Google Analytics -->
-    <script async src="https://www.googletagmanager.com/gtag/js?id=UA-121923960-1"></script>
-    <script>
-      window.dataLayer = window.dataLayer || [];
-      function gtag(){dataLayer.push(arguments);}
-      gtag('js', new Date());
-
-      gtag('config', 'UA-121923960-1');
-    </script>
-    <!-- Yandex.Metrika counter -->
-    <script type="text/javascript" >
-        (function (d, w, c) {
-            (w[c] = w[c] || []).push(function() {
-                try {
-                    w.yaCounter49354039 = new Ya.Metrika2({
-                        id:49354039,
-                        clickmap:true,
-                        trackLinks:true,
-                        accurateTrackBounce:true,
-                        webvisor:true
-                    });
-                } catch(e) { }
-            });
-
-            var n = d.getElementsByTagName("script")[0],
-                s = d.createElement("script"),
-                f = function () { n.parentNode.insertBefore(s, n); };
-            s.type = "text/javascript";
-            s.async = true;
-            s.src = "https://mc.yandex.ru/metrika/tag.js";
-
-            if (w.opera == "[object Opera]") {
-                d.addEventListener("DOMContentLoaded", f, false);
-            } else { f(); }
-        })(document, window, "yandex_metrika_callbacks2");
-    </script>
-    <noscript><div><img src="https://mc.yandex.ru/watch/49354039" style="position:absolute; left:-9999px;" alt="" /></div></noscript>
-    <!-- /Yandex.Metrika counter -->
+    {% if not debug %}
+    {% include "templates/blocks/facebook_pixel_code.html" %}
+    {% include "templates/blocks/ga.html" %}
+    {% include "templates/blocks/yandex_metrika.html" %}
     {% include "templates/blocks/mixpanel.html" %}
+    {% endif %}
   </head>
   <body>
     {% include "templates/blocks/social.html" %}