Merge branch 'apexcore-553' of github.com:mx4web/apex-site
diff --git a/src/md/privacy.md b/src/md/privacy.md
new file mode 100644
index 0000000..5eabe5a
--- /dev/null
+++ b/src/md/privacy.md
@@ -0,0 +1,17 @@
+# Privacy Policy
+
+Information about your use of this website is collected using server access logs and a tracking cookie. The collected information consists of the following:
+
+* The IP address from which you access the website;
+* The type of browser and operating system you use to access our site;
+* The date and time you access our site;
+* The pages you visit;
+* The addresses of pages from where you followed a link to our site.
+
+Part of this information is gathered using a tracking cookie set by the [Google Analytics](http://www.google.com/analytics) service and handled by Google as described in their [privacy policy](http://www.google.com/privacy.html). See your browser documentation for instructions on how to disable the cookie if you prefer not to share this data with Google.
+
+We use the gathered information to help us make our site more useful to visitors and to better understand how and when our site is used. We do not track or collect personally identifiable information or associate gathered data with any personally identifying information from other sources.
+
+By using this website, you consent to the collection of this data in the manner and for the purpose described above.
+
+The Apex development community welcomes your questions or comments regarding this Privacy Policy. Send them to dev@apex.apache.org
diff --git a/src/pages/privacy.html b/src/pages/privacy.html
new file mode 100644
index 0000000..e0c0e7d
--- /dev/null
+++ b/src/pages/privacy.html
@@ -0,0 +1,9 @@
+{{> header}}
+
+<div class="container">
+
+ {{> privacy}}
+
+</div>
+
+{{> footer}}
\ No newline at end of file
diff --git a/src/partials/footer.handlebars b/src/partials/footer.handlebars
index 21b521b..9c84fbf 100644
--- a/src/partials/footer.handlebars
+++ b/src/partials/footer.handlebars
@@ -4,7 +4,7 @@
<p>
Copyright © <span id="copyright-year">2015</span> <a href="http://apache.org">The Apache Software Foundation</a>,
Licensed under the Apache License, Version 2.0<br>
- Apache and the Apache feather logo are trademarks of The Apache Software Foundation.<br>
+ Apache and the Apache feather logo are trademarks of The Apache Software Foundation. | <a href="/privacy.html">Privacy Policy</a><br>
<a class="footer-link-img" href="http://apache.org"><img src="/images/asf_logo.svg" alt="The Apache Software Foundation"></a>
</p>
</footer>
diff --git a/src/partials/header.handlebars b/src/partials/header.handlebars
index 27504b4..a5a953f 100644
--- a/src/partials/header.handlebars
+++ b/src/partials/header.handlebars
@@ -12,6 +12,16 @@
<!-- Main Stylesheet -->
<link href="css/main.css" rel="stylesheet">
+
+ <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','https://www.google-analytics.com/analytics.js','ga');
+
+ ga('create', 'UA-85540278-1', 'auto');
+ ga('send', 'pageview');
+ </script>
</head>
