ga: convert to "tag manager"

There have been two generations of GA since we first implemented GA on
the website. The newest version allows us to get deeper insights while
collecting less personal data. This version is also faster and loads
async which should help load the &os; website on slower networks.

As a reminder: to opt out do ANY of the following:
- block google.com via an adblocker
- set (abuse) the "do not track" header

In addition we've selected to disable many features in the console that
would result in collecting more data.

With Hat:	webstats@

en_US.ISO8859-1/htdocs/layout/Makefile

@@ -9,6 +9,5 @@
 
 SUBDIR=		css
 SUBDIR+=	images
-SUBDIR+=	js
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"

en_US.ISO8859-1/htdocs/layout/js/Makefile

@@ -1,12 +0,0 @@
-# $FreeBSD$
-
-.if exists(../Makefile.conf)
-.include "../Makefile.conf"
-.endif
-.if exists(../Makefile.inc)
-.include "../Makefile.inc"
-.endif
-
-DATA=   google.js
-
-.include "${DOC_PREFIX}/share/mk/web.site.mk"

en_US.ISO8859-1/htdocs/layout/js/google.js

@@ -1,52 +0,0 @@
-/* $FreeBSD$ */
-
-/*
- * Please do not commit to this file without receiving review from
- * webstats@FreeBSD.org.
- */
-
-/* Teach jslint the appropriate style rules. */
-/*jslint browser:true*/
-
-var enable_ga = true;
-var allow_track = true;
-
-var h = document.location.hostname;
-/*
- * Check that the hosting domain is actually a FreeBSD.org domain, so
- * we don't accidentally obtain data from mirrors.
- */
-var fbsdregex = /((docs|security|svnweb|wiki|www)\.freebsd\.org|google\.com)$/i;
-
-if (typeof navigator.doNotTrack !== "undefined" && (navigator.doNotTrack == "yes" || navigator.doNotTrack == "1")) {
-	allow_track = false;
-}
-
-if (enable_ga && allow_track && fbsdregex.test(h)) {
-	var _gaq = _gaq || [];
-	_gaq.push(['_setAccount', 'UA-22767463-1']);
-	_gaq.push(['_setDomainName', 'freebsd.org']);
-	_gaq.push(['_setAllowHash', false]);
-	_gaq.push (['_gat._anonymizeIp']);
-
-	/*
-	 * If we ever want to track sites other than FreeBSD.org,
-	 * uncomment the next line.
-	 */
-	//_gaq.push(['_setAllowLinker', true]);
-	// This is what we track
-	_gaq.push(['_trackPageview']);
-	_gaq.push(['_trackPageLoadTime']);
-
-	( function() {
-		var ga = document.createElement('script');
-		ga.type = 'text/javascript';
-		ga.async = true;
-		ga.src = 'https://ssl.google-analytics.com/ga.js';
-		var s = document.getElementsByTagName('script')[0];
-		s.parentNode.insertBefore(ga, s);
-
-	})();
-
-}
-

share/xml/header.ent

@@ -21,10 +21,33 @@
 
 <!-- Standard headers and footers -->
 
+<!--
+  Owned by webstats@
+  Check that the hosting domain is actually a FreeBSD.org domain, so
+  we do not accidentally obtain data from mirrors.
+ -->
 <![%html.header.script.google;[
-<!ENTITY header1.googlejs '<script xmlns="http://www.w3.org/1999/xhtml" type="text/javascript" src="&enbase;/layout/js/google.js"></script>'>
+<!ENTITY header1.googlejs "
+<script xmlns='http://www.w3.org/1999/xhtml'> 
+var allow_track = true; var h = document.location.hostname;
+var fbsdregex = /((docs|security|svnweb|wiki|www)\.freebsd\.org|google\.com)$/i;
+
+if (typeof navigator.doNotTrack !== 'undefined' &amp;&amp; (navigator.doNotTrack == '1')) {
+	allow_track = false;
+}
+if (allow_track &amp;&amp; fbsdregex.test(h)) {
+(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
+new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
+j=d.createElement(s),dl=l!='dataLayer'?'&amp;l='+l:'';j.async=true;j.src=
+'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+})(window,document,'script','dataLayer','GTM-PXRWZVR');}
+</script>">
+<!ENTITY header1.googleiframe '
+<noscript xmlns="http://www.w3.org/1999/xhtml"><iframe xmlns="http://www.w3.org/1999/xhtml" src="https://www.googletagmanager.com/ns.html?id=GTM-PXRWZVR" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
+'>
 ]]>
 <!ENTITY header1.googlejs ''>
+<!ENTITY header1.googleiframe ''>
 
 <!ENTITY header2.logo-red.label '<h2 xmlns="http://www.w3.org/1999/xhtml" class="blockhide">Header And Logo</h2>'>
 

share/xml/xhtml.xsl

@@ -49,6 +49,7 @@
       </head>
 
       <body>
+	&header1.googleiframe;
 	<div id="containerwrap">
 	  <div id="container">
 	    &header2;