From da41f7681bd64f4e114c35667919a1bfa679c654 Mon Sep 17 00:00:00 2001
From: Kevin Yap <me@kevinyap.ca>
Date: Sun, 2 Nov 2014 14:15:32 -0800
Subject: [PATCH] Merge piwik.html into analytics.html

Addresses #1512.
---
 .../themes/notmyidea/templates/analytics.html | 19 +++++++++++++++++++
 pelican/themes/notmyidea/templates/base.html  |  1 -
 pelican/themes/notmyidea/templates/piwik.html | 19 -------------------
 3 files changed, 19 insertions(+), 20 deletions(-)
 delete mode 100644 pelican/themes/notmyidea/templates/piwik.html

diff --git a/pelican/themes/notmyidea/templates/analytics.html b/pelican/themes/notmyidea/templates/analytics.html
index c3499c81..e27adf82 100644
--- a/pelican/themes/notmyidea/templates/analytics.html
+++ b/pelican/themes/notmyidea/templates/analytics.html
@@ -25,3 +25,22 @@
     })();
     </script>
 {% endif %}
+{% if PIWIK_URL and PIWIK_SITE_ID %}
+    <script type="text/javascript">
+    {% if PIWIK_SSL_URL %}
+        var pkBaseURL = "{{ PIWIK_SSL_URL }}";
+    {% else %}
+        var pkBaseURL = "{{ PIWIK_URL }}";
+    {% endif %}
+    var _paq = _paq || [];
+    _paq.push(["trackPageView"]);
+    _paq.push(["enableLinkTracking"]);
+    (function() {
+        var u=(("https:" == document.location.protocol) ? "https" : "http")+"://"+pkBaseURL+"/";
+        _paq.push(["setTrackerUrl", u+"piwik.php"]);
+        _paq.push(["setSiteId", "{{ PIWIK_SITE_ID }}"]);
+        var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
+        g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
+    })();
+    </script>
+{% endif %}
diff --git a/pelican/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html
index b081515f..d6b4cb35 100644
--- a/pelican/themes/notmyidea/templates/base.html
+++ b/pelican/themes/notmyidea/templates/base.html
@@ -77,7 +77,6 @@
         </footer><!-- /#contentinfo -->
 
 {% include 'analytics.html' %}
-{% include 'piwik.html' %}
 {% include 'disqus_script.html' %}
 </body>
 </html>
diff --git a/pelican/themes/notmyidea/templates/piwik.html b/pelican/themes/notmyidea/templates/piwik.html
deleted file mode 100644
index f9126264..00000000
--- a/pelican/themes/notmyidea/templates/piwik.html
+++ /dev/null
@@ -1,19 +0,0 @@
-{% if PIWIK_URL and PIWIK_SITE_ID %}
-	<script type="text/javascript">
-	{% if PIWIK_SSL_URL %}
-		var pkBaseURL = "{{ PIWIK_SSL_URL }}";
-	{% else %}
-		var pkBaseURL = "{{ PIWIK_URL }}";
-	{% endif %}
-	var _paq = _paq || [];
-	_paq.push(["trackPageView"]);
-	_paq.push(["enableLinkTracking"]);
-	(function() {
-		var u=(("https:" == document.location.protocol) ? "https" : "http")+"://"+pkBaseURL+"/";
-		_paq.push(["setTrackerUrl", u+"piwik.php"]);
-		_paq.push(["setSiteId", "{{ PIWIK_SITE_ID }}"]);
-		var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
-		g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
-	})();
-	</script>
-{% endif %}