Merge branch 'develop' into 'master'

Regular merge of develop

See merge request R3/school/courses!84

.ci/analytics/gdpr-banner.html

+<div id="lap-cookies-banner" class="presentation-banner">
+    <div class="banner-intro">
+        <div class="close-button">
+            <a class="lap-refuse">
+                <i class="fa fa-times" aria-hidden="true"></i>
+            </a>
+        </div>
+        <div class="banner-img">
+            <img src="https://analytics.lcsb.uni.lu/lap/static/logos/r3-logo.svg" type="image/svg+xml"/>
+        </div>
+        <div class="banner-title">This website needs some cookies and similar means to function.</div>
+        <div class="banner-text">If you permit us, we will use those means to collect data on your visits for aggregated
+            statistics to improve our service.
+        </div>
+    </div>
+
+    <div class="banner-buttons">
+        <a class="btn lap-accept">Accept cookies for aggregated statistics</a>
+        <a class="btn lap-refuse">No thanks, only technically necessary cookies</a>
+        <a class="btn lap-cookies-more" href="https://courses.lcsb.uni.lu/privacy-policy">More information</a>
+    </div>
+</div>
\ No newline at end of file

.ci/analytics/head.html

+<script>
+    const settings = {
+        expires: "180",
+        matomoURL: "https://analytics.lcsb.uni.lu/hub/",
+        siteID: "8", //you get this siteID by sending an email to lcsb-r3@uni.lu
+        accept_all_text: "Aggregate statistics cookies accepted",
+        only_necessary_text: "Only necessary cookies accepted",
+        doNotTrack_text: "Do Not Track is enabled",
+        cookieName: "lap",
+        bots: /bot|crawler|spider|crawling/i,
+        timeout_hidebanner: "500",
+        cookieDomain: "courses.lcsb.uni.lu"
+    };
+</script>
+<script src="https://analytics.lcsb.uni.lu/lap/static/js/jquery.min.js"></script>
+<script src="https://analytics.lcsb.uni.lu/lap/static/js/lap.js"></script>
+
+<link rel="stylesheet" type="text/css" href="https://analytics.lcsb.uni.lu/lap/static/css/lap.css" />

.ci/analytics/policy.html

+<div class="bottomPrivacy">
+    <a href="https://courses.lcsb.uni.lu/privacy-policy">Privacy Policy</a>
+    (<span id="doNotTrack-text"><span id="gdpr-result-text"></span> - <a href="javascript: showBanner();">change</a></span>)
+</div>
\ No newline at end of file

.ci/deploy.sh

@@ -17,6 +17,16 @@ else
     version="unstable";
 fi
 
+# build the unstable version - can be optimized
+git submodule update --recursive --init
+
+# add matomo
+sed -i "/matomohead/r./.ci/analytics/head.html" theme/templates/_index.html
+sed -i "/matomopolicy/r./.ci/analytics/policy.html" theme/templates/_index.html
+sed -i "/matomobanner/r./.ci/analytics/gdpr-banner.html" theme/templates/_index.html
+
+echo " > LAP included"
+
 # loop through all the presentations
 nBlades=0
 for d in $(find . -maxdepth 1 -type d)
@@ -38,10 +48,6 @@ do
                 # change to the blade directory to be built
                 cd $BLADE
 
-                # build the unstable version - can be optimized
-                git config submodule.theme.url https://$CI_DEPLOY_USER:$CI_DEPLOY_PASSWORD@git-r3lab.uni.lu/R3-core/outreach/theme.git
-                git submodule update --recursive --init
-
                 # run contribute
                 cp ../../template/Gruntfile.coffee .
                 ln -s ../../theme/package.json package.json

contribute.py

@@ -46,7 +46,7 @@ def main(date, name):
 
         click.echo(' > Directory for slides {0} created.' . format(slidesPath))
     else:
-        click.echo(' > Directory for slides{0} already exists.' . format(slidesPath))
+        click.echo(' > Directory for slides {0} already exists.' . format(slidesPath))
 
     # change to the root directory of the presentation
     os.chdir(fullPath)
@@ -55,6 +55,13 @@ def main(date, name):
     createSymlink('../../theme', 'theme')
     createSymlink('../../theme/package.json', 'package.json')
 
+    # reset the theme
+    os.chdir('../../theme')
+    os.system('git checkout -- templates/_index.html')
+    os.chdir(fullPath)
+    click.echo(' > Theme reset.')
+
+
     # copy the contents of the template folder
     if not os.path.isfile(os.path.join(fullPath, 'slides', 'index.md')):
         copy_tree(os.path.join(rootDir, 'template', 'slides'), slidesPath)
@@ -79,6 +86,13 @@ def main(date, name):
     else:
         click.echo(' > All dependencies already installed.')
 
+    # add analytics
+    os.system('sed -i "/matomohead/r./../../.ci/analytics/head.html" theme/templates/_index.html')
+    os.system('sed -i "/matomopolicy/r./../../.ci/analytics/policy.html" theme/templates/_index.html')
+    os.system('sed -i "/matomobanner/r./../../.ci/analytics/gdpr-banner.html" theme/templates/_index.html')
+
+    click.echo(' > Matomo added.')
+
     # launch the server
     os.system('grunt server')
 

theme @ 8e70c768

-Subproject commit f2a496a345b21a440f73acba2181ae2cd2a1e05c
+Subproject commit 8e70c7685bf9477f500bbc57f2d2c36072fe7741