Merge branch 'master' of ssh://git.nas.jeffmackinnon.com:222/jeff/jeffs-pelican-theme

.gitignore

@@ -1 +1,6 @@
 test/output/
+
+# These are the customizable template files. 
+templates/include/cornerstone.html
+templates/include/trackingcode.html
+templates/include/newsletter.html

static/images/192px-Feed-icon.svg.pngZone.Identifier

@@ -1,4 +0,0 @@
-[ZoneTransfer]
-ZoneId=3
-ReferrerUrl=https://en.wikipedia.org/
-HostUrl=https://upload.wikimedia.org/wikipedia/en/thumb/4/43/Feed-icon.svg/192px-Feed-icon.svg.png

templates/base.html

@@ -113,7 +113,7 @@
   <script src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/js/util.js"></script>
   <script src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/js/main.js"></script>
 
-{% if IMAGETRACKINGCODE is sameas True %}
+{% if IMAGETRACKINGCODE %}
 {{ IMAGETRACKINGCODE }}
 {% endif %}
 

templates/include/trackingcode.html

@@ -1,20 +1,17 @@
 <!-- Matomo -->
 <script>
-    var _paq = window._paq = window._paq || [];
-    /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
-    _paq.push(["setDocumentTitle", document.domain + "/" + document.title]);
-    _paq.push(["setCookieDomain", "*.stats.jmkengineering.com"]);
-    _paq.push(["setDomains", ["*.stats.jmkengineering.com"]]);
-    _paq.push(["setDoNotTrack", true]);
-    _paq.push(['trackPageView']);
-    _paq.push(['enableLinkTracking']);
-    (function() {
-      var u="//stats.jmkengineering.com/";
-      _paq.push(['setTrackerUrl', u+'matomo.php']);
-      _paq.push(['setSiteId', '1']);
-      var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-      g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-    })();
-  </script>
-  <noscript><p><img src="//stats.jmkengineering.com/matomo.php?idsite=1&amp;rec=1" style="border:0;" alt="" /></p></noscript>
-  <!-- End Matomo Code -->  
+  var _paq = window._paq = window._paq || [];
+  /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+  _paq.push(["disableCookies"]);
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="//stats.jmkengineering.com/";
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
+    _paq.push(['setSiteId', '1']);
+    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+  })();
+</script>
+<noscript><p><img src="//stats.jmkengineering.com/matomo.php?idsite=1&amp;rec=1" style="border:0;" alt="" /></p></noscript>
+<!-- End Matomo Code -->

templates/index.html

@@ -33,18 +33,8 @@
 
 {% if NEWSLETTER %}
 <section id="banner">
-    <div class="content">
-        <header class="major">
-            <h2>Our Newsletter</h2>
-        </header>
-        <p>We also have a weekly-ish newsletter where I keep you up to date with my thoughts on the industry, practical tutorials and more.</p>
-        <ul class="actions">
-            <li><a href="nl/" class="button big">Learn More</a></li>
-        </ul>
-    </div>
-    <span class="image object">
-        {{ NEWSLETTER }}
-    </span>
+    {% include 'include/newsletter.html' %}
+
 </section>
 {% endif %}