Merge branch 'dev' into 'master'

Dev

See merge request beckerbe/ckanext-odsh!77

ckanext/odsh/templates/base.html

@@ -19,18 +19,21 @@
 
 {% if h.odsh_use_matomo() %}
 <!-- Matomo -->
-<script type="text/javascript">
-  var _paq = _paq || [];
+<script>
+  var _paq = window._paq = window._paq || [];
   /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+  _paq.push(["setExcludedQueryParams", ["zeile","cms_gtp","cms_range","kurzenachricht","zeig","projekt","datum","nn"]]);
   _paq.push(['trackPageView']);
   _paq.push(['enableLinkTracking']);
   (function() {
-    _paq.push(['setTrackerUrl', '{{matomo_url}}']);
+    var u="{{matomo_url}}";
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
     _paq.push(['setSiteId', '{{matomo_id}}']);
     var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-    g.type='text/javascript'; g.async=true; g.defer=true; g.src='{{matomo_url|replace('piwik.php','piwik.js')}}'; s.parentNode.insertBefore(g,s);
+    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
   })();
 </script>
+<noscript><p><img src="{{matomo_url}}matomo.php?idsite={{matomo_id}}&amp;rec=1" style="border:0;" alt="" /></p></noscript>
 <!-- End Matomo Code -->
 {% endif %}
 {% endblock %}