From 5dde9b57cc96faabe67dd5d9f31f24b516e34f91 Mon Sep 17 00:00:00 2001
From: Thomas Jensen <boxes@thomasjensen.com>
Date: Mon, 14 May 2018 22:26:42 +0200
Subject: [PATCH] Update analytics (IP anonymization) and HTTPS links

---
 _config.yml              |  2 +-
 _includes/analytics.html | 16 +++++++---------
 _includes/footer.html    |  7 +++----
 _includes/header.html    | 31 ++++++++++++++++---------------
 4 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/_config.yml b/_config.yml
index b473234..79454fd 100644
--- a/_config.yml
+++ b/_config.yml
@@ -3,7 +3,7 @@
 name: boxes
 description: Command line ASCII boxes unlimited!
 
-gems:
+plugins:
   - jemoji
   - jekyll-paginate
 
diff --git a/_includes/analytics.html b/_includes/analytics.html
index 4af718b..30f36d5 100644
--- a/_includes/analytics.html
+++ b/_includes/analytics.html
@@ -1,11 +1,9 @@
 {% if site.gaaccount != '' %}
-  <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', '{{ site.gaaccount }}', 'auto');
-    ga('send', 'pageview');
-  </script>
+<script async src="https://www.googletagmanager.com/gtag/js?id={{ site.gaaccount }}"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+  gtag('config', '{{ site.gaaccount }}', {'anonymize_ip': true});
+</script>
 {% endif %}
diff --git a/_includes/footer.html b/_includes/footer.html
index 884ec91..5382ef8 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -2,16 +2,15 @@
     <div class="row-fluid">
         <div class="span12 footer navbar-inverse navbar-fixed-bottom">
             <p class="copyright"><b>{{ site.name }}</b> &copy;1999 by
-			<A target="_blank" HREF="http://thomasjensen.com/">Thomas Jensen</A><span class="hidden-xs"> {{ page.bxemail }}</span><br/>
-			Website powered by <a target="_blank" href="http://jekyllrb.com">Jekyll</a>,
+			<A target="_blank" HREF="https://thomasjensen.com/">Thomas Jensen</A><span class="hidden-xs"> {{ page.bxemail }}</span><br/>
+			Website powered by <a target="_blank" href="https://jekyllrb.com/">Jekyll</a>,
 			theme by <a target="_blank" href="https://github.com/scotte/jekyll-clean">Scott Emmons</a>
-            <span class="hidden-xs">under <a target="_blank" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution</a></span></p>
+            <span class="hidden-xs">under <a target="_blank" href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution</a></span></p>
         </div>
     </div>
 </div>
 
 {% include disqus-counts.html %}
-{% include analytics.html %}
 
 </body>
 </html>
diff --git a/_includes/header.html b/_includes/header.html
index 4b13baf..d6b4cb4 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -7,23 +7,24 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="author" content="Thomas Jensen" />
     <meta name="robots" content="index,follow" />
-	{% if page.sedesc %}
-	<!-- start page -->
-	<meta name="description" content="{{ page.sedesc }}" />
+    {% if page.sedesc %}
+    <!-- start page -->
+    <meta name="description" content="{{ page.sedesc }}" />
     <meta name="keywords" content="software, ascii, ascii art, filter, command line, box, boxes, box drawing" />
-	<link rel="canonical" href="http://{{ page.sitehost }}/" />
-	{% else %}
-	<link rel="canonical" href="http://{{ page.sitehost }}{{ page.url }}" />
-	{% endif %}
+    <link rel="canonical" href="https://{{ page.sitehost }}/" />
+    {% else %}
+    <link rel="canonical" href="https://{{ page.sitehost }}{{ page.url }}" />
+    {% endif %}
+    {% include analytics.html %}
     <script type="text/javascript">
         if (window.location.hostname == "ascii-boxes.github.io") {
-		    var prjNamePrefix = "/{{ site.name }}";
-		    var targetPath = window.location.pathname;
-			if (targetPath == prjNamePrefix) {
-			    targetPath = "/";
-			}
-			else if (targetPath.indexOf(prjNamePrefix + "/") == 0) {
-			    targetPath = targetPath.substring(prjNamePrefix.length);
+            var prjNamePrefix = "/{{ site.name }}";
+            var targetPath = window.location.pathname;
+            if (targetPath == prjNamePrefix) {
+                targetPath = "/";
+            }
+            else if (targetPath.indexOf(prjNamePrefix + "/") == 0) {
+                targetPath = targetPath.substring(prjNamePrefix.length);
             }
             window.location = window.location.protocol + "//{{ page.sitehost }}"
                     + targetPath + window.location.hash;
@@ -56,7 +57,7 @@
                     <li class="active"><a href="{{ site.baseurl }}/examples.html">Examples</a></li>
                     <li class="active"><a href="{{ site.baseurl }}/docs/">Documentation</a></li>
                     <li class="active"><a href="{{ site.baseurl }}/contributing.html">Contributing</a></li>
-					<li class="active"><a href="{{ site.baseurl }}/download.html"><b>Download</b></a></li>
+                    <li class="active"><a href="{{ site.baseurl }}/download.html"><b>Download</b></a></li>
                     <li class="active visible-xs-block"><a href="{{ site.baseurl }}/links.html">Links</a></li>
                     {% if site.github != '' %}
                       <li class="active"><a href="https://github.com/{{ site.github }}">Github</a></li>