Merge branch 'master' of https://github.com/mariolukas/FabScanPi-Server

mariolukas · Feb 21, 2019 · c310830 · c310830
2 parents 7eeecdb + 904d5c7
commit c310830
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/docs/hardware.md b/docs/hardware.md
@@ -239,7 +239,8 @@ for 1 turntable stepper motor, 1 PiCam and 1 laser.
 | (white square) | Ground (GND)                             |
 | 5V             | 5V output from regulator to FabScanPi HAT |
 
-For the DC/DC converter option you can find further instructions and pictures on the [Watterott electronic website](https://github.com/watterott/RPi-FabScan-HAT/blob/master/hardware/RPi-FabScan-HAT_Assembly.pdf).
+For the DC/DC converter option you can find further instructions and pictures on the [Watterott electronic website](https://learn.watterott.com/fabscan/hat_assembly.pdf).
+
 
 NOTE: For the final stage of constuction a more powerful power supply is needed. At the moment there are no technical specifications available.
 

diff --git a/docs/js/main.js b/docs/js/main.js
@@ -1,15 +1,19 @@
-var _paq = _paq || [];
-_paq.push(["setCookieDomain", "*.fabscan.org"]);
-_paq.push(['trackPageView']);
-_paq.push(['enableLinkTracking']);
-(function() {
-    var u="http://analytics.mariolukas.de/";
-    _paq.push(['setTrackerUrl', u+'piwik.php']);
-    _paq.push(['setSiteId', 3]);
-    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+'piwik.js'; s.parentNode.insertBefore(g,s);
-})();
 
+  var _paq = window._paq || [];
+  /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+  _paq.push(["setDocumentTitle", document.domain + "/" + document.title]);
+  _paq.push(["setCookieDomain", "*.fabscan.org"]);
+  _paq.push(["setDomains", ["*.fabscan.org","*.www.fabscan.org"]]);
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="//analytics.mariolukas.de/";
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
+    _paq.push(['setSiteId', '3']);
+    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);
+  })();
+
 $.get('https://api.github.com/repos/mariolukas/FabScanPi-Build-Raspbian/releases/latest', function (data) {
    var asset = data.assets[0];
      var downloadCount = 0;