.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

@@ -7,22 +7,33 @@ echo $rootDir
 
 # clean previous builds
 rm -rf $rootDir/public
+rm -rf $rootDir/theme
 mkdir $rootDir/public
 
-if [[ $CI_COMMIT_BRANCH == "develop" ]]; then
+if [[ $CI_COMMIT_REF_NAME == "develop" ]]; then
     version="latest";
-elif [[ $CI_COMMIT_BRANCH == "master" ]]; then
+elif [[ $CI_COMMIT_REF_NAME == "master" ]]; then
     version="stable";
 else
     version="unstable";
 fi
 
+# build the unstable version - can be optimized
+git submodule update --init --recursive
+
+# 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)
 do
     if [[ "${d}" == *20* ]]; then
-        cd "${d}"
+        pushd "${d}"
         echo "changed to ${d}"
         for d1 in $(find . -maxdepth 1 -type d)
         do
@@ -35,24 +46,23 @@ do
                 # create the required folders in public
                 mkdir -p $rootDir/public/$BLADE/$version
 
-                # 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
+                echo "going to $BLADE..."
+                pushd $BLADE
 
                 # run contribute
-                cp ../../template/Gruntfile.coffee .
-                ln -s ../../theme/package.json package.json
-                ln -s ../../theme theme
+                cp -v ../../template/Gruntfile.coffee .
+                ln -sv ../../theme/package.json package.json
+                ln -sv ../../theme theme
 
                 # install npm
-                yarn global add grunt-cli generator-reveal
+                echo "installing deps"
+                yarn add grunt-cli generator-reveal grunt
                 yarn install
 
-                grunt dist
-                mv public/* $rootDir/public/$BLADE/$version/.
+                echo "running dist"
+                yarn exec grunt dist
+                echo "copying to common public dir"
+                cp -rLv public/* $rootDir/public/$BLADE/$version/.
 
                 echo " > latest built for file set ${BLADE}"
 
@@ -68,10 +78,10 @@ do
                 echo "autoredirect file set"
 
                 # move back out
-                cd ..
+                popd
                 echo " > -----------------------------------------------------"
             fi
         done
-        cd "${rootDir}"
+        popd
     fi
 done

.ci/generateIndex.py

@@ -19,7 +19,7 @@ localroot = os.getcwd()
 
 
 # generate the index properly speaking
-cardDirs = ["2020", "2019"]
+cardDirs = ["2023", "2022", "2021", "2020", "2019"]
 index=''
 
 # determine first the directories
@@ -68,4 +68,4 @@ with open(indexFile, 'w') as file:
   file.write(filedata)
 
 print("\n > New index generated and saved in " + indexFile)
-os.chdir("..")
\ No newline at end of file
+os.chdir("..")

.gitignore

+*.ai
 site/
 courses.lcsb.uni.lu
 index.html
@@ -22,3 +23,4 @@ package.json
 ./theme/package.json
 __pycache__/
 contribute.egg-info/
+.*.swp

.gitlab-ci.yml

@@ -56,13 +56,11 @@ build:website:
     JEKYLL_ENV: production
 
 build:courses:
-  image: git-r3lab.uni.lu:4567/r3/docker/nodejs-yarn-grunt
+  image: node:19-bullseye
   stage: build
   rules:
     - if: $CI_COMMIT_BRANCH == "develop"
     - if: $CI_COMMIT_BRANCH == "master"
-  before_script:
-    - git submodule update --recursive --init
   script:
     - bash .ci/deploy.sh
   artifacts:
@@ -74,6 +72,7 @@ upload:
   stage: deploy
   image: alpine
   before_script:
+    - apk add rsync
     - 'which ssh-agent || ( apk add --update openssh )'
     - eval $(ssh-agent -s)
     - echo "$B64SSHPRIVKEY" | base64 -d | tr -d '\r' | ssh-add - > /dev/null
@@ -85,5 +84,5 @@ upload:
     - if: $CI_COMMIT_BRANCH == "develop"
     - if: $CI_COMMIT_BRANCH == "master"
   script:
-    - scp -P $SSHPORT -r site/* $SSHCONNECT:~/web/latest
-    - scp -P $SSHPORT -r public/* $SSHCONNECT:~/web/latest
+    - rsync -ravu --info=progress2 -e "ssh -p $SSHPORT" site/* $SSHCONNECT:~/web/latest
+    - rsync -ravu --info=progress2 -e "ssh -p $SSHPORT" public/* $SSHCONNECT:~/web/latest

.gitmodules

 [submodule "theme"]
 	path = theme
-	url = https://git-r3lab.uni.lu/R3/outreach/theme.git
+	url = https://gitlab.lcsb.uni.lu/R3/outreach/theme.git
 
 

2019/2019-06-11_basicGitTraining/slides/thanks.md

@@ -38,5 +38,5 @@
 
 Contact us if you need help:
 
-r3lab.core@uni.lu
+lcsb-r3@uni.lu
 

2019/2019-08-22_IT101-DM/slides/howtos.md

@@ -2,5 +2,5 @@
 <br>
 https://howto.lcsb.uni.lu/
 <center>
-  <iframe data-src="https://howto.lcsb.uni.lu/" height="600px" width="1200px"></iframe>
+  <img src="slides/img/howtocard.png" width="50%" style="border: 1px solid #555;">
 </center>

2019/2019-08-22_IT101-DM/slides/thanks.md

@@ -7,5 +7,5 @@
 <center>
 Contact us if you need help:
 
-<a href="mailto:r3lab.core@uni.lu">r3lab.core@uni.lu</a>
+<a href="mailto:lcsb-r3@uni.lu">lcsb-r3@uni.lu</a>
 </center>

2019/2019-09-24_advancedGitTraining/slides/thanks.md

@@ -4,5 +4,5 @@
 
 Contact us if you need help:
 
-<a href="mailto:r3lab.core@uni.lu">r3lab.core@uni.lu</a>
+<a href="mailto:lcsb-r3@uni.lu">lcsb-r3@uni.lu</a>
 

2019/2019-10-03_basicGitTraining-SIU/slides/thanks.md

@@ -38,5 +38,5 @@
 
 Contact us if you need help:
 
-r3lab.core@uni.lu
+lcsb-r3@uni.lu
 

2019/2019-10-10_advancedGitTraining-SIU/slides/thanks.md

@@ -4,5 +4,5 @@
 
 Contact us if you need help:
 
-<a href="mailto:r3lab.core@uni.lu">r3lab.core@uni.lu</a>
+<a href="mailto:lcsb-r3@uni.lu">lcsb-r3@uni.lu</a>
 

2020/2020-01-31_gitTrainingBioTech/slides/thanks.md

@@ -25,5 +25,5 @@
 
 Contact us if you need help:
 
-r3lab.core@uni.lu
+lcsb-r3@uni.lu
 

2020/2020-02-17_IT101-DM/slides/howtos.md

@@ -2,5 +2,5 @@
 <br>
 https://howto.lcsb.uni.lu/
 <center>
-  <iframe data-src="https://howto.lcsb.uni.lu/" height="600px" width="1200px"></iframe>
+  <img src="slides/img/howtocard.png" width="50%" style="border: 1px solid #555;">
 </center>

2020/2020-02-17_IT101-DM/slides/reproducibility.md

@@ -34,7 +34,9 @@
   
 </div>
 </div>
-<img src="slides/img/excel_data-sheet.png" height="350px">
+<div style="text-align:center">
+<img src="slides/img/excel_data-sheet.png" height="280px">
+</div>
 </div>
 
 <div class="fragment">
@@ -47,11 +49,11 @@
   * Flow is visible.
 </div> 
 </div> 
-<img src="slides/img/code-example.png"  height="350px">
+<img src="slides/img/code-example.png"  height="280px">
 </div>
 </div>
 
-<div class="content-box fragment" style="width:70%;margin:0 auto;">
+<div class="content-box fragment" style="left:15%;width:60%;position:relative">
 <div class="box-title green">Develop data science skills</div>
 <div class="content">
 

2020/2020-02-17_IT101-DM/slides/thanks.md

@@ -7,11 +7,15 @@
 <center>
 Contact us if you need help:
 
-<a href="mailto:r3lab.core@uni.lu">r3lab.core@uni.lu</a>
+<a href="mailto:lcsb-r3@uni.lu">lcsb-r3@uni.lu</a>
 </center>
 
-Links:  
-HowTo cards: https://howto.lcsb.uni.lu/  
-HPC: https://hpc.uni.lu/  
-LCSB GitLab: https://git-r3lab.uni.lu/  
+Links:
+
+HowTo cards: https://howto.lcsb.uni.lu/
+
+HPC: https://hpc.uni.lu/
+
+LCSB GitLab: https://git-r3lab.uni.lu/
+
 Service Portal: https://service.uni.lu/sp