.gitignore

@@ -10,7 +10,7 @@
 # Jekyll-specific
 _site
 .sass-cache/
-.jekyll-cache/
+.jekyll-cache
 .jekyll-metadata
 
 # jekyll
@@ -32,3 +32,10 @@ assets/img/jumbotrons/desktop/
 assets/img/jumbotrons/display_2k/
 assets/img/jumbotrons/phone/
 assets/img/jumbotrons/tablet/
+
+# Places for artifacts to be downloaded automatically from respective repositories
+workshop-materials/*/
+consulting-handbook/
+doc/
+assets/videos/video_full.mp4
+

.gitlab-ci.yml

-image: ruby:3.0
+image: ruby:3.3
 
 stages:
   - build
@@ -13,41 +13,43 @@ stages:
       - public
     expire_in: 1d
 
-.cache_latest: &cache_latest
+.caching: &caching
   cache:
-    key: latest
-    paths:
-      - vendor/bundle
-      - assets/img/jumbotrons
-
-.cache_production: &cache_production
-  cache:
-    key: production
-    paths:
-      - vendor/bundle
-      - assets/img/jumbotrons
+    - key:
+        files:
+          - Gemfile.lock
+        prefix: "$CI_JOB_IMAGE"
+      paths:
+        - vendor/bundle
+    - key: jumbotron-cache-$CI_COMMIT_REF_SLUG
+      paths:
+        - assets/img/jumbotrons/desktop
+        - assets/img/jumbotrons/display_2k
+        - assets/img/jumbotrons/phone
+        - assets/img/jumbotrons/tablet
 
 .common_production: &production_before_script
   before_script:
     - "[[ -x \"$(command -v apt-get)\" ]] && \
           apt-get update && \
           apt-get install -y ffmpeg"
-    - wget https://gitlab.hzdr.de/hifis/overall/communication/hifis-teaser-video/-/jobs/artifacts/main/raw/video/video_full.mp4?job=video_build -O assets/videos/video_full.mp4
+    - ./fetch_external_content.sh
     - gem install bundler --no-document
     - bundle config set without 'test'
     - bundle install --jobs $(nproc)
-  <<: *cache_production
+  <<: *caching
 
 .common_latest: &latest_before_script
   before_script:
     - "[[ -x \"$(command -v apt-get)\" ]] && \
           apt-get update && \
           apt-get install -y ffmpeg"
+    - ./fetch_external_content.sh
     - "[[ -f \"Gemfile.lock\" ]] && rm Gemfile.lock"
     - bundle config set without 'test'
     - bundle install --jobs $(nproc) --without test "${FLAGS[@]}"
     - bundle update --jobs $(nproc) "${FLAGS[@]}"
-  <<: *cache_latest
+  <<: *caching
 
 .common_variables: &common_variables
   GIT_SUBMODULE_STRATEGY: recursive
@@ -101,13 +103,12 @@ stages:
     - gem install bundler --no-document
     - bundle install --jobs $(nproc)
   script:
-    - "bundle exec htmlproofer \
-        --internal-domains localhost:4000 \
-        --disable-external \
-        --assume-extension public/"
+    - "bundle exec htmlproofer public \
+        --disable-external=true \
+        --enforce-https=false"
     # Use yaml-lint tool to check yaml files.
     - "bundle exec yaml-lint _data/ _config.yml"
-  <<: *cache_production
+  <<: *caching
   # https://docs.gitlab.com/ce/ci/yaml/#interruptible
   interruptible: true
 
@@ -157,14 +158,19 @@ test:htmlproofer:external_links:
     - build:production
   needs: ["build:production"]
   script:
-    - "bundle exec htmlproofer \
-        --internal-domains localhost:4000 \
-        --url-ignore '/www.openstoragenetwork.org/,/www.hzdr.de/,/indico4.twgrid.org/,/webfts.fedcloud-tf.fedcloud.eu/' \
-        --assume-extension public/"
+    - >
+        bundle exec htmlproofer public
+        --disable-external=false
+        --enforce-https=false
+        --ignore-urls='/www.openstoragenetwork.org/,/hzdr.de/,/indico4.twgrid.org/,/webfts.fedcloud-tf.fedcloud.eu/,/nubes.helmholtz-berlin.de\/f/'
+        --ignore-status-codes=429
+        --ignore-status-codes=401
+        --ignore-status-codes=403
+        --check-external-hash=false
+        --typhoeus='{"headers":{"User-Agent":"Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:105.0) Gecko/20100101 Firefox/105.0"}}'
+        --only-4xx
   rules:
     - if: '$CI_PIPELINE_SOURCE == "schedule"'
-  tags:
-    - internal
   allow_failure: true
 
 review:
@@ -184,6 +190,7 @@ review:
     on_stop: stop_review
   tags:
     - review-apps
+  allow_failure: true
 
 stop_review:
   stage: review
@@ -203,5 +210,3 @@ stop_review:
 
 include:
   - template: 'Workflows/MergeRequest-Pipelines.gitlab-ci.yml'
-  - template: 'Verify/Accessibility.gitlab-ci.yml'
-  - local: '/.gitlab/ci/a11y.gitlab-ci.yml'

.gitlab/ci/a11y.gitlab-ci.yml

-variables:
-  a11y_urls: > 
-    https://$APPS_DOMAIN/review-apps/$CI_PROJECT_PATH_SLUG/$CI_COMMIT_REF_SLUG/
-    https://$APPS_DOMAIN/review-apps/$CI_PROJECT_PATH_SLUG/$CI_COMMIT_REF_SLUG/news
-    https://$APPS_DOMAIN/review-apps/$CI_PROJECT_PATH_SLUG/$CI_COMMIT_REF_SLUG/services
-    https://$APPS_DOMAIN/review-apps/$CI_PROJECT_PATH_SLUG/$CI_COMMIT_REF_SLUG/mission
-    https://$APPS_DOMAIN/review-apps/$CI_PROJECT_PATH_SLUG/$CI_COMMIT_REF_SLUG/roadmap
-    https://$APPS_DOMAIN/review-apps/$CI_PROJECT_PATH_SLUG/$CI_COMMIT_REF_SLUG/partners
-    https://$APPS_DOMAIN/review-apps/$CI_PROJECT_PATH_SLUG/$CI_COMMIT_REF_SLUG/team
-    https://$APPS_DOMAIN/review-apps/$CI_PROJECT_PATH_SLUG/$CI_COMMIT_REF_SLUG/cloud-platform
-    https://$APPS_DOMAIN/review-apps/$CI_PROJECT_PATH_SLUG/$CI_COMMIT_REF_SLUG/hifis-services-for-you
-    https://$APPS_DOMAIN/review-apps/$CI_PROJECT_PATH_SLUG/$CI_COMMIT_REF_SLUG/contact
-    https://$APPS_DOMAIN/review-apps/$CI_PROJECT_PATH_SLUG/$CI_COMMIT_REF_SLUG/publications
-    https://$APPS_DOMAIN/review-apps/$CI_PROJECT_PATH_SLUG/$CI_COMMIT_REF_SLUG/faq
-    https://$APPS_DOMAIN/review-apps/$CI_PROJECT_PATH_SLUG/$CI_COMMIT_REF_SLUG/imprint
-    https://$APPS_DOMAIN/review-apps/$CI_PROJECT_PATH_SLUG/$CI_COMMIT_REF_SLUG/privacy
-

.gitlab/dependabot.yml

+version: 2
+updates:
+  - package-ecosystem: "bundler"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    rebase-strategy: "auto"

.gitlab/issue_templates/newsletter-contribution.md

+/assign @user1
+/label ~newsletter
+/label ~Progress::ToDo
+/milestone %milestone
+/due <date>
+
+# Contribution for the HIFIS Newsletter
+
+## Authors
+
+> Name the involved authors here, maybe suggesting contributors.
+> If you know their GitLab aliases, use @username to keep them
+> involved.
+
+## Reviewers
+
+> Who do you want as reviewers of your Newsletter contribution? 
+> Default is @lisa.klaffki as the newsletter editor, add people who should review contentwise. 
+> If you know their GitLab aliases, use @username to keep them involved.
+
+## Topic and Content
+
+> Outline what the Assignee should write about.
+> Specify the style of the post (e.g. report, user story, guide, etc.).
+
+## Deadline Date
+
+> When is the deadline to hand in the FINAL text?
+> <date>
+
+

.gitlab/merge_request_templates/add_new_software_spotlight.md

-<!--
-###############################################################################
-This is the issue template for adding new Software Spotlights.
-
-Notes
------
-* please do not alter the assignments and labels.
-* please add only one spotlight per merge request.
-
-If you are looking for instructions how to add a software spotlight, please
-visit https://hifis.net/CONTRIBUTING.html#adding-software-spotlights
-
-
-Note about the preview app
---------------------------
-Please provide us a direct link to the spotlight in the preview app. This
-reduces the effort for all reviewers. A template is found below. Please replace
-BRANCH_NAME with the name of the branch you are merging from, and <SLUG> with
-the slug of your spotlight. Alternatively, wait until the pipeline finished
-building the preview, and copy-paste the link here.
-
-Credentials for preview app
----------------------------
-
-The credentials for the preview app are (they are publicly available, so feel free to share them with your stakeholders):
-
-User: hifis
-Password: HIFISReview!
-###############################################################################
--->
-
-<!-- Delete this line and tell us about the spotlight -->
-
-* :point_right: **[Review link](https://hifis-review-app.hzdr.de/review-apps/hifis-overall-hifis-net/<BRANCH_NAME>/spotlights/<SLUG>)**
-
-#### Checklist for authors
-
-* [ ] Add a link pointing to the review app
-
-#### Checklist for reviewers
-
-* [ ] File size of images is not too large
-* [ ] Update `date_added` attribute
-* [ ] Centres are referenced by official names
-* [ ] License is named by SPDX identifier if possible
-* [ ] All links are pointing to the right place
-
-/cc @frust45 @konrad @jandt-desy
-/assign_reviewer @christian.meessen
-/label ~"Software Spotlight"
-/label ~"Progress::4_Can review"

.gitlab/merge_request_templates/blogpost.md

+<!-- Add a short description of the content here -->
+
+- :point_right: [**Review here**]()
+- :point_right: [Edit here]()
+
+/label ~"Topic::Blog_Post" ~News

.gitmodules

@@ -12,4 +12,4 @@
 	url = https://github.com/jquery/jquery.git
 [submodule "submodules/templates"]
 	path = submodules/templates
-	url = ../templates.git
+	url = https://codebase.helmholtz.cloud/hifis/overall/cdm/templates.git

CONTRIBUTING.md

@@ -37,7 +37,7 @@ you would like to implement.
 
 Important:
 Of course you need your own GitLab account of the
-[HZDR GitLab](https://gitlab.hzdr.de/ "HZDR GitLab")
+[HZDR GitLab](https://codebase.helmholtz.cloud/ "HZDR GitLab")
 instance to do so as well as being added as a group member to the
 development team.
 
@@ -301,47 +301,3 @@ instead of
     rendered page, cluttering and bloating the delivered code. -->
 </html>
 ```
-
-## Adding Software Spotlights
-
-If you want to add a Software Spotlight, you need to prepare the following
-content:
-
-* A preview image, preferrably a logo
-* An excerpt that will be shown in the list, between about 150 to 300
-  characters long
-* An explanatory paragraph that briefly explains what the software is made for,
-  who made it, who are the users, etc.
-
-### Workflow
-
-Before you start, please make sure to add only one Spotlight per Merge Request.
-
-1. If you are not a member of the [hifis.net repository](https://gitlab.hzdr.de/hifis/overall/hifis.net), create a fork of it in your own space.
-2. Clone the repository to your local computer and follow the instructions
-   in the [README.md](https://gitlab.hzdr.de/hifis/overall/hifis.net/-/blob/master/README.md)
-   to get your local instance up and running.
-3. Create a branch for your spotlight.
-4. Navigate to `/_spotlights`.
-5. Create a copy of [`_template.md`](https://gitlab.hzdr.de/hifis/overall/hifis.net/-/blob/master/_spotlights/_template.md)
-   and name it after your software. The markdown file consists of two sections.
-   It has a yaml header which is used to configure the list view on
-   [hifis.net/spotlights](https://hifis.net/spotlights) as well as the green
-   info box on the spotlight's page. The second section is pure markdown, and
-   this is where the descriptive text goes. **If you insert images into the
-   paragraph section, please make sure to use the example code from the
-   template**.
-7. Follow the instructions inside the markdown file and add as much information
-   as possible.
-8. Please use the official [SPDX identifier](https://spdx.org/licenses/) for
-   licenses.
-9. Please use the following paths for different images:
-
-   | Image Type                 | Path                                          |
-   | -------------------------- | --------------------------------------------- |
-   | Preview image              | `/assets/img/spotlights/<name_of_spotlight>/` |
-   | Jumbotron                  | `/assets/img/jumbotrons/`                     |
-   | Any image in the paragraph | `/assets/img/spotlights/<name_of_spotlight>/` |
-
-10. Push your changes to GitLab (either your repo, or a [branch in hifis.net](https://gitlab.hzdr.de/hifis/overall/hifis.net)).
-11. Create a new Merge Request. Below the title of the merge request, you will see a drop down list title "Description". Please choose `add_new_software_spotlight` as a template. The text field below will fill with some text and instructions that will help you creating the merge request.

Dockerfile

+FROM ruby:latest
+
+ARG DUID=1000
+ARG DGID=1001
+
+EXPOSE 4000
+
+RUN apt-get update && apt-get -y install build-essential zlib1g-dev ffmpeg
+RUN gem install jekyll bundler
+RUN git config --global --add safe.directory /app
+
+WORKDIR /app
+
+CMD bundle install && bash scripts/create_jumbotrons.sh assets/img/jumbotrons/ && bundle exec jekyll serve --future --host 0.0.0.0

Gemfile

@@ -2,15 +2,16 @@
 source 'https://rubygems.org'
 
 # List of required gems
-gem 'jekyll', '~> 4.2.2'
+gem 'rake', '~> 13.2.1'
+gem 'jekyll', '~> 4.4.1'
 gem 'jekyll-paginate', '~> 1.1.0'
-gem 'rouge', '~> 3.29.0'
+gem 'rouge', '~> 4.5.1'
 gem 'jekyll-redirect-from', '~> 0.16.0'
-gem 'jekyll-feed', '~> 0.16.0'
+gem 'jekyll-feed', '~> 0.17.0'
 gem "jekyll-sitemap", "~> 1.4"
-gem "webrick", "~> 1.7"
+gem "webrick", "~> 1.9"
 
 group :test do
-    gem 'html-proofer', '~> 3.19.4'
-    gem 'yaml-lint', '~>0.0.7'
+    gem 'html-proofer', '~> 4.4.1'
+    gem 'yaml-lint', '~>0.1.2'
 end

Gemfile.lock

 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    base64 (0.2.0)
+    bigdecimal (3.1.9)
     colorator (1.1.0)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.3.5)
+    csv (3.3.2)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
     ethon (0.15.0)
       ffi (>= 1.15.0)
     eventmachine (1.2.7)
-    ffi (1.15.5)
+    ffi (1.17.1)
     forwardable-extended (2.6.0)
-    html-proofer (3.19.4)
+    google-protobuf (4.29.3)
+      bigdecimal
+      rake (>= 13)
+    html-proofer (4.4.3)
       addressable (~> 2.3)
       mercenary (~> 0.3)
       nokogiri (~> 1.13)
@@ -21,84 +27,94 @@ GEM
       rainbow (~> 3.0)
       typhoeus (~> 1.3)
       yell (~> 2.0)
+      zeitwerk (~> 2.5)
     http_parser.rb (0.8.0)
-    i18n (1.10.0)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    jekyll (4.2.2)
+    jekyll (4.4.1)
       addressable (~> 2.4)
+      base64 (~> 0.2)
       colorator (~> 1.0)
+      csv (~> 3.0)
       em-websocket (~> 0.5)
       i18n (~> 1.0)
-      jekyll-sass-converter (~> 2.0)
+      jekyll-sass-converter (>= 2.0, < 4.0)
       jekyll-watch (~> 2.0)
-      kramdown (~> 2.3)
+      json (~> 2.6)
+      kramdown (~> 2.3, >= 2.3.1)
       kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
-      mercenary (~> 0.4.0)
+      mercenary (~> 0.3, >= 0.3.6)
       pathutil (~> 0.9)
-      rouge (~> 3.0)
+      rouge (>= 3.0, < 5.0)
       safe_yaml (~> 1.0)
-      terminal-table (~> 2.0)
-    jekyll-feed (0.16.0)
+      terminal-table (>= 1.8, < 4.0)
+      webrick (~> 1.7)
+    jekyll-feed (0.17.0)
       jekyll (>= 3.7, < 5.0)
     jekyll-paginate (1.1.0)
     jekyll-redirect-from (0.16.0)
       jekyll (>= 3.3, < 5.0)
-    jekyll-sass-converter (2.2.0)
-      sassc (> 2.0.1, < 3.0)
+    jekyll-sass-converter (3.0.0)
+      sass-embedded (~> 1.54)
     jekyll-sitemap (1.4.0)
       jekyll (>= 3.7, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    kramdown (2.3.1)
-      rexml
+    json (2.9.1)
+    kramdown (2.5.1)
+      rexml (>= 3.3.9)
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    liquid (4.0.3)
-    listen (3.7.1)
+    liquid (4.0.4)
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.4.0)
-    mini_portile2 (2.8.0)
-    nokogiri (1.13.6)
-      mini_portile2 (~> 2.8.0)
+    mini_portile2 (2.8.7)
+    nokogiri (1.16.5)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     parallel (1.22.1)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (4.0.7)
-    racc (1.6.0)
+    public_suffix (6.0.1)
+    racc (1.8.1)
     rainbow (3.1.1)
-    rb-fsevent (0.11.1)
-    rb-inotify (0.10.1)
+    rake (13.2.1)
+    rb-fsevent (0.11.2)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rexml (3.2.5)
-    rouge (3.29.0)
+    rexml (3.4.0)
+    rouge (4.5.1)
     safe_yaml (1.0.5)
-    sassc (2.4.0)
-      ffi (~> 1.9)
-    terminal-table (2.0.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
-    typhoeus (1.4.0)
+    sass-embedded (1.83.4)
+      google-protobuf (~> 4.29)
+      rake (>= 13)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    typhoeus (1.4.1)
       ethon (>= 0.9.0)
-    unicode-display_width (1.8.0)
-    webrick (1.7.0)
-    yaml-lint (0.0.10)
+    unicode-display_width (2.6.0)
+    webrick (1.9.1)
+    yaml-lint (0.1.2)
     yell (2.2.2)
+    zeitwerk (2.6.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  html-proofer (~> 3.19.4)
-  jekyll (~> 4.2.2)
-  jekyll-feed (~> 0.16.0)
+  html-proofer (~> 4.4.1)
+  jekyll (~> 4.4.1)
+  jekyll-feed (~> 0.17.0)
   jekyll-paginate (~> 1.1.0)
   jekyll-redirect-from (~> 0.16.0)
   jekyll-sitemap (~> 1.4)
-  rouge (~> 3.29.0)
-  webrick (~> 1.7)
-  yaml-lint (~> 0.0.7)
+  rake (~> 13.2.1)
+  rouge (~> 4.5.1)
+  webrick (~> 1.9)
+  yaml-lint (~> 0.1.2)
 
 BUNDLED WITH
    2.2.22

LICENSE.md

@@ -15,7 +15,7 @@ This file gives an overview which license applies to which part of the project.
 ## Proprietary
 The following items are copyright protected.
 
-  * The Helmholtz logo and the HIFIS logo
+  * The Helmholtz logo
   * The website corporate design
   * The _CorporateS_ and _Hermann_ fonts
 

Makefile

+# Use this makefile in Linux to build and serve the local development environment
+# with one command.
+# Please make sure to have Jekyll and ffmpeg installed
+
+.PHONY: all install clean serve install-dependencies install-submodules jumbotrons
+
+all: install jumbotrons serve
+
+install: install-dependencies install-submodules
+
+serve:
+	bundle exec jekyll serve --future
+
+clean:
+	rm -rf assets/img/jumbotrons/desktop
+	rm -rf assets/img/jumbotrons/display_2k
+	rm -rf assets/img/jumbotrons/phone
+	rm -rf assets/img/jumbotrons/tablet
+	rm -rf .jekyll-cache
+	rm -rf _site
+
+install-dependencies: Gemfile Gemfile.lock
+	bundle install
+
+install-submodules: .gitmodules
+	git submodule update --init --recursive
+
+jumbotrons:
+	bash scripts/create_jumbotrons.sh assets/img/jumbotrons/

README.md

@@ -6,9 +6,11 @@ is built using Jekyll.
 
 ## Build the project locally
 
+### Manually
+
 1. Clone the project locally
    ```bash
-   git clone --recursive https://gitlab.hzdr.de/hifis/hifis.net.git
+   git clone --recursive git@codebase.helmholtz.cloud:hifis/overall/hifis.net.git
    cd hifis.net
    ```
 2. [Install](https://jekyllrb.com/docs/installation/) Jekyll.
@@ -48,7 +50,48 @@ Execute the commands above from the root of your repository.
 More information is available in Jekyll's
 [documentation](https://jekyllrb.com/docs/)
 
+### Using the Makefile
+
+If you are using Linux, you may also use the provided `Makefile`. After having
+cloned the repository (Step 1 above), make sure to have Jekyll and ffmpeg installed.
+Now you can start the local development server by running
+
+```shell
+make all
+```
+
+Individual steps can also be called:
+
+```shell
+make install     # install dependencies and update submodule
+make jumbotrons  # build the jumbotrons using ffmpeg
+make serve       # start the dev server
+make clean       # Remove all generated/downloaded files
+```
+
+## Using docker compose
+
+To start the development server inside a docker container, first clone the hifis repository including all submodules
+
+```shell
+git clone --recurse-submodules git@codebase.helmholtz.cloud:hifis/overall/hifis.net.git
+```
+
+Then build the container
+
+```shell
+docker compose build
+```
+
+Start the development server via:
+
+```shell
+docker compose up
+```
+
+The page can be accessed via http://localhost:4000
+
 ## Fetch the latest builds from gitlab
 
 The latest master branch (production) build artifacts can be downloaded using
-* https://gitlab.hzdr.de/hifis/hifis.net/-/jobs/artifacts/master/download?job=build:production 
+* https://codebase.helmholtz.cloud/hifis/hifis.net/-/jobs/artifacts/master/download?job=build:production

_config.yml

@@ -36,12 +36,6 @@ defaults:
       type:     "events"
     values:
       author:   "HIFIS"
-  -
-    scope:
-      path:     ""
-      type:     "spotlights"
-    values:
-      author:   "HIFIS"
   -
     scope:
       path:     ""
@@ -61,7 +55,7 @@ defaults:
       hidden:   true
 
 gitlab:
-  project_url: https://gitlab.hzdr.de/hifis/hifis.net
+  project_url: https://codebase.helmholtz.cloud/hifis/hifis.net
 
 contact_mail: support@hifis.net
 helpdesk: support.hifis.net
@@ -74,6 +68,7 @@ sass:
 
 include:
   - assets/vendor/jquery/dist/jquery.min.js
+  - _*.py
 
 exclude:
   - assets/vendor/bootstrap
@@ -87,7 +82,7 @@ plugins:
   - 'jekyll-sitemap'
 
 paginate: 8
-paginate_path: '/news/page:num/'
+paginate_path: '/posts/page:num/'
 
 markdown: kramdown
 kramdown:
@@ -106,10 +101,6 @@ collections:
       output: true
       permalink: /:collection/:slug
 
-    spotlights:
-      output: true
-      permalink: /:collection/:slug
-
     events:
       output: true
       permalink: /:collection/:year/:month/:day/:title
@@ -122,8 +113,6 @@ feed:
   collections:
     posts:
       path: "/feed/news.xml"
-    events:
-      path: "/feed/events.xml"
   excerpt_only: true
 
 # Features checked by modernizr

_data/hifis_team.yml

@@ -11,8 +11,9 @@
 #   organization: desy  # campus-id c.f. _data/helmholtz-centers.yml
 #   position:     "My job title"
 #   office:       "Building XYZ, Room 12.3"   # Inserted verbatim into organization postal address
-#   rank:         0     # Increase rank for each hierarchy level below you
-#   contact:           # All contacts are optional
+#   rank:         0     # 0: Team member, 1: Coordinators and HIFIS Cluster Managers, 2: Communication Officers
+#   associate:    false # true if not core member
+#   contact:            # All contacts are optional
 #     email:      "mail@sample.org"
 #     phone:      +1234567890   # Use international format
 #     fax:        +1234567890   # Use international format
@@ -30,14 +31,6 @@
 #       - type:     facebook    # c.f. _data/social_platforms.yml
 #         link_as:  https://www.facebook.com/my-profile-url
 #         show_as:  "My Profile"
-- id: belayneh
-  name: "Belayneh, Bezaye Tesfaye"
-  location:
-    campus: gfz
-  position: "Research Software Engineer"
-  rank: 0
-  associate: false
-  cluster: software
 - id: brinckmann
   name: "Brinckmann, Nils"
   location:
@@ -45,14 +38,6 @@
   position: "Full Stack Developer"
   rank: 0
   associate: true
-- id: dolling
-  name: "Dolling, Maximilian"
-  location:
-    campus: gfz
-  position: "Research Software Engineer (RSE)"
-  rank: 0
-  associate: false
-  cluster: software
 - id: dworatzyk
   name: "Dworatzyk, Katharina"
   location:
@@ -69,14 +54,38 @@
   rank: 0
   associate: false
   cluster: software
+- id: foerster
+  name: "Förster, Thomas"
+  location:
+    campus: hzdr
+  position: "Research Software Engineer and Consultant"
+  rank: 0
+  associate: false
+  cluster: software
+- id: linnemann
+  name: "Linnemann, Katja"
+  location:
+    campus: hzdr
+  position: "Research Software Engineer and Consultant"
+  rank: 0
+  associate: false
+  cluster: software
+- id: neumann
+  name: "Neumann, Philipp"
+  image: "Philipp_Neumann.jpg"
+  location:
+    campus: desy
+  position: "Coordinator and Speaker of HIFIS"
+  associate: false
+  rank: 1
+  cluster: overall
 - id: guelzow
   name: "Guelzow, Volker"
-  image: "Volker_Guelzow.jpg"
   location:
     campus: desy
-  position: "Coordinator and Speaker of HIFIS"
+  position: "Former Coordinator and Speaker of HIFIS"
   associate: false
-  rank: 4
+  rank: 0
   cluster: overall
 - id: hueser
   name: "Hüser, Christian"
@@ -93,7 +102,7 @@
     campus: hzb
   position: "Coordinator"
   associate: false
-  rank: 3
+  rank: 1
   cluster: overall
 - id: konrad
   name: "Konrad, Uwe"
@@ -102,7 +111,7 @@
     campus: hzdr
   position: "Coordinator"
   associate: false
-  rank: 3
+  rank: 1
   cluster: overall
 - id: jandt
   name: "Jandt, Uwe"
@@ -111,7 +120,7 @@
     campus: desy
   position: "HIFIS Overall Management"
   associate: false
-  rank: 2
+  rank: 1
   cluster: overall
 - id: fuhrmann
   name: "Fuhrmann, Patrick"
@@ -176,7 +185,7 @@
 - id: ziegner
   name: "Ziegner, Norman"
   location:
-    campus: ufz
+    campus: hzdr
   position: "Linux System Engineer"
   rank: 0
   associate: false
@@ -193,7 +202,15 @@
   name: "Meeßen, Christian"
   location:
     campus: gfz
-  position: "Research Software Engineer and Trainer"
+  position: "Research Software Engineer"
+  rank: 0
+  associate: false
+  cluster: software
+- id: hetenyi
+  name: "Hetenyi, Beate"
+  location:
+    campus: gfz
+  position: "Community Manager"
   rank: 0
   associate: false
   cluster: software
@@ -213,3 +230,29 @@
   rank: 0
   associate: false
   cluster: overall
+- id: ravindran
+  name: "Ravindran Ashis"
+  location:
+    campus: dkfz
+  position: "Research Software Engineer and Consultant"
+  rank: 0
+  associate: false
+  cluster: software
+- id: rhee
+  name: "Rhee, Franz"
+  location:
+    campus: desy
+  position: "Cloud Service Orchestration"
+  rank: 0
+  associate: false
+  cluster: cloud
+- id: servan
+  name: "Servan, Sophie"
+  image: "Servan_Sophie.jpg"
+  location:
+    campus: desy
+  position: "HIFIS public relations"
+  rank: 0
+  associate: false
+  cluster: overall
+

_data/navigation.yml

@@ -12,16 +12,26 @@
 
 header:
   - title: "Helmholtz Services"
-    url: "services/"
     entries:
-      - title: "Cloud Services Overview"
-        url: "services/cloud/Helmholtz_cloud"
-      - title: "Cloud Service Providers"
-        url: "hifisfor/csp"
-      - title: "Identity and Access Management (AAI)"
-        url: "https://aai.helmholtz.de/"
-        external: True
-      - title: "Software Engineering"
+      - title: "Cloud Services"
+        entries:
+          - title: "Overview"
+            url: "services/cloud/Helmholtz_cloud"
+          - title: "Cloud Service Providers"
+            url: "hifisfor/csp"
+          - title: "Orchestration of Cloud Services"
+            url: "services/cloud/orchestration"
+      - title: "Helmholtz ID"
+        entries:
+          - title: "What is it about?"
+            url: "aai/"
+          - title: "Log in / Account information"
+            url: "https://login.helmholtz.de/home/"
+            external: True
+          - title: "Group Management"
+            url: "https://login.helmholtz.de/upman/"
+            external: True
+      - title: "Software Services"
         url: "services/software-overview"
       - title: "Software Engineering Consulting"
         url: "consulting"
@@ -29,73 +39,75 @@ header:
         url: "services/backbone-overview"
   - title: "Learning & Training"
     entries:
-      - title: "Education & Training Overview"
+      - title: "Overview & Materials"
         url: "/services/software/training"
       - title: "HIFIS Courses"
-        url: "https://events.hifis.net/category/4/"
+        url: "https://www.helmholtz-hida.de/course-catalog/en/?search%5Bq%5D=HIFIS"
         external: True
       - title: "More Helmholtz courses"
         url: "https://www.helmholtz-hida.de/course-catalog"
         external: True
-      - title: "Learning Materials"
-        url: "services/overall/learning-materials"
-      - title: "FAQ"
-        url: "faq"
+      - title: "Consulting Handbook"
+        url: "consulting-handbook/"
       - title: "Tutorial: Using AAI to login to services"
-        url: "https://aai.helmholtz.de/tutorial/2021/06/23/how-to-helmholtz-aai.html"
-        external: True
+        url: "aai/howto"
   - title: "About HIFIS"
     entries:
       - title: "HIFIS Mission"
         url: "mission"
       - title: "Publications"
         url: "publications"
-      - title: "Technical and Adminstrative Documentation"
-        url: "https://hifis.net/doc"
+      - title: "Documentation Overview"
+        url: "documentation"
       - title: "Partners"
         url: "partners"
       - title: "Who is HIFIS?"
         url: "team"
-      - title: "Roadmap"
-        url: "roadmap"
+      - title: "Timeline"
+        url: "timeline"
       - title: "Further Information"
         entries:
           - title: "Organisational Structure"
             url: "structure"
-          - title: "Documentation Overview"
-            url: "documentation"
+          - title: "Technical and Adminstrative Documentation"
+            url: "https://hifis.net/doc"
+            external: True
           - title: "Reports"
             url: "reports"
           - title: "Surveys"
             url: "services/overall/survey"
-          - title: "Events Archive"
-            url: "events"
-  - title: "Use Cases"
-    entries:
-      - title: "Community Use Cases"
-        url: "usecases"
-      - title: "Software Spotlights"
-        url: "spotlights"
   - title: "Latest & Media"
     entries:
-      - title: "News"
-        url: "news/"
+      - title: "Blog Posts"
+        url: "posts/"
+      - title: "Newsletters"
+        url: "newsletter/"
       - title: "Upcoming events"
         url: "https://events.hifis.net/category/14/"
         external: True
       - title: "Subscribe to..."
         entries:
           - title: 'Newsletter <i class="fas fa-bell"></i>'
-            url: "https://lists.desy.de/sympa/subscribe/hifis-announce"
-          - title: 'News RSS feed <i class="fas fa-rss"></i>'
+            url: "https://lists.desy.de/sympa/subscribe/hifis-newsletter"
+          - title: 'Blog Posts RSS feed <i class="fas fa-rss"></i>'
             url: "feed/news.xml"
-      - title: "Media & Materials"
+      - title: "Media & Outreach materials"
         url: "media"
       - title: "Careers"
         url: "job_offers"
+  - title: "Use Cases"
+    entries:
+      - title: "Community Use Cases"
+        url: "usecases"
+      - title: "Software Spotlights"
+        url: "https://helmholtz.software/spotlights"
+        external: true
   - title: "Can we help you?"
-    url: "contact"
-
+    entries:
+      - title: "FAQ — Frequently Asked Questions"
+        url: "faq"
+      - title: "Contact us (English / German)"
+        url: "contact"
 footer:
          - title: Contact
            url: "contact.html"
@@ -105,6 +117,6 @@ footer:
 
          - title: Privacy
            url: "https://www.desy.de/data_privacy_policy"
-          
+
          - title: Declaration of Accessibility
            url: "https://www.desy.de/declaration_of_accessibility/index_eng.html"

_events/2020/2020-05-12-ready-script-for-publication.md

@@ -5,7 +5,7 @@ layout: event
 # workshop, seminar, lecture or discussion
 type: workshop
 
-# IDs from https://gitlab.hzdr.de/hifis/software.hifis.net/blob/master/_data/hifis_team.yml
+# IDs from https://codebase.helmholtz.cloud/hifis/software.hifis.net/blob/master/_data/hifis_team.yml
 organizers:
   - schlauch
 lecturers:

_events/2020/2020-11-12-bring-script-make-ready-publication.md

@@ -5,7 +5,7 @@ layout: event
 # workshop, seminar, lecture or discussion
 type: workshop
 
-# IDs from https://gitlab.hzdr.de/hifis/software.hifis.net/blob/master/_data/hifis_team.yml
+# IDs from https://codebase.helmholtz.cloud/hifis/software.hifis.net/blob/master/_data/hifis_team.yml
 organizers:
   - schlauch
 lecturers: