Date: Fri, 8 Jun 2018 05:42:14 +0000 (UTC) From: Eitan Adler <eadler@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r51804 - in head: en_US.ISO8859-1/htdocs/layout en_US.ISO8859-1/htdocs/layout/js share/xml Message-ID: <201806080542.w585gEZO032363@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: eadler Date: Fri Jun 8 05:42:14 2018 New Revision: 51804 URL: https://svnweb.freebsd.org/changeset/doc/51804 Log: 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@ Deleted: head/en_US.ISO8859-1/htdocs/layout/js/ Modified: head/en_US.ISO8859-1/htdocs/layout/Makefile head/share/xml/header.ent head/share/xml/xhtml.xsl Modified: head/en_US.ISO8859-1/htdocs/layout/Makefile ============================================================================== --- head/en_US.ISO8859-1/htdocs/layout/Makefile Fri Jun 8 03:57:09 2018 (r51803) +++ head/en_US.ISO8859-1/htdocs/layout/Makefile Fri Jun 8 05:42:14 2018 (r51804) @@ -9,6 +9,5 @@ SUBDIR= css SUBDIR+= images -SUBDIR+= js .include "${DOC_PREFIX}/share/mk/web.site.mk" Modified: head/share/xml/header.ent ============================================================================== --- head/share/xml/header.ent Fri Jun 8 03:57:09 2018 (r51803) +++ head/share/xml/header.ent Fri Jun 8 05:42:14 2018 (r51804) @@ -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' && (navigator.doNotTrack == '1')) { + allow_track = false; +} +if (allow_track && 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'?'&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>'> Modified: head/share/xml/xhtml.xsl ============================================================================== --- head/share/xml/xhtml.xsl Fri Jun 8 03:57:09 2018 (r51803) +++ head/share/xml/xhtml.xsl Fri Jun 8 05:42:14 2018 (r51804) @@ -49,6 +49,7 @@ </head> <body> + &header1.googleiframe; <div id="containerwrap"> <div id="container"> &header2;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806080542.w585gEZO032363>