os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

stats: revert r51804

Browse source 
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.
This commit is contained in:
Eitan Adler 2018-06-20 01:07:56 +00:00
parent 3f2fa17b24
commit 798defac47
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=51888
5 changed files with 66 additions and 25 deletions
en_US.ISO8859-1/htdocs/layout
Makefile
js
Makefilegoogle.js
share/xml
header.entxhtml.xsl

1
en_US.ISO8859-1/htdocs/layout/Makefile
View file

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

12
en_US.ISO8859-1/htdocs/layout/js/Makefile Normal file
View file

@ -0,0 +1,12 @@
# $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"

52
en_US.ISO8859-1/htdocs/layout/js/google.js Normal file
View file

@ -0,0 +1,52 @@
/* $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);
})();
}

25
share/xml/header.ent
View file

@ -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' &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 '<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>'>

1
share/xml/xhtml.xsl
View file

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