From owner-svn-doc-head@freebsd.org Fri Jun 8 05:42:15 2018 Return-Path: Delivered-To: svn-doc-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8A5CD1011323; Fri, 8 Jun 2018 05:42:15 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 36E9C743AA; Fri, 8 Jun 2018 05:42:15 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 17D5E2BC1; Fri, 8 Jun 2018 05:42:15 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w585gEI9032366; Fri, 8 Jun 2018 05:42:14 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w585gEZO032363; Fri, 8 Jun 2018 05:42:14 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201806080542.w585gEZO032363@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Fri, 8 Jun 2018 05:42:14 +0000 (UTC) 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 X-SVN-Group: doc-head X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: in head: en_US.ISO8859-1/htdocs/layout en_US.ISO8859-1/htdocs/layout/js share/xml X-SVN-Commit-Revision: 51804 X-SVN-Commit-Repository: doc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Jun 2018 05:42:15 -0000 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 @@ + '> + +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');} +"> + +'> ]]> + Header And Logo'> 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 @@ + &header1.googleiframe;
&header2;