Merge branch 'develop' into 'master'

Regular merge of develop

See merge request !63

.ci/.autoRedirect

@@ -35,11 +35,11 @@
             if (sub.length > 0) {
                 UrlExists(internalURL+'/stable/internal/'+sub, function(status){
                     if (status == 200) { // if sub-card is internal in the internal directory and exists
-                        window.location.href = internalURL+'/stable/internal/'+sub;
+                        window.location.href = internalURL+'/stable/internal/cards/'+sub;
                     } else {
                         UrlExists(internalURL+'/stable/external/'+sub, function(status){
                             if (status == 200) { // if sub-card is internal in the external directory and exists
-                                window.location.href = internalURL+'/stable/external/'+sub;
+                                window.location.href = internalURL+'/stable/external/cards/'+sub;
                             } else {
                                 window.location.href = internalURL+'/stable/404.html';
                             }
@@ -58,9 +58,9 @@
         // external pages
         } else {
             if (sub.length > 0) { sub = 'external/'+sub; }
-            UrlExists(externalURL+'/stable/'+sub, function(status){
-                if (status == 200) { // if sub-car is internal and exists
-                    window.location.href = externalURL+'/stable/'+sub;
+            UrlExists(externalURL+'/stable/cards/'+sub, function(status){
+                if (status == 200) { // if sub-card is internal and exists
+                    window.location.href = externalURL+'/stable/cards/'+sub;
                 } else {
                     window.location.href = externalURL+'/stable/404.html';
                 }

Gemfile

@@ -32,6 +32,8 @@ group :jekyll_plugins do
      :git => "https://git-r3lab.uni.lu/core-services/jekyll-theme-lcsb-frozen-components.git",
      :branch => "master"
 
+ gem 'jekyll-redirect-from',
+     '0.16.0'
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem

_config.yml

@@ -54,6 +54,7 @@ theme: jekyll-theme-lcsb-default
 plugins:
   - jekyll-feed
   - jekyll-paginate-v2
+  - jekyll-redirect-from
 
 # These settings are used to display share link to howto.lcsb.uni.lu
 # The display logic itself is in the template

_includes/scripts.html

+<!-- Matomo -->
+<script type="text/javascript">
+    var _paq = window._paq || [];
+    /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+    _paq.push(['trackPageView']);
+    _paq.push(['enableLinkTracking']);
+    (function() {
+      var u="https://howto-monitoring.lcsb.uni.lu/matomo/";
+      _paq.push(['setTrackerUrl', u+'matomo.php']);
+      _paq.push(['setSiteId', '2']);
+      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);
+    })();
+</script>
+<noscript><p><img src="https://howto-monitoring.lcsb.uni.lu/matomo/matomo.php?idsite=2&amp;rec=1" style="border:0;" alt="" /></p></noscript>
+<!-- End Matomo Code -->
\ No newline at end of file

external/daisy/daisy.md

 ---
 layout: page
 permalink: /external/daisy/
+shortcut: gdpr:daisy
+redirect_from:
+  - /cards/gdpr:daisy
+  - /external/cards/gdpr:daisy
 
 ---
 # <a name="top"></a>DAISY User Guide

external/exchange-channels/exchange-channels.md

 ---
 layout: page
 permalink: /external/exchange-channels/
+shortcut: gdpr:exchange-channels
+redirect_from:
+  - /cards/gdpr:exchange-channels
+  - /external/cards/gdpr:exchange-channels
 ---
 # Exchanging Research Data with Collaborators
 {:.no_toc}

external/git-clients/git-clients.md

 ---
 layout: page
 permalink: /external/git-clients/
+shortcut: contribute:git-clients
+redirect_from:
+  - /cards/contribute:git-clients
+  - /external/cards/contribute:git-clients
 ---
 
 # Git clients

external/lums-passwords/lums-passwords.md

 ---
 layout: page
 permalink: /external/lums-passwords/
+shortcut: passwords:lums
+redirect_from:
+  - /cards/passwords:lums
+  - /external/cards/passwords:lums
 ---
 
 # LUMS account

external/markdown/markdown.md

 ---
 layout: page
 permalink: /external/markdown/
+shortcut: contribute:markdown
+redirect_from:
+  - /cards/contribute:markdown
+  - /external/cards/contribute:markdown
 ---
 
 # Markdown

external/passwords/mac-reset.md

 ---
 layout: page
 permalink: /external/passwords/mac-reset
+shortcut: passwords:mac-reset
+redirect_from:
+  - /cards/passwords:mac-reset
+  - /external/cards/passwords:mac-reset
 ---
 
 # Tips when resetting University of Luxembourg Active Directory password on a Mac

external/passwords/passwords.md

 ---
 layout: page
 permalink: /external/passwords/
+shortcut: passwords
+redirect_from:
+  - /cards/passwords
+  - /external/cards/passwords
 ---
 
 # Managing your passwords

external/vpn-cerbere-access/vpn-cerbere-access.md

 ---
 layout: page
 permalink: /external/vpn-cerbere-access/
+shortcut: passwords:vpn
+redirect_from:
+  - /cards/passwords:vpn
+  - /external/cards/passwords:vpn
 ---
 
 # VPN/CERBERE connection