Merge branch 'master' into 'release'

Master

See merge request elixir/elixir-beacon!17

code/frontend/templates/index.html

@@ -12,7 +12,7 @@
 
     <script>
         /* These are the settings used ELIXIR Luxembourg; we use Matomo in the analytics */
-        window.settings = {
+        const settings = {
             expires: "180",
             matomoURL: "https://analytics.lcsb.uni.lu/hub/",
             siteID: "10",
@@ -276,7 +276,7 @@
             </div>
 
             <p>
-                This site uses cookies. If you are interested, please check our <a href="https://elixir-luxembourg.org/privacy/">our the privacy policy</a>.
+                This site uses cookies (<span id="doNotTrack-text"><span id="gdpr-result-text"></span> - <a href="javascript: showBanner();">change</a></span>). If you are interested, please check our <a href="https://elixir-luxembourg.org/privacy/">our the privacy policy</a>.
             </p>
         </footer>
     </div>

code/frontend/vendor/lap.js

 var _paq = window._paq || _paq || [];
 
-var settings = window.settings;
-
 // convert days to milliseconds
 settings.cookieTimeout = settings.expires * 86400 * 1000;