From owner-svn-doc-head@freebsd.org Wed Jun 20 01:07:58 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 0FB35101AD17; Wed, 20 Jun 2018 01:07:58 +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 B57BB7F2D8; Wed, 20 Jun 2018 01:07:57 +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 92B531B59E; Wed, 20 Jun 2018 01:07:57 +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 w5K17va0050055; Wed, 20 Jun 2018 01:07:57 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5K17vIR050052; Wed, 20 Jun 2018 01:07:57 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201806200107.w5K17vIR050052@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Wed, 20 Jun 2018 01:07:57 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r51888 - 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: 51888 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: Wed, 20 Jun 2018 01:07:58 -0000 Author: eadler Date: Wed Jun 20 01:07:56 2018 New Revision: 51888 URL: https://svnweb.freebsd.org/changeset/doc/51888 Log: stats: revert r51804 Due to incomplete testing I hadn't noticed that this actually generated "&&" rather than "&&" in the output. Revert for now while I solicit some help getting this done right. Added: head/en_US.ISO8859-1/htdocs/layout/js/ - copied from r51803, 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 Tue Jun 19 14:57:43 2018 (r51887) +++ head/en_US.ISO8859-1/htdocs/layout/Makefile Wed Jun 20 01:07:56 2018 (r51888) @@ -9,5 +9,6 @@ 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 Tue Jun 19 14:57:43 2018 (r51887) +++ head/share/xml/header.ent Wed Jun 20 01:07:56 2018 (r51888) @@ -21,33 +21,10 @@ - -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 Tue Jun 19 14:57:43 2018 (r51887) +++ head/share/xml/xhtml.xsl Wed Jun 20 01:07:56 2018 (r51888) @@ -49,7 +49,6 @@ - &header1.googleiframe;
&header2;