Updated as per request

- Reverted changed lines in footer
- Removed GA script in langauge.php
- Replaced mentions of GA with Matomo in Legal page
This commit is contained in:
rehrar 2018-04-11 16:29:00 -06:00
parent aeef020433
commit 8fc80c3d39
3 changed files with 24 additions and 30 deletions

View File

@ -35,21 +35,25 @@
</div> </div>
</div> </div>
</footer> </footer>
<!-- Matomo -->
<script type="text/javascript">
<!-- JS --> var _paq = _paq || [];
<script src="//static.getmonero.org/scripts.js"></script> /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
<script type="text/javascript"> _paq.push(['trackPageView']);
$(document).ready(function(){ _paq.push(['enableLinkTracking']);
$('[data-toggle="tooltip"]').tooltip(); (function() {
}); var u = "//analytics.getmonero.org/";
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ _paq.push(['setTrackerUrl', u + 'piwik.php']);
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), _paq.push(['setSiteId', '1']);
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) var d = document,
})(window,document,'script','//www.google-analytics.com/analytics.js','ga'); g = d.createElement('script'),
ga('create', 'UA-53312765-1', 'auto'); s = d.getElementsByTagName('script')[0];
ga('require', 'linkid', 'linkid.js'); g.type = 'text/javascript';
ga('send', 'pageview'); g.async = true;
</script> g.defer = true;
g.src = u + 'piwik.js';
{% include hostflag.html %} s.parentNode.insertBefore(g, s);
})();
</script>
<!-- End Matomo Code -->
{% include hostflag.html %}

View File

@ -71,15 +71,5 @@ if (isset($_COOKIE["MONERO_LANG"]))
<!-- JS --> <!-- JS -->
<script src="//static.getmonero.org/scripts.js"></script> <script src="//static.getmonero.org/scripts.js"></script>
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
ga('create', 'UA-53312765-1', 'auto');
ga('require', 'linkid', 'linkid.js');
ga('send', 'pageview');
</script>
</body> </body>
</html> </html>

View File

@ -158,11 +158,11 @@ Certain logos, such as those for the operating systems and platforms we support
<div class="col" markdown="1"> <div class="col" markdown="1">
### What We Collect ### What We Collect
The Monero Project uses Google Analytics to collect usage and visitor data for this website. This is enabled via a small piece of JavaScript code, and will not run if you have JavaScript disabled. We also collect standard server logs from our webserver. The Monero Project uses [Matomo](https://matomo.org/) to collect usage and visitor data for this website. This is enabled via a small piece of JavaScript code, and will not run if you have JavaScript disabled. We also collect standard server logs from our webserver.
### What We Use the Data For ### What We Use the Data For
The Google Analytics data is used to provide statistics on the website and help us to improve the content and the information flow. The Matomo data is used to provide statistics on the website and help us to improve the content and the information flow.
Server logs are used to analyze errors and diagnose requests to dead links. A portion of the server logs are used to gather statistics on Monero downloads in order to help us better understand our user's needs. Server logs are used to analyze errors and diagnose requests to dead links. A portion of the server logs are used to gather statistics on Monero downloads in order to help us better understand our user's needs.
</div> </div>