Merge branch 'master' into overall-motivation-no-extra-page

.gitlab-ci.yml

@@ -18,15 +18,20 @@ stages:
     key: latest
     paths:
       - vendor/bundle
+      - assets/img/jumbotrons
 
 .cache_production: &cache_production
   cache:
     key: production
     paths:
       - vendor/bundle
+      - assets/img/jumbotrons
 
 .common_production: &production_before_script
   before_script:
+    - "[[ -x \"$(command -v apt-get)\" ]] && \
+          apt-get update && \
+          apt-get install -y ffmpeg"
     - gem install bundler --no-document
     - bundle config set without 'test'
     - bundle install --jobs $(nproc)
@@ -34,6 +39,9 @@ stages:
 
 .common_latest: &latest_before_script
   before_script:
+    - "[[ -x \"$(command -v apt-get)\" ]] && \
+          apt-get update && \
+          apt-get install -y ffmpeg"
     - "[[ -f \"Gemfile.lock\" ]] && rm Gemfile.lock"
     - bundle config set without 'test'
     - bundle install --jobs $(nproc) --without test "${FLAGS[@]}"
@@ -51,6 +59,7 @@ stages:
   variables:
     <<: *common_variables
   script:
+    - "bash scripts/create_jumbotrons.sh assets/img/jumbotrons/"
     - "bundle exec jekyll build --future \
         --config _config.yml \
         -d public$SUBPATH \
@@ -64,6 +73,7 @@ stages:
   variables:
     <<: *common_variables
   script:
+    - "bash scripts/create_jumbotrons.sh assets/img/jumbotrons/"
     - "bundle exec jekyll build --future \
         --config _config.yml,_config_reviewapps.yml \
         -d public$SUBPATH \
@@ -160,7 +170,7 @@ test:htmlproofer:external_links:
   script:
     - "bundle exec htmlproofer \
         --internal-domains localhost:4000 \
-        --url-ignore 'https://www.openstoragenetwork.org' \
+        --url-ignore '/www.openstoragenetwork.org/,/www.hzdr.de/,/indico4.twgrid.org/,/aai.helmholtz.de/,/cvs.data.kit.edu/' \
         --assume-extension public/"
   rules:
     - if: '$CI_PIPELINE_SOURCE == "schedule"'

CONTRIBUTING.md

@@ -18,7 +18,7 @@ and get feedback regarding how to improve its appearance and content.
 Note:
 In case you are just interested to know how to contribute with a
 blog post to _HIFIS Software_ web-page you can find a 
-[blog post](https://software.hifis.net/tutorials/2019/11/22/How-to-Create-a-new-Blog-Post "How to Create a New Blog Post?")
+[blog post]({% post_url 2019/11/2019-11-22-How-to-Create-a-new-Blog-Post %} "How to Create a New Blog Post?")
 explaining the suggested workflow in the blog post section 
 of the web-page.
 

README.md

@@ -20,11 +20,28 @@ is built using Jekyll.
    ``` bash
    git submodule update --init --recursive
    ```
-5. Build and preview the web page.
+5. Optionally, on _Linux_ systems install `FFmpeg` to be used to scale
+   Jumbotron images.
+   On systems with `Apt`
+   ```bash
+   apt install ffmpeg
+   ```
+   _or_ on systems with `Yum`
+   ```bash
+   yum install ffmpeg
+   ```
+6. Optionally, on _Linux_ systems create scaled variants of Jumbotron images to
+   be used on different devices.
+   ```bash
+   bash scripts/create_jumbotrons.sh assets/img/jumbotrons/
+   ```
+   _Note: Be aware that missing scaled variants of Jumbotron images may cause
+   issues in your local installation when rendering the page in the next step._
+7. Build and preview the web page.
    ```bash
    bundle exec jekyll serve --future
    ```
-6. Add content.
+8. Add content.
 
 Execute the commands above from the root of your repository.
 

_data/hifis_team.yml

@@ -30,7 +30,45 @@
 #       - 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:
+    campus: gfz
+  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:
+    campus: dlr
+  position: "Research Assistant"
+  rank: 0
+  associate: false
+  cluster: software
+- id: erxleben
+  name: "Erxleben, Fredo"
+  location:
+    campus: hzdr
+  position: "Research Software Engineer and Trainer"
+  rank: 0
+  associate: false
+  cluster: software
 - id: guelzow
   name: "Guelzow, Volker"
   image: "Volker_Guelzow.jpg"
@@ -39,8 +77,15 @@
   position: "Coordinator and Speaker of HIFIS"
   associate: false
   rank: 4
-  associate: false
   cluster: overall
+- id: hueser
+  name: "Hüser, Christian"
+  location:
+    campus: hzdr
+  position: "Research Software Engineer and Trainer"
+  rank: 0         
+  associate: false
+  cluster: software
 - id: finke
   name: "Finke, Ants"
   image: "Ants_Finke.jpg"
@@ -49,7 +94,6 @@
   position: "Coordinator"
   associate: false
   rank: 3
-  associate: false
   cluster: overall
 - id: konrad
   name: "Konrad, Uwe"
@@ -59,7 +103,6 @@
   position: "Coordinator"
   associate: false
   rank: 3
-  associate: false
   cluster: overall
 - id: jandt
   name: "Jandt, Uwe"
@@ -69,7 +112,6 @@
   position: "HIFIS Office Management"
   associate: false
   rank: 2
-  associate: false
   cluster: overall
 - id: fuhrmann
   name: "Fuhrmann, Patrick"
@@ -79,7 +121,6 @@
   position: "Backbone Cluster Management"
   associate: false
   rank: 1
-  associate: false
   cluster: backbone
 - id: klotz
   name: "Klotz, Andreas"
@@ -89,7 +130,6 @@
   position: "Cloud Cluster Management"
   associate: false
   rank: 1
-  associate: false
   cluster: cloud
 - id: spicker
   name: "Spicker, Annette"
@@ -99,7 +139,6 @@
   position: "Cloud Cluster Management"
   associate: false
   rank: 1
-  associate: false
   cluster: cloud
 - id: huste
   name: "Huste, Tobias"
@@ -109,6 +148,21 @@
   position: "Software Cluster Management"
   associate: false
   rank: 1
+  cluster: software
+- id: schlauch
+  name: "Schlauch, Tobias"
+  location:
+    campus: dlr
+  position: "Research Software Engineer"
+  rank: 0
+  associate: false
+  cluster: software
+- id: stoffers
+  name: "Stoffers, Martin"
+  location:
+    campus: dlr
+  position: "Consultant and Trainer"
+  rank: 0
   associate: false
   cluster: software
 - id: wetzel
@@ -118,5 +172,12 @@
   position: "HIFIS Backbone Services"
   associate: false
   rank: 0
-  associate: false
   cluster: backbone
+- id: ziegner
+  name: "Ziegner, Norman"
+  location:
+    campus: ufz
+  position: "Linux System Engineer"
+  rank: 0
+  associate: false
+  cluster: software

_events/2019/2019-06-04-deRSE19.md

+---
+title: "deRSE19 - Conference for Research Software Engineers in Germany" 
+layout: event
+organizers:
+  - hammitzsch
+  - <a href="https://de-rse.org/en/conf2019/contact.html">deRSE community</a>
+type: conference
+start:
+    date:   "2019-06-04"
+end:
+    date:   "2019-06-06"
+location:
+    campus: "GFZ, Telegrafenberg"
+    room:   "Haus H, A56"
+excerpt:
+    " Conference for Research Software Engineers in Germany. "
+---
+
+Following the success of the first three international Conference of Research Software Engineers in the UK, the first international conference in Germany addressing research software and the people behind it within the German research landscape will be held at the Albert Einstein Science Park in Potsdam on 4-6 June 2019.
+
+More information on the event can be found on the 
+[event page](https://de-rse.org/en/conf2019/).

_events/2019/2019-11-26-shell-git-R.md

+---
+title: Software Carpentry Workshop
+layout: event
+organizers:
+  - belayneh
+  - dolling
+lecturers:
+  - belayneh
+  - dolling
+type:   workshop
+start:
+    date:   "2019-11-26"
+    time:   "09:00"
+end:
+    date:   "2019-11-27"
+    time:   "18:00"
+location:
+    campus: "Online Event"
+fully_booked_out: true
+registration_link: https://docs.google.com/forms/d/e/1FAIpQLScF37yq-HrE6JuGTz6zoFhAfGNowIE2Lr4e900IA0D_tmac2Q/closedform
+registration_period:
+    from:   "2019-10-30"
+    to:     "2019-11-13"
+excerpt:
+    "This Software Carpentry workshop will teach Shell, Git and R programming for researchers."
+---
+
+## Goal
+
+Introduce scientists and PhD students to a powerful toolset to enhance their
+research software workflow.
+
+## Content
+
+This workshops contains the following topics:
+
+* Introduction to _Shell_ scripting
+* Using _Git_ as version control system (VCS)
+* Introduction to the _R_ programming language
+
+Details can also be found directly at the
+[GFZ event page](https://swc-bb.git-pages.gfz-potsdam.de/swc-pages/2019-11-26-Potsdam-Berlin/).
+
+
+## Requirements
+
+No prior knowledge is required to attend this workshop.

_events/2019-12-11-snakemake-introduction-workshop.md → _events/2019/2019-12-11-snakemake-introduction-workshop.md

@@ -2,9 +2,9 @@
 title: Introduction to Snakemake
 layout: event
 organizers:
-  - steinbach
+  - Steinbach, Peter
 lecturers:
-  - steinbach
+  - Steinbach, Peter
 type:   workshop
 start:
     date:   "2019-12-11"

_events/2020/2020-03-05-Machine-Learning-Hackathon-at-GFZ.md

+---
+title: "Machine Learning Hackathon at GFZ" 
+layout: event
+organizers:
+  - "Machine Learning community at GFZ"
+type: Hackathon
+start:
+    date:   "2020-03-05"
+    time:   "09:00"
+end:
+    date:   "2020-03-05"
+    time:   "18:00"
+location:
+    campus: "GFZ, Telegrafenberg"
+    room:   "Vortragsraum 2 and 3, Haus H"
+excerpt:
+    " A one day Hackathon organized by Machine Learning Community at GFZ "
+---
+
+This hackathon aims to bring researchers that are experts in machine learning and/or intersted researchers together. Using real world datasets, it allows researchers to work together using existing machine learning tools and methods. The hackathon is a friendly event that let everyone to share experiance and learn from others.

_events/2020-03-31-the-carpentries-workshop.md → _events/2020/2020-03-31-the-carpentries-workshop.md

@@ -7,7 +7,7 @@ organizers:
 lecturers:
   - erxleben
   - huste
-  - steinbach
+  - Steinbach, Peter
 type:   workshop
 start:
     date:   "2020-03-31"
@@ -17,8 +17,8 @@ location:
     campus: hzdr
     room:   "Building 801, Room P142"
 fully_booked_out: true
-registration_link: https://hifis-events.hzdr.de/event/5/registrations/4/
-waiting_list_link: https://hifis-events.hzdr.de/event/8/registrations/5/
+registration_link: https://events.hifis.net/event/5/registrations/4/
+waiting_list_link: https://events.hifis.net/event/8/registrations/5/
 registration_period:
     from:   "2020-01-20"
     to:     "2020-03-27"

_events/2020-04-21-the-carpentries-workshop.md → _events/2020/2020-04-21-the-carpentries-workshop.md

@@ -7,13 +7,13 @@ organizers:
 lecturers:
   - erxleben
   - huste
-  - steinbach
+  - Steinbach, Peter
 type:   workshop
 start:
     date:   "2020-04-22"
 end:
     date:   "2020-04-23"
-registration_link: https://hifis-events.hzdr.de/event/11/
+registration_link: https://events.hifis.net/event/11/
 location:
     campus: "Online Event"
 fully_booked_out: false

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

@@ -11,7 +11,7 @@ organizers:
 lecturers:
   - schlauch
   - dolling 
-  - leinweber
+  - Leinweber, Katrin
   - huste
 
 start:
@@ -27,8 +27,8 @@ location:
 # URL or mailto:organizer@campus.edu?subject=...&body=...
 # with the text in ... encoded using for example https://www.urlencoder.org/
 # Both are optional but at least ?subject=... is recommended to enable mail filtering
-registration_link: https://hifis-events.hzdr.de/event/12/registrations
-waiting_list_link: https://hifis-events.hzdr.de/event/14/registrations
+registration_link: https://events.hifis.net/event/12/registrations
+waiting_list_link: https://events.hifis.net/event/14/registrations
 fully_booked_out: true
 
 registration_period:

_events/2020/2020-05-18-lecture-series-on-scientific-computing.md

+---
+title: Lecture series on scientific computing
+layout: event
+organizers:
+  - dolling
+  - belayneh
+lecturers:
+  - dolling
+  - belayneh
+type:   Lecture
+start:
+    date:   "2020-05-18"
+    time:   "10:00"
+end:
+    date:   "2020-06-15"
+    time:   "11:00"
+location:
+    campus: "Online Event"
+excerpt:
+    "This lecture series will teach researchers key topics in research software
+    development including best practices"
+---
+
+## Goal
+
+To teach researchers the basics of software development, and introduce them to 
+existing tools and best practices for repoducable research software.
+
+
+## Content
+
+The lecture series is consists of the following topics: 
+* Requirements for Code Publication (scheduled for 2020-05-18)
+* Research software engineering (scheduled for 2020-05-25)
+* Reusable Software (scheduled for 2020-06-08)
+* Automation: making your results reproducible (scheduled for 2020-06-15)
+
+
+## Requirements
+
+No prior knowledge or experiance is required.

_events/2020-06-09-GitLab-Software-Development-Teams.md → _events/2020/2020-06-09-GitLab-Software-Development-Teams.md

@@ -6,7 +6,7 @@ organizers:
 lecturers:
   - schlauch
   - "1 × HZDR"
-  - leinweber
+  - Leinweber, Katrin
 type:   workshop
 start:
     date:   "2020-06-09"
@@ -18,8 +18,8 @@ location:
     campus: "Online"
 #    room:   "TBD"
 fully_booked_out: true
-registration_link: https://hifis-events.hzdr.de/event/13/registrations
-waiting_list_link: https://hifis-events.hzdr.de/event/15/registrations/11/
+registration_link: https://events.hifis.net/event/13/registrations
+waiting_list_link: https://events.hifis.net/event/15/registrations/11/
 registration_period:
     from:   "2020-02-20"
     to:     "2020-05-30"

_events/2020-06-22-software-carpentries-workshop.md → _events/2020/2020-06-22-software-carpentries-workshop.md

@@ -17,7 +17,7 @@ end:
 location:
     campus: "Online Event"
 fully_booked_out: false
-registration_link: https://hifis-events.hzdr.de/event/16/
+registration_link: https://events.hifis.net/event/16/
 registration_period:
     from:   "2020-05-26"
     to:     "2020-06-09"

_events/2020-08-19-the-carpentries-workshop.md → _events/2020/2020-08-19-the-carpentries-workshop.md

@@ -11,7 +11,7 @@ start:
     date:   "2020-08-19"
 end:
     date:   "2020-08-20"
-registration_link: https://hifis-events.hzdr.de/event/20/
+registration_link: https://events.hifis.net/event/20/
 location:
     campus: "Online Event"
 fully_booked_out: false

_events/2020-09-18-git-and-gitlab.md → _events/2020/2020-09-18-git-and-gitlab.md

@@ -6,13 +6,13 @@ organizers:
 lecturers:
   - erxleben
   - lokamani
-  - schmerler
+  - Schmerler, Steve
 type:   workshop
 start:
     date:   "2020-09-18"
 end:
     date:   "2020-09-21"
-registration_link: https://hifis-events.hzdr.de/event/21/
+registration_link: https://events.hifis.net/event/21/
 location:
     campus: "Online Event"
 fully_booked_out: true
@@ -47,4 +47,4 @@ You will be prompted about this choice during the registration.
 
 Further details can be found at the [event page].
 
-[event page]: https://hifis-events.hzdr.de/event/21/
+[event page]: https://events.hifis.net/event/21/