Merge branch 'master' into 'master'

All JS to bottom of the body

See merge request unitoo/unitoo-site!58

_includes/bottom.html

@@ -0,0 +1,28 @@
+{% asset app.js %}
+
+<!-- Matomo -->
+<script defer="true" type="text/javascript">
+ var _paq = window._paq || [];
+ /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+ _paq.push(['requireConsent']);
+ _paq.push(['trackPageView']);
+ _paq.push(['enableLinkTracking']);
+ (function() {
+     var u="//analytics.unitoo.it/";
+     _paq.push(['setTrackerUrl', u+'matomo.php']);
+     _paq.push(['setSiteId', '1']);
+     var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+     g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+ })();
+</script>
+<!-- End Matomo Code -->
+
+<!--Track mailto-->
+<script defer="true">
+ jQuery(document).ready(function($) {
+     $("a[href^='mailto:']").on("click", function (e) {
+         _paq.push(['trackGoal', 1]);
+     });
+ });
+</script>
+<!--End Track mailto-->

_includes/head.html

@@ -17,31 +17,4 @@
   {% if site.tags != "" %}
     {% include collecttags.html %}
   {% endif %}
-
-  <!-- Matomo -->
-  <script defer="true" type="text/javascript">
-   var _paq = window._paq || [];
-   /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
-   _paq.push(['requireConsent']);
-   _paq.push(['trackPageView']);
-   _paq.push(['enableLinkTracking']);
-   (function() {
-       var u="//analytics.unitoo.it/";
-       _paq.push(['setTrackerUrl', u+'matomo.php']);
-       _paq.push(['setSiteId', '1']);
-       var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-       g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-   })();
-  </script>
-  <!-- End Matomo Code -->
-
-  <!--Track mailto-->
-  <script defer="true">
-   jQuery(document).ready(function($) {
-       $("a[href^='mailto:']").on("click", function (e) {
-           _paq.push(['trackGoal', 1]);
-       });
-   });
-  </script>
-  <!--End Track mailto-->
 </head>

_layouts/default.html

@@ -15,7 +15,7 @@
 
 	{% include footer.html %}
 
-  {% asset app.js %}
+  {% include bottom.html %}
 
   {% include cookie-consent.html %}
 </body>

_layouts/simple.html

@@ -10,7 +10,7 @@
 
 	{% include footer.html %}
 
-  {% asset app.js %}
+  {% include bottom.html %}
 
   {% include cookie-consent.html %}
 </body>

_site/feed.xml

@@ -1 +1 @@
-<?xml version="1.0" encoding="utf-8"?><feed xmlns="http://www.w3.org/2005/Atom"><generator uri="https://jekyllrb.com/" version="3.8.6">Jekyll</generator><link href="https://www.unitoo.it/feed.xml" rel="self" type="application/atom+xml"/><link href="https://www.unitoo.it/" rel="alternate" type="text/html"/><updated>2020-04-07T11:09:41+02:00</updated><id>https://www.unitoo.it/feed.xml</id><title type="html">Unitoo</title><subtitle>Azienda dedicata allo sviluppo software, alla formazione dei team e alla consulenza informatica</subtitle></feed>
+<?xml version="1.0" encoding="utf-8"?><feed xmlns="http://www.w3.org/2005/Atom"><generator uri="https://jekyllrb.com/" version="3.8.6">Jekyll</generator><link href="https://www.unitoo.it/feed.xml" rel="self" type="application/atom+xml"/><link href="https://www.unitoo.it/" rel="alternate" type="text/html"/><updated>2020-04-07T12:08:09+02:00</updated><id>https://www.unitoo.it/feed.xml</id><title type="html">Unitoo</title><subtitle>Azienda dedicata allo sviluppo software, alla formazione dei team e alla consulenza informatica</subtitle></feed>