Compare revisions

76afc34e · d7bfd1b0 · 0f52d985 · d7c64c15 · b6f4c75e · ae09fc10
--- a/.ci/.autoRedirect
+++ b/.ci/.autoRedirect
-<html>
-  <head>
-    <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
-    <script type="text/javascript">
-    function UrlExists(url, cb){
-        jQuery.ajax({
-            url:      url,
-            dataType: 'text',
-            type:     'GET',
-            complete:  function(xhr){
-                if(typeof cb === 'function')
-                cb.apply(this, [xhr.status]);
-            }
-        });
-    }
-    UrlExists('https://r3-core.pages.uni.lu/howto-cards-internal/index.html', function(status){
-        if(status === 200){
-            // internal pages
-            window.location.href = 'https://r3-core.pages.uni.lu/howto-cards-internal/stable';
-        } else {
-            // external pages
-            window.location.href = 'https://r3.pages.uni.lu/howto-cards/stable';
-        }
-    });
-    </script>
-  </head>
-  <body>
-    <p>
-      Please follow to <a href="https://r3.pages.uni.lu/howto-cards/stable">https://r3.pages.uni.lu/howto-cards/stable</a>!
-    </p>
-  </body>
-</html>
--- a/.ci/_config_develop.yml
+++ b/.ci/_config_develop.yml
+url: "https://howto-latest.lcsb.uni.lu"
+baseurl: "/"
--- a/.ci/_config_master.yml
+++ b/.ci/_config_master.yml
+url: "https://howto.lcsb.uni.lu"
+baseurl: "/"
--- a/.ci/add-timestamp-to-howtocard.sh
+++ b/.ci/add-timestamp-to-howtocard.sh
+#!/bin/sh
+
+# change this with environment
+DEFAULT_NOT_SOURCE_REGEX="/\\/assets\\//"
+NOT_SOURCE_REGEX="${NOT_SOURCE_REGEX:-$DEFAULT_NOT_SOURCE_REGEX}"
+TIMESTAMP_SUFFIX="${SUFFIX:-.timestamp}"
+LOGFILE="${LOGFILE:-/dev/null}"
+
+[ -z "$1" ] && echo "$0: no inputs specified?" >/dev/stderr
+
+while [ -n "$1" ]
+do
+	echo "sourcing directory '$1' ..." >> "$LOGFILE"
+	find "$1" -type f -name '*.md' | grep -v "$NOT_SOURCE_REGEX" | while read file ; do
+		fn=`basename "$file"`
+		dir=`dirname "$file"`
+		tsfn="$fn.timestamp"
+		(
+			echo "making timestamp in '$dir' for file '$fn' ..." >> "$LOGFILE"
+			cd "$dir"
+			if [ -f "$tsfn" ]
+			then echo "... but it already exists; skipping!" >> "$LOGFILE"
+			else
+				TIMESTAMP=`git log -n 1 --pretty=format:%cs -- "$fn"`
+				mv "$fn" "$fn.temporary"
+				head -n1 "$fn.temporary" > "$fn"
+				echo "timestamp: \"$TIMESTAMP\"" >> "$fn"
+				tail -n+2 "$fn.temporary" >> "$fn"
+				rm -f "$fn.temporary"
+			fi
+		)
+	done
+	shift
+done
--- a/.ci/build_indices.sh
+++ b/.ci/build_indices.sh
+#!/bin/bash
+
+# Install lunr to build the index
+npm install lunr@$LUNR_VERSION
+
+# Go to the directory containing the built website...
+cd $DIRECTORY
+
+echo "Generating the index..."    
+
+# Pipe documents.js file (which should be generated by Jekyll after building the website) through build script
+cat documents.js | node build_index.js > index.js
+
+# Show the results (should not be empty)
+echo "...should be completed. First 50 characters of the index: "
+cat index.js | head -c50
+echo ""
+
+rm documents.js build_index.js
--- a/.ci/deploy.sh
+++ b/.ci/deploy.sh
-mkdir -p public
-artefact="latest"
-
-# loop through all the branches
-for branch in $(git for-each-ref --format='%(refname:strip=3)' refs/remotes); do
-    echo $branch;
-    if [[ $branch == "master" ]]; then
-        artefact="stable";
-    elif [[ $branch == "develop" ]]; then
-        artefact="latest";
-    else
-        artefact="unstable";
-    fi
-    echo $artefact;
-    git checkout -f $branch
-    git reset --hard $branch
-
-    # build the website
-    bundle exec jekyll build --baseurl="howto-cards/$artefact" -d "public/$artefact"
-done
-
-# checkout the current branch
-echo $CI_COMMIT_REF_NAME
-git checkout -f $CI_COMMIT_REF_NAME
-git reset --hard origin/$CI_COMMIT_REF_NAME
-
-# set the auto redirection
-cp .ci/.autoRedirect public/index.html
--- a/.ci/generateIndex.py
+++ b/.ci/generateIndex.py
+from generator import core, save
+
+# walk through the folders with all the cards
+ind, wl = core.core(["external"])
+
+save.save_index(ind, "cards.md")
+save.save_whitelist(wl, ".ci/whitelist.txt")
--- a/generator @ 53a922a1
+++ b/generator @ 53a922a1
+Subproject commit 53a922a13c4e8916c97599b5242493a47ea0a2e2
--- a/.ci/whitelist.txt
+++ b/.ci/whitelist.txt
+/privacy-policy
+/search
+https://www.dev47apps.com/
+https://www.dev47apps.com/droidcam/connect/
+https://cerbere.uni.lu/
+http://iptel.uni.lux/
+javascript:%20showBanner();
+javascript:showBanner();
+media/7zip-encryption-windows.mp4?width=400
+media/Get_MD5_checksum_windows.mp4
+https://intranet.uni.lux
+https://intranet.uni.lux/the_university/lcsb/lscb_internal/
+https://uniluxembourg.sharepoint.com/sites/lcsb/lscb_internal/LCSB%20Handbook/Appendix%20files/Godparent%20Checklist%20-%20newcomers.pdf
+https://uniluxembourg.sharepoint.com/sites/lcsb/lscb_internal/LCSB%20Handbook/Appendix%20files/Newcomer%20Checklist%20Before%20Arriving%20in%20Luxembourg.pdf
+https://uniluxembourg.sharepoint.com/sites/lcsb/lscb_internal/LCSB%20Handbook/Appendix%20files/Newcomer%20Checklist%20upon%20Arrival%20in%20Luxembourg.pdf
+https://uniluxembourg.sharepoint.com/sites/lcsb/lscb_internal/SitePages/default.aspx
+https://uniluxembourg.sharepoint.com/sites/sc/Lists/Policies%20%20Procedures/DispForm.aspx?ID=9
+https://uniluxembourg.sharepoint.com/sites/siu/Documents%20partages/Dropit%20client%20-%20configuration%20guide.pdf#search=dropit
+https://uniluxembourg.sharepoint.com/sites/siu/SitePages/siu-guides.aspx
\ No newline at end of file
--- a/.gitignore
+++ b/.gitignore
+.jekyll-cache/
+env/.jekyll-cache/
 *.aux
 *.log
 *.out
@@ -31,3 +33,15 @@ package.json
 ./theme/package.json
 __pycache__/
 contribute.egg-info/
+policies
+.tmp
+env/.jekyll-cache/
+env/Gemfile.lock
+env/_site/
+handbook/
+internal/handbook
+internal/handbook-additional
+internal/handbook-annexes
+!internal/covid-19/exit-strategy/*.pdf
+checkFolder
+.cache/
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
-image: ruby:2.5
+
+
+stages:
+  - prepare
+  - save
+  - build
+  - check
+  - generate
+  - deploy
+  - trigger

 variables:
-  JEKYLL_ENV: production
+    GIT_STRATEGY: clone
+    GIT_DEPTH: 0
+    DOCKER_DRIVER: overlay2
+    DOCKER_TLS_CERTDIR: ""
+    GIT_SUBMODULE_STRATEGY: recursive
+
+# prepare
+# ------------------------------------------------------------------------------------
+
+prepare:index:
+  image: python
+  stage: prepare
+  rules:
+    - if: $CI_COMMIT_REF_NAME
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_COMMIT_MESSAGE !~ /tmpBranch/ && $CI_COMMIT_MESSAGE !~ /Update index/'
+  before_script:
+    - pip install -r .ci/generator/requirements.txt
+  script:
+    - python .ci/generateIndex.py
+    - mkdir .tmp
+    - cp cards.md .tmp/.
+    - cp .ci/whitelist.txt .tmp/.
+  artifacts:
+    expire_in: 1 day
+    paths:
+      - .tmp
+
+# save
+# ------------------------------------------------------------------------------------
+
+save:commitIndex:
+  image:
+    name: alpine/git:latest
+    entrypoint: [""]
+  stage: save
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_COMMIT_MESSAGE !~ /tmpBranch/ && $CI_COMMIT_MESSAGE !~ /Update index/ && $CI_MERGE_REQUEST_SOURCE_PROJECT_PATH == "R3/howto-cards"'
+  before_script:
+    - apk add git-lfs
+    - git fetch --all
+    - url_host=`git remote get-url origin | sed -e "s/https:\/\/gitlab-ci-token:.*@//g"`
+    - git remote set-url origin "https://$GIT_ACCESS_USER:$GIT_ACCESS_TOKEN@${url_host}"
+    - git config user.name $GIT_ACCESS_USER
+    - git config user.email $GIT_ACCESS_EMAIL
+  script:
+    # copy the index and remove the temporary directory
+    - cp .tmp/cards.md .
+    - rm -rf .tmp
+
+    # commit
+    - git branch -D tmpBranch || true
+    - git checkout -b tmpBranch || true
+    - git add --all || true
+    - git commit -m "Update index" || true
+    - git checkout $CI_COMMIT_REF_NAME || true
+    - git pull origin $CI_COMMIT_REF_NAME
+    - git merge tmpBranch --ff || true
+    - git push origin $CI_COMMIT_REF_NAME || true
+    - git branch -D tmpBranch || true
+
+# build
+# ------------------------------------------------------------------------------------
+
+build:pages:
+  image: $CI_REGISTRY/r3/docker/jekyll-lcsb
+  stage: build
+  variables:
+    JEKYLL_ENV: production
+    BUNDLER_VERSION: 2.1.4
+  artifacts:
+    expire_in: 1 day
+    paths:
+      - build
+      - .tmp
+  rules:
+    - if: $CI_COMMIT_REF_NAME
+  before_script:
+    - apt-get -qq update
+    - apt-get install -y -qq git-lfs
+    - gem install bundler:$BUNDLER_VERSION && bundle install
+  script:
+    # copy the index
+    - cp .tmp/cards.md .
+    # Generate the configuration for forks (will use Gitlab Pages on personal namespaces)
+    - |
+      if [ $CI_MERGE_REQUEST_ID ]; then
+          export CI_COMMIT_REF_NAME="develop";
+      else
+          echo "url: https://$CI_PROJECT_NAMESPACE.$CI_PAGES_DOMAIN" >> .ci/_config_gitlab_pages.yml;
+          echo "baseurl: /$CI_PROJECT_NAME" >> .ci/_config_gitlab_pages.yml;
+          # If there is no config for the current branch, use the one for Gitlab Pages
+          if [ ! -f ".ci/_config_$CI_COMMIT_REF_NAME.yml" ]; then
+              mv .ci/_config_gitlab_pages.yml .ci/_config_$CI_COMMIT_REF_NAME.yml;
+          fi
+      fi
+    # Display, which configuration is used
+    - |
+      echo "Configuration: " && cat ".ci/_config_$CI_COMMIT_REF_NAME.yml"
+    # Run Jekyll with custom configuration
+    - LOGFILE=/dev/stdout .ci/add-timestamp-to-howtocard.sh external
+    - bundle exec jekyll build -d build --config "_config.yml,.ci/_config_$CI_COMMIT_REF_NAME.yml"
+
+# check
+# ------------------------------------------------------------------------------------
+
+check:links:
+   stage: check
+   image: $CI_REGISTRY/r3/apps/tailorbird/linkchecker
+   rules:
+     - if: $CI_COMMIT_REF_NAME
+     - if: $CI_MERGE_REQUEST_ID
+   allow_failure: true
+   before_script:
+     - cp .tmp/whitelist.txt build/.
+     - cp -r build /check
+     - cd /
+   script:
+     - python link_check.py
+
+# generate
+# ------------------------------------------------------------------------------------
+
+generate:searchIndex:
+  stage: generate
+  image: node:13.8.0-slim
+  variables:
+    LUNR_VERSION: 2.3.8
+    DIRECTORY: build
+  script:
+    - bash .ci/build_indices.sh
+    - mv build processed_build
+  artifacts:
+    expire_in: 1 day
+    paths:
+      - processed_build

-before_script:
-  - bundle install && bundle update
+# deploy
+# ------------------------------------------------------------------------------------

+# Deploy to Gitlab Pages - to be run only by forks
 pages:
+  image: alpine:3.11.3
  stage: deploy
-  only:
-    - develop
-    - master
+  rules:
+    - if: '$CI_PIPELINE_SOURCE != "merge_request_event" && $CI_COMMIT_REF_NAME == "develop" && $CI_PROJECT_PATH == "R3/howto-cards"'
+    - if: '$CI_PIPELINE_SOURCE != "merge_request_event" && $CI_COMMIT_REF_NAME == "master" && $CI_PROJECT_PATH == "R3/howto-cards"'
  script:
-    - bash .ci/deploy.sh
-
+    - mv processed_build public
  artifacts:
    expire_in: 1 week
    paths:
      - public
+
+## Deploys the website to a separate VM
+deploy:vm:
+  stage: deploy
+  image: alpine:3.1
+  before_script:
+    - 'which ssh-agent || ( apk add --update openssh )'
+    - eval $(ssh-agent -s)
+    - echo "$B64SSHPRIVKEY" | base64 -d | tr -d '\r' | ssh-add - > /dev/null
+    - mkdir -p ~/.ssh && chmod 700 ~/.ssh
+    - 'echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
+    - echo "$KNOWNHOSTS" > ~/.ssh/known_hosts
+    - chmod 644 ~/.ssh/known_hosts
+  rules:
+    #- if: '$CI_PIPELINE_SOURCE != "merge_request_event" && $CI_COMMIT_REF_NAME == "develop" && $CI_PROJECT_PATH == "R3/howto-cards"'
+    - if: '$CI_PIPELINE_SOURCE != "merge_request_event" && $CI_COMMIT_REF_NAME == "master" && $CI_PROJECT_PATH == "R3/howto-cards"'
+  script:
+    - ssh -p $SSHPORT $SSHCONNECT "mkdir -p ~/$CI_COMMIT_REF_NAME/sources/public/$CI_JOB_ID ~/$CI_COMMIT_REF_NAME/public"
+    - scp -P $SSHPORT -r processed_build/* $SSHCONNECT:~/$CI_COMMIT_REF_NAME/sources/public/$CI_JOB_ID
+    - ssh -p $SSHPORT $SSHCONNECT "cd ~/$CI_COMMIT_REF_NAME/public && ln -fs ../sources/public/$CI_JOB_ID/* . && cd ~/$CI_COMMIT_REF_NAME/sources/public/ && find . -type d -not -newermt '-1 minutes' -exec rm -rf {} +;"
+
+# Trigger pipelines in internal repo
+# ------------------------------------------------------------------------------------
+
+trigger:
+  stage: trigger
+  image: curlimages/curl
+  rules:
+    - if: '$CI_COMMIT_BRANCH == "master" || $CI_COMMIT_BRANCH == "develop"'
+  tags:
+    - privileged
+  script:
+    - curl --silent --output /dev/null -X POST -F token=$INTERNAL_TRIGGER_TOKEN -F ref=$CI_COMMIT_BRANCH $INTERNAL_REPO
--- a/.gitmodules
+++ b/.gitmodules
+[submodule ".ci/generator"]
+	path = .ci/generator
+	url = https://gitlab.lcsb.uni.lu/R3/apps/generator.git
--- a/404.html
+++ b/404.html
@@ -21,4 +21,9 @@ layout: default

  <p><strong>Page not found :(</strong></p>
  <p>The requested page could not be found.</p>
+  <p>All cards are available from here: <a href="https://howto.lcsb.uni.lu">https://howto.lcsb.uni.lu</a></p>
+  <p><i>Please note: Some cards are only available from within the university network. Please
+          reload the page when connected using <a href="https://vpn.uni.lu"><strong>VPN</strong></a>
+         (from outside the university network)
+         or when connected to the <strong>eduroam</strong> network while at the university.</i></p>
 </div>
--- a/Gemfile
+++ b/Gemfile
@@ -7,15 +7,12 @@ source "https://rubygems.org"
 #
 #     bundle exec jekyll serve
 #
-# This will help ensure the proper Jekyll version is running.
-# Happy Jekylling!
-gem "jekyll", "~> 3.8.5"
-gem "bundler", "> 1.16.1"

-# This is the default theme for new Jekyll sites. You may change this to anything you like.
+gem "jekyll", "~> 4.0"
+gem "bundler", "> 2.0"
+
 gem "minima", "~> 2.5"
-gem 'jekyll-theme-primer', '~> 0.5.3'
-gem 'jekyll-theme-lcsb-default', '~> 0.2.18', :git => "https://git-r3lab.uni.lu/core-services/jekyll-theme-lcsb-default.git", :branch => "master"
+gem 'jekyll-theme-lcsb-default', '~> 0.5.0'

 # If you want to use GitHub Pages, remove the "gem "jekyll"" above and
 # uncomment the line below. To upgrade, run `bundle update github-pages`.
@@ -23,9 +20,23 @@ gem 'jekyll-theme-lcsb-default', '~> 0.2.18', :git => "https://git-r3lab.uni.lu/

 # If you have any plugins, put them here!
 group :jekyll_plugins do
- gem "jekyll-paginate-v2", "~> 1.7"
- gem "jekyll-feed", "~> 0.6"
- gem "jekyll-email-protect"
+ gem "jekyll-paginate-v2",
+     "~> 3",
+     :git => "https://github.com/LCSB-BioCore/jekyll-paginate-v2.git"
+
+ gem "jekyll-feed",
+     "~> 0.6"
+
+ gem 'jekyll-email-protect',
+     "~> 1.1"
+
+ gem 'jekyll-theme-lcsb-frozen-components',
+     '~> 0.0.2',
+     :git => "https://gitlab.lcsb.uni.lu/core-services/jekyll-theme-lcsb-frozen-components.git",
+     :tag => "0.0.2"
+
+ gem 'jekyll-redirect-from',
+     '0.16.0'
 end

 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
@@ -34,3 +45,6 @@ gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 # Performance-booster for watching directories on Windows
 gem "wdm", "~> 0.1.1" if Gem.win_platform?

+gem 'jekyll-spaceship', "~> 0.9"
+
+gem "webrick", "~> 1.7"
--- a/_config.yml
+++ b/_config.yml
@@ -20,18 +20,23 @@ description: >- # this means to ignore newlines until "baseurl:"

 # URL settings (the most difficult part, please refer to the guide)
 baseurl: "/howto-cards"  # the subpath of your site, e.g. /gitlab-repository-name
-url: "https://r3.pages.uni.lu"  # the base hostname & protocol for your site, e.g. http://gitlab-namespace-name.pages.uni.lu/
+url: "https://howto.lcsb.uni.lu"  # the base hostname & protocol for your site, e.g. http://gitlab-namespace-name.pages.uni.lu/

 # Banner settings
 banner: howto-card  # When you have custom images, change this setting's value to the name of the folder containing them
 logo: small  # Change to "big" (without quotas) in case of having broad logo
-date: "2019"
+date: "2020"
+
+# Is internal or external?
+internal: false

 # Social media icon settings
 twitter_username: uni_lu
 facebook_username: uni.lu
 linkedin_schoolname: university-of-luxembourg

+banner_link: https://howto.lcsb.uni.lu/
+
 # Produces a cleaner folder structure when using categories
 permalink: /:year/:month/:title.html

@@ -54,6 +59,54 @@ theme: jekyll-theme-lcsb-default
 plugins:
  - jekyll-feed
  - jekyll-paginate-v2
+  - jekyll-redirect-from
+  - jekyll-spaceship
+
+# These settings are used to display share link to howto.lcsb.uni.lu
+# The display logic itself is in the template
+share_url: https://howto.lcsb.uni.lu/?
+include_link_index: 4
+
+# These values are injected into cards
+defaults:
+  -
+    scope:
+      path: "external/*"
+    values:
+      include_link: true
+      searchable: 1.0
+  - scope:  # adding og:image to the SEO's metadata
+      path: ""
+    values:
+      image: /assets/favicon/apple-touch-icon.png
+      preventCaching: true
+
+# GDPR banner settings
+banner_title: >-
+  This website needs some cookies and similar means to function.
+banner_text: >-
+  If you permit us, we will use those means to collect data on your visits for aggregated statistics to improve our service.
+banner_accept_text: >-
+  Accept cookies for aggregated statistics
+banner_refuse_text: >-
+  No thanks, only technically necessary cookies
+banner_more_text: >-
+  More information
+doNotTrack_text: >-
+  Do Not Track is enabled
+cookies_expire: 180 # days
+analyticsurl: https://analytics.lcsb.uni.lu/hub/
+lapurl: https://analytics.lcsb.uni.lu/lap/
+siteID: 3 # you get this siteID by sending an email to lcsb-r3@uni.lu
+cookieName: lap
+accept_all_text: >-
+  Aggregate statistics cookies accepted
+only_necessary_text: >-
+  Only necessary cookies accepted
+path_policy: privacy-policy
+logo_policy: https://analytics.lcsb.uni.lu/lap/static/logos/r3-logo.svg
+timeout_hidebanner: 500 # milliseconds
+cookieDomain: 'howto.lcsb.uni.lu' # track visitors across all subdomains of a given domain; set to * to ignore

 # Exclude from processing. (no need to touch these)
 # The following items will not be processed, by default. Create a custom list

--- a/_includes/footer.html
+++ b/_includes/footer.html
+<footer class="site-footer h-card">
+    <div class="wrapper footer-wrapper">
+      <data class="u-url" href="{{ "/" | relative_url }}"></data>
+
+      <div class="footer-cp">
+          <div class="r3-logo-container">
+              <img class="r3-logo" src="{{ '/assets/banners/r3-logo.svg' | relative_url }}" type="image/svg+xml" />
+              <img class="lcsb-logo" src="{{ '/assets/banners/lcsb-compact.svg' | relative_url }}" type="image/svg+xml" />
+          </div>
+
+          {% comment %}This is used to generate share URL for howto-pages{% endcomment %}
+          <div class="footer-text-container">
+          {% if page.timestamp %}
+            <p>Last page modification: {{ page.timestamp }}</p>
+          {% endif %}
+
+          {% if page.shortcut %}
+              <p>
+                  Share this page:
+                  <a href="{{ site.share_url }}{{ page.shortcut }}">
+                  {{ site.share_url }}{{ page.shortcut }}
+                  </a>
+              </p>
+
+          {% elsif page.include_link %}
+              {% assign parts = page.url | absolute_url | replace: ".html", "" | replace: "http://", "" | replace: "https://", "" | split: "/" %}
+              <p>
+                  Share this page:
+                  <a href="{{ site.share_url }}{{ parts[site.include_link_index] }}">
+                  {{ site.share_url }}{{ parts[site.include_link_index] }}
+                  </a>
+              </p>
+          {% endif %}
+              <p>
+                The contents are available under the <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike License (CC-BY-SA 4.0)</a>.
+              </p>
+
+          {% if site.siteID > 0 %}
+              {%- include policy.html -%}
+          {% endif %}
+          </div>
+
+          <div class="social-container">
+              {%- include social.html -%}
+          </div>
+      </div>
+    </div>
+  </footer>
+  {% if site.siteID > 0 %}
+      {%- include gdpr-banner.html -%}
+  {% endif %}
--- a/_includes/scripts-head.html
+++ b/_includes/scripts-head.html
+<script src="{{ '/assets/vendor/js/jquery-3.6.0.min.js' | relative_url }}"></script>
--- a/_includes/scripts.html
+++ b/_includes/scripts.html
+<script type="text/javascript" src="{{ "assets/js/router.js" | relative_url }}"></script>
+<script type="text/javascript" src="{{ "assets/js/box_hider.js" | relative_url }}"></script>
+<script>
+window.addEventListener('load', function() {
+    window.boxHider.Trigger();
+})
+</script>
--- a/_includes/search.html
+++ b/_includes/search.html
+<link rel="prefetch" href="index.js" />
+
+<form>
+    <input class="search" placeholder="What are you looking for?" name="search_query" id="search_query" /><br />
+    <button class="search" type="submit">Find it</button>
+</form>
+
+<h1 id="search_header">Results of your query:</h1>
+
+<table id="search_results_table">
+    <tbody id="search_results_tbody">
+        <tr id="search_results_placeholder" style="display: none">
+            <td id="search_results_placeholder_td"><h3>Please wait, search is in progress...</h3></td>
+        </tr>
+    </tbody>
+</table>
+
+<script src="{{ "assets/js/lunr.min.js" | relative_url }}" integrity="sha256-34Si1Y6llMBKM3G0jQILVeoQKEwuxjbk4zGWXXMT4ps=" crossorigin="anonymous"></script>
+
+<script>
+    var el_table_body = document.getElementById('search_results_tbody');
+    var el_input_query = document.getElementById('search_query');
+    var el_tr_placeholder = document.getElementById('search_results_placeholder');
+    var el_header = document.getElementById('search_header');
+
+    var url_params = new URLSearchParams(window.location.search);
+    var search_term = url_params.get('search_query') || "";
+
+    if (!!search_term.length) {
+        el_input_query.value = search_term;
+        el_header.style.display = "block";
+
+        el_tr_placeholder.style.display = "block";
+    }
+
+    var construct_cell = function(title, content, link) {
+        if (link == '#') {
+            return '<td><h3 class="result">' + title + '</h3><p>' + content + '</p></td>';
+        } else {
+            return '<td><h3><a href="' + link + '">' + title + '</a></h3><p>' + content + '</p></td>';
+        }
+    }
+
+    var capitalize = function(text) {
+        return text.charAt(0).toUpperCase() + text.slice(1);
+    }
+
+    var prettify = function(text) {
+        return text.split(':').map(capitalize).join(' &raquo; ');
+    }
+
+    {% assign the_cards = site.pages | where_exp:"card","card.searchable >= 1.0" %}
+
+    window.content = { {% for card in the_cards %}
+        "{{ card.url | slugify }}": {
+            "title": "{{ card.shortcut | xml_escape }}",
+            "content": {{ card.content | markdownify | strip_html | strip_newlines | truncate: 150 | jsonify }},
+            "url": "{{ card.url | xml_escape | relative_url }}"
+        } {% unless forloop.last %},{% endunless %} {% endfor %}
+    };
+
+    fetch('{{ "index.js" | relative_url }}').then(response => response.text()).then((data) => {
+        var the_index = JSON.parse(data);
+        window.search_index = lunr.Index.load(the_index);
+
+        if (search_term != "") {
+            var results = window.search_index.search(search_term);
+            for (var i = 0; i < results.length; i++) {
+                var node = document.createElement("tr");
+                node.innerHTML = construct_cell(prettify(window.content[results[i].ref].title),
+                                                window.content[results[i].ref].content.substring(0, 150) + '...',
+                                                window.content[results[i].ref].url);
+                el_table_body.appendChild(node);
+            }
+            if (results.length == 0) {
+                var node = document.createElement("tr");
+                node.innerHTML = construct_cell("No results",
+                                                'Sorry, we were unable to find anything that matches your query',
+                                                "#");
+                el_table_body.appendChild(node);
+            }
+        }
+
+        el_tr_placeholder.style.display = "none";
+    })
+
+</script>
--- a/_layouts/landing.html
+++ b/_layouts/landing.html
+<!DOCTYPE html>
+<html lang="{{ page.lang | default: site.lang | default: "en" }}">
+
+    {%- include head.html -%}
+
+    <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" />
+    <link href="{{ "assets/css/landing.css" | relative_url }}"" rel="stylesheet" />
+<body>
+  <div class="main">
+    <div class="content-wrapper">
+
+        <header class="site-header" role="banner">
+            <div>
+
+              {%- if site.banner_link -%}
+                {%- assign banner_link = site.banner_link -%}
+              {%- else -%}
+                {%- assign banner_link = '/' | relative_url -%}
+              {%- endif -%}
+
+              <div class="custom-header">
+                <a href="{{ banner_link }}"><img class="img-uni-lu"
+                     src="{{ '/assets/banners/uni-logo.svg' | relative_url }}"
+                     type="image/svg+xml"
+                /></a>
+                <img class="img-banner img-banner-main"
+                     src="{{ '/assets/banners/' | relative_url }}{{ site.banner }}/banner.svg"
+                     type="image/svg+xml"
+                />
+                <img class="img-banner img-banner-motto"
+                     src="{{ '/assets/banners/' | relative_url }}{{ site.banner }}/motto.svg"
+                     type="image/svg+xml"
+                />
+                <img class="img-lcsb img-logo-{{ site.logo }}"
+                     src="{{ '/assets/banners/' | relative_url }}{{ site.banner }}/logos.svg"
+                     type="image/svg+xml"
+                />
+              </div>
+            </div>
+          </header>
+
+      <main class="page-content" aria-label="Content" style="margin-right: 0%">
+        {% if site.internal %}
+        <div class="indicator tooltip" id="internal-indicator">
+            <p>
+                Internal
+                <i class="material-icons">info</i>
+            </p>
+            <span class="tooltip-text">
+                You are connected to the uni.lu network. <br />You see all the cards.
+            </span>
+        </div>
+        {% else %}
+        <div class="indicator tooltip" id="external-indicator">
+            <p>
+                External
+                <i class="material-icons">info</i>
+            </p>
+            
+            <span class="tooltip-text">
+                You are <strong>not connected</strong> to the uni.lu network. <br />You can see only publicly available cards. <br />In order to see all, please connect to the university network via VPN.
+            </span>
+        </div>
+        {% endif %}
+
+        <div class="wrapper">
+          {%- if page.show_print_button -%}
+          <div class="print-button">
+            <img src="{{ "assets/pdf.svg" | relative_url }}">
+            <a href="javascript:window.print()"><span>Print the page</span></a>
+          </div>
+          {%- endif -%}
+
+            {{ content }}
+
+            <!-- index -->
+
+            <form action="search" method="GET">
+                <div class="search-bar">
+                    <input placeholder="What would you like to look for?" type="text" name="search_query" />
+                    <i class="large material-icons">search</i>
+                </div>
+            </form>
+
+            <div class="container">
+                <div class="left-inner-container" id="left-inner-container" ondrop="window.cardDropDiscard(event)" ondragover="window.allowDrop(event)">
+                </div>
+                <div class="right-inner-container" id="right-inner-container" ondrop="window.cardDrop(event)" ondragover="window.allowDrop(event)">
+                    <div id="drop-to-add" class="card-pinned card-grayed card-pulsate">
+                        <div class="card-header">
+                            <div class="card-icon"><i class="large material-icons">add</i></div>
+                        </div>
+                        <div class="card-content">
+                            <div class="card-title">
+                                <small>Drop to add...</small>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="card-pinned card-grayed cursor-hand" onclick="clear_pinned()">
+                        <div class="card-header">
+                            <div class="card-icon"><i class="large material-icons">delete</i></div>
+                        </div>
+                        <div class="card-content">
+                            <div class="card-title">
+                                <small>Remove all...</small>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </main>
+  </div>
+  {%- include footer.html -%}
+</div>
+</body>
+{%- include scripts.html -%}
+<script>
+    window.is_internal = false;
+</script>
+<script src="{{ "assets/js/landing.js" | relative_url }}"></script>
+
+</html>
No results found