svn commit: r51888 - in head: en_US.ISO8859-1/htdocs/layout en_US.ISO8859-1/htdocs/layout/js share/xml

Wed Jun 20 01:07:58 UTC 2018

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 @@
 
 <!-- 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'> 
-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 '<script xmlns="http://www.w3.org/1999/xhtml" type="text/javascript" src="&enbase;/layout/js/google.js"></script>'>
 ]]>
 <!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	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 @@
       </head>
 
       <body>
-	&header1.googleiframe;
 	<div id="containerwrap">
 	  <div id="container">
 	    &header2;
