Merge branch 'master' of git.parisson.com:git/teleforma

diff --cc teleforma/templates/teleforma/base.html
index 0bf9cdd9d41d479d55e99ceace593f5da16be570,3c1dd24d4ef5cd28b9447dfe32ea7cac241375ef..711bb07747a08eca0c10c72009af6b7187d9cc09
--- 1/teleforma/templates/teleforma/base.html
--- 2/teleforma/templates/teleforma/base.html
+++ b/teleforma/templates/teleforma/base.html
@@@ -259,14 -259,32 +259,13 @@@
    {% block extra_javascript %}{% endblock %}
  
    {% if not debug %}
 -    <!-- NOT working -->
 -    <!--
 +    <!-- Matomo Code -->
      <script type="text/javascript">
 -      tarteaucitron.user.matomoId = 2;
 -      (tarteaucitron.job = tarteaucitron.job || []).push('matomo');
 -    </script>
 -    <script>tarteaucitron.user.matomoHost = '//matomo.parisson.com/';</script>
 -    -->
 -
 -    <!-- working -->
 -    <!-- Matomo -->
 -    <script>
 -      var _paq = window._paq = window._paq || [];
 -      /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
 -      _paq.push(['trackPageView']);
 -      _paq.push(['enableLinkTracking']);
 -      (function() {
 -        var u="//matomo.parisson.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);
 -      })();
 +      tarteaucitron.user.matomoId = 1;
 +      (tarteaucitron.job = tarteaucitron.job || []).push('matomocloud');
      </script>
- 
 +    <script>tarteaucitron.user.matomoHost = '//matomo.parisson.com/';tarteaucitron.user.matomoCustomJSPath = '//matomo.parisson.com/matomo.js';tarteaucitron.user.matomoDontTrackPageView = dontTrackPageView (false | true);tarteaucitron.user.matomoFullTracking = fullTracking (true | false);</script>
      <!-- End Matomo Code -->
 -
    {% endif %}
  
    <script type='text/javascript'>