[MERGE] forward port of branch 8.0 up to ed92589

[odoo/odoo.git] / addons / website / views / website_templates.xml
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml

index 12d417c..af4843f 100644 (file)
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -87,17 +87,6 @@
              <t t-call-assets="website.assets_frontend" t-js="false"/>
  
              <t t-raw="head or ''" name='layout_head'/>
-            <t t-if="website and website.google_analytics_key">
-                <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', _.str.trim('<t t-esc="website.google_analytics_key"/>'), 'auto');
-                    ga('send','pageview');
-                </script>
-            </t>
          </head>
          <body>
              <div id="wrapwrap">
@@ -146,6 +135,15 @@
  
              <t t-call-assets="web.assets_common" t-css="false"/>
              <t t-call-assets="website.assets_frontend" t-css="false"/>
+            <script t-if="website and website.google_analytics_key">
+                (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', _.str.trim('<t t-esc="website.google_analytics_key"/>'), 'auto');
+                ga('send','pageview');
+            </script>
          </body>
      </html>
  </template>