diff --git a/_includes/cards/post_card_image.html b/_includes/cards/post_card_image.html
index 058d3f4ae521458d899e584fe8f24334fc9632b8..8eabe0f0514d9b65e83b44516f932dd6c64c97a3 100644
--- a/_includes/cards/post_card_image.html
+++ b/_includes/cards/post_card_image.html
@@ -18,10 +18,13 @@ post: The post which sould be displayed on the card
<div class="card top-image-card {{ include.class }}">
<img class="card-img-top card-img-equal" src="{{ img_url }}" alt="Title image">
<div class="card-img-overlay">
+ {%- if include.post.date -%}
<span class="badge badge-secondary">
<i class="fas fa-calendar-day" aria-hidden="true"></i>
{{ include.post.date | date: "%d. %b. %y" }}
</span>
+ {%- endif -%}
+ {%- if include.post.categories -%}
<span class="badge badge-dark">
<i class="fas fa-tag" aria-hidden="true"></i>
{%- for category in include.post.categories -%}
@@ -30,10 +33,14 @@ post: The post which sould be displayed on the card
{%- endunless -%}
{%- endfor -%}
</span>
+ {%- endif -%}
</div>
<div class="card-body">
<a href="{{ include.post.url | relative_url }}" class="stretched-link">
<h4 class="card-title">{{ include.post.title }}</h4>
</a>
+ {%- if include.excerpt -%}
+ <p>{{ include.post.excerpt }}</p>
+ {%- endif -%}
</div>
</div>
diff --git a/assets/img/jumbotrons/adi-goldstein-mDinBvq1Sfg-unsplash.jpg b/assets/img/jumbotrons/adi-goldstein-mDinBvq1Sfg-unsplash.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..b466dbc64b2e6b2e419823322e82030e1c97b715
Binary files /dev/null and b/assets/img/jumbotrons/adi-goldstein-mDinBvq1Sfg-unsplash.jpg differ
diff --git a/assets/img/jumbotrons/adi-goldstein-mDinBvq1Sfg-unsplash_shrinked.jpg b/assets/img/jumbotrons/adi-goldstein-mDinBvq1Sfg-unsplash_shrinked.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..d28432a05ba6be68786ee9f4a41240a03f5059de
Binary files /dev/null and b/assets/img/jumbotrons/adi-goldstein-mDinBvq1Sfg-unsplash_shrinked.jpg differ
diff --git a/assets/img/jumbotrons/desktop/adi-goldstein-mDinBvq1Sfg-unsplash.jpg b/assets/img/jumbotrons/desktop/adi-goldstein-mDinBvq1Sfg-unsplash.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..6ddacba2352ad7d0f6fbdaa2d8ec56e848cd5661
Binary files /dev/null and b/assets/img/jumbotrons/desktop/adi-goldstein-mDinBvq1Sfg-unsplash.jpg differ
diff --git a/assets/img/jumbotrons/desktop/adi-goldstein-mDinBvq1Sfg-unsplash_shrinked.jpg b/assets/img/jumbotrons/desktop/adi-goldstein-mDinBvq1Sfg-unsplash_shrinked.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..4690fa8e908efe94f8b3620aaa427bd5aaaa9a96
Binary files /dev/null and b/assets/img/jumbotrons/desktop/adi-goldstein-mDinBvq1Sfg-unsplash_shrinked.jpg differ
diff --git a/assets/img/jumbotrons/display_2k/adi-goldstein-mDinBvq1Sfg-unsplash.jpg b/assets/img/jumbotrons/display_2k/adi-goldstein-mDinBvq1Sfg-unsplash.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..8de18a16e753d23d43f72ad6e8717e3458d52803
Binary files /dev/null and b/assets/img/jumbotrons/display_2k/adi-goldstein-mDinBvq1Sfg-unsplash.jpg differ
diff --git a/assets/img/jumbotrons/display_2k/adi-goldstein-mDinBvq1Sfg-unsplash_shrinked.jpg b/assets/img/jumbotrons/display_2k/adi-goldstein-mDinBvq1Sfg-unsplash_shrinked.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..b24ec580697a94eb117f2930d9ee1cdb716dd251
Binary files /dev/null and b/assets/img/jumbotrons/display_2k/adi-goldstein-mDinBvq1Sfg-unsplash_shrinked.jpg differ
diff --git a/assets/img/jumbotrons/phone/adi-goldstein-mDinBvq1Sfg-unsplash.jpg b/assets/img/jumbotrons/phone/adi-goldstein-mDinBvq1Sfg-unsplash.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..bd8c039a413510fab83e391cfbe14404b77039ef
Binary files /dev/null and b/assets/img/jumbotrons/phone/adi-goldstein-mDinBvq1Sfg-unsplash.jpg differ
diff --git a/assets/img/jumbotrons/phone/adi-goldstein-mDinBvq1Sfg-unsplash_shrinked.jpg b/assets/img/jumbotrons/phone/adi-goldstein-mDinBvq1Sfg-unsplash_shrinked.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..e9b85377d13b3ca2c01eade8b248e4a7a60efffc
Binary files /dev/null and b/assets/img/jumbotrons/phone/adi-goldstein-mDinBvq1Sfg-unsplash_shrinked.jpg differ
diff --git a/assets/img/jumbotrons/tablet/adi-goldstein-mDinBvq1Sfg-unsplash.jpg b/assets/img/jumbotrons/tablet/adi-goldstein-mDinBvq1Sfg-unsplash.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..2937b5d09508d23b053e927186e5981ab0f7e4b4
Binary files /dev/null and b/assets/img/jumbotrons/tablet/adi-goldstein-mDinBvq1Sfg-unsplash.jpg differ
diff --git a/assets/img/jumbotrons/tablet/adi-goldstein-mDinBvq1Sfg-unsplash_shrinked.jpg b/assets/img/jumbotrons/tablet/adi-goldstein-mDinBvq1Sfg-unsplash_shrinked.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..0fe01268897d026650029659599097f3add39f84
Binary files /dev/null and b/assets/img/jumbotrons/tablet/adi-goldstein-mDinBvq1Sfg-unsplash_shrinked.jpg differ
diff --git a/hifis-services-for-you/index.md b/hifis-services-for-you/index.md
index 5df58bf3564fa3e90beb09302b54f26830c1c83a..68840688cb4d3dab10eb84824ebba5ce4a301af8 100644
--- a/hifis-services-for-you/index.md
+++ b/hifis-services-for-you/index.md
@@ -19,7 +19,7 @@ To this aim, since summer 2019, we are setting up the HIFIS platform, that is bu
- a stable, high-bandwidth **network infrastructure** connecting all Helmholtz centres,
- [**Software services**](#software-services) to provide you with a common platform,
[training]({% link events.md %}) and
- [support]({% link services/consulting.html%}) for high-quality sustainable software development.
+ [support]({% link services/software/consulting.html%}) for high-quality sustainable software development.
### Helmholtz Cloud
The cloud team is currently preparing the Initial Service Portfolio.
@@ -56,18 +56,18 @@ The Helmholtz Cloud is accessible for international users via the Helmholtz AAI.
HIFIS Software Services' mission is to empower scientists of any domain to implement and to
perpetuate modern scientific software development principles in order to make research software engineering more sustainable.
-#### [Education & Training]({% link services/training.md %})
+#### [Education & Training]({% link services/software/training.md %})
The purpose of the Education & Training component is to offer courses, materials, and workshops
to help you in getting started, or to boost your software engineering practices.
-On [this page]({% link services/training.md %}), you can find upcoming workshops
+On [this page]({% link services/software/training.md %}), you can find upcoming workshops
on a range of topics, as well as external resources to help you get started.
-#### [Consulting]({% link services/consulting.html%})
+#### [Consulting]({% link services/software/consulting.html%})
The Software team offers free-of-charge consulting as a service to research groups within the Helmholtz umbrella.
We can help you deal with specific licensing issues, migrating code between different environments
and languages, setting up new projects, and other problems that you need to solve.
-[Fill out the form]({% link services/consulting.html%}) to request a consulting.
+[Fill out the form]({% link services/software/consulting.html%}) to request a consulting.
#### [Community Building](https://pad.gwdg.de/s/BkAKOLoPL)
HIFIS Software will build and foster communities to support the necessary cultural change
diff --git a/services/index.md b/services/index.md
index c6c3bdc0d8cd93116db370c6ddb392e96649b6bb..382d23bd8ede990ca679ff56e8204a50d336a236 100644
--- a/services/index.md
+++ b/services/index.md
@@ -1,18 +1,35 @@
---
-title: Services
+title: HIFIS Services
title_image: default
-layout: services/index
+layout: default
author: none
-additional_css:
- - services/custom.css
- - title/service-title-buttons.css
-excerpt:
- "The service portfolio of HIFIS Software is structured into 4 different
- components that seamlessly interoperate with each other: Education &
- Training, Technology, Consulting and Community Services."
+
---
-{% comment %}
- This markdown file triggers the generation of the services page.
- Only the frontmatter is required by Jekyll.
- The contents section does not get rendered into HTML on purpose.
-{% endcomment %}
+
+## Cloud
+
+
+## Software
+<div class="flex-cards">
+{%- assign posts = site.pages | where_exp: "item", "item.path contains 'services/software'" -%}
+{% for post in posts -%}
+{% include cards/post_card_image.html post=post excerpt=true %}
+{% endfor -%}
+</div>
+
+## Backbone
+
+## Guidelines
+
+<div class="flex-cards">
+{%- assign posts = site.categories['guidelines'] | where: "lang", "en" -%}
+{% for post in posts -%}
+{% include cards/post_card_image.html post=post %}
+{% endfor -%}
+</div>
+<div class="alert alert-success">
+ <h2 id="contact-us"><i class="fas fa-info-circle"></i> Comments or Suggestions?</h2>
+ <p>
+ Feel free to <a href="{% link contact.md %}">contact us</a>.
+ </p>
+</div>
diff --git a/services/software/communities.md b/services/software/communities.md
new file mode 100644
index 0000000000000000000000000000000000000000..5b772647b119137fbc0c43c97ef62d56c82a0acf
--- /dev/null
+++ b/services/software/communities.md
@@ -0,0 +1,13 @@
+---
+title: Communities
+title_image: adi-goldstein-mDinBvq1Sfg-unsplash.jpg
+layout: services/default
+author: none
+additional_css:
+ - title/service-title-buttons.css
+excerpt:
+ "HIFIS Software builds and fosters communities to support the necessary
+ cultural change in science when dealing with research software.
+ We will build and run an exchange network between the Helmholtz centers
+ and will also provide guidance on how to build communities of practice."
+---
diff --git a/services/consulting.html b/services/software/consulting.html
similarity index 100%
rename from services/consulting.html
rename to services/software/consulting.html
diff --git a/services/software/helmholtzgitlab.html b/services/software/helmholtzgitlab.html
new file mode 100644
index 0000000000000000000000000000000000000000..3cd6208cba0c38dac4e9065b0a2f4fa46a10ab67
--- /dev/null
+++ b/services/software/helmholtzgitlab.html
@@ -0,0 +1,244 @@
+---
+title: Helmholtz GitLab / Technology
+title_image: adi-goldstein-mDinBvq1Sfg-unsplash_shrinked.jpg
+layout: services/default
+author: none
+additional_css:
+ - services/services-page-images.css
+excerpt: >-
+ HIFIS Software provides a sustainable, well integrated and easy to
+ use technology infrastructure for scientific software development.
+ You, as a researcher, are accompanied during the complete life cycle
+ (from idea to publication) of your research software through technology
+ services.
+ The central point is a free-of-charge Helmholtz-wide GitLab service
+ that is available to all people within the Helmholtz Association and their partners.
+---
+
+<p>
+ The HIFIS team offers IT services to all Helmholtz communities
+ which enable scientists to do research and develop research software in
+ tight collaboration with other scientists from within Helmholtz.
+ Offering a sophisticated Software Project Management Platform is an
+ important prerequisite to achieve this.
+ The Software Project Management Platform
+ <a href="https://about.gitlab.com">GitLab</a>
+ has already become a de-facto standard for many Helmholtz centers
+ in the past years.
+ Many centers offer GitLab to their scientists.
+ In order to bundle resources and foster cross-center collaboration
+ HIFIS Software offers
+ <a href="https://gitlab.hzdr.de">Helmholtz GitLab</a>
+ to all Helmholtz disregarding the center affiliation.
+ The benefits and synergies of using GitLab are manifold.
+ Nowadays, research software needs to be open, transparent, reproducible,
+ accessible, findable, reusable just to name a few desired properties.
+ We believe that a full-fledged feature-rich open-source software like
+ GitLab is the right tool to support scientists to develop such software
+ that adheres to these properties.
+</p>
+
+<h1>Features of the Helmholtz GitLab Service</h1>
+
+<div class="image-block">
+ <img
+ class="help-image left"
+ alt="A software developer working with version control."
+ src="{{ site.directory.images | relative_url }}/services/undraw_version_control_9bpv.svg"
+ />
+ <div>
+ <h3>Version Control with Git</h3>
+ <p>
+ One reason for many Helmholtz research centers to have chosen GitLab as
+ the right tool might be the popularity of the Version Control System
+ <a href="https://git-scm.com/">Git</a>.
+ GitLab is using Git under the hood and Git and GitLab interact
+ with each other seamlessly.
+ With Version Control scientists are able to keep track of their
+ changes they make during research software development due to the
+ fact that Git stores the complete history of changes in the
+ respective Git repository.
+ One can jump back and forth in the history and for example inspect
+ previous versions or even restore previous versions of the software.
+ GitLab or any other Git-based Software Project Management Platform
+ offer a central point to exchange code and ideas with others and
+ render close and fruitful collaboration between scientists.
+ But what if you already use another Git-based Software
+ Project Management Platform?
+ That's perfect, no worries.
+ GitLab offers an
+ <a href="https://gitlab.hzdr.de/help/user/project/import/index.md">import wizard</a>
+ with which researchers can migrate their remote Git repositories
+ just easily if the necessity arises.
+ </p>
+ <p>
+ <a href="https://gitlab.hzdr.de/help/topics/git/index.md" type="button" class="btn btn-outline-secondary btn-sm">
+ <i class="fas fa-file-alt"></i> Documentation
+ </a>
+ </p>
+ </div>
+</div>
+
+<div class="image-block">
+ <img
+ class="help-image right"
+ alt="A software developer working with GitLab."
+ src="{{ site.directory.images | relative_url }}/services/undraw_developer_activity_bv83.svg"
+ />
+ <div>
+ <h3>Project Management with GitLab</h3>
+ <p>
+ As mentioned in the previous section, collaboration is such a necessity.
+ Today, there is literally no research project that is not driven
+ by collaboration.
+ Hence, project management is an important task and duty of
+ researchers in order to make good progress in their research
+ projects.
+ GitLab is a specialized tool to support software project management.
+ It offers
+ <a href="https://gitlab.hzdr.de/help/user/group/index.md">Groups</a>,
+ <a href="https://gitlab.hzdr.de/help/user/project/index.md">Projects</a>,
+ <a href="https://gitlab.hzdr.de/help/user/project/issues/index.md">Issue Trackers</a>,
+ <a href="https://gitlab.hzdr.de/help/user/project/issue_board.md">Issue/Kanban Boards</a>,
+ <a href="https://gitlab.hzdr.de/help/user/project/milestones/index.md">Milestones</a>,
+ <a href="https://gitlab.hzdr.de/help/user/project/labels.md">Labels</a>,
+ <a href="https://gitlab.hzdr.de/help/user/project/repository/branches/index.md">Branches</a>,
+ <a href="https://gitlab.hzdr.de/help/user/project/merge_requests/index.md">Merge Requests</a>
+ among many other useful features.
+ This platform is very open in terms of supported workflows in
+ research software projects and can be adapted to almost any
+ practical software development workflow you may think of.
+ Using the <a href="https://gitlab.hzdr.de">Helmholtz GitLab Service</a>
+ makes it easier to see and keep track of the progress of your projects.
+ </p>
+ <p>
+ <a href="https://gitlab.hzdr.de/help/user/project/index.md" type="button" class="btn btn-outline-secondary btn-sm">
+ <i class="fas fa-file-alt"></i> Documentation
+ </a>
+ </p>
+ </div>
+</div>
+
+<div class="image-block">
+ <img
+ class="help-image left"
+ alt="A software developer watching Continuous Integration pipeline stages."
+ src="{{ site.directory.images | relative_url }}/services/undraw_check_boxes_m3d0.svg"
+ />
+ <div>
+ <h3>GitLab Continuous Integration</h3>
+ <p>
+ Continuous Integration (CI) is a first-class citizen available free-of-charge
+ and already activated for all users.
+ Almost every software product benefits from automated tasks.
+ CI pipelines can automatically build, test and finally deploy the
+ software product to a container, package registry or a staging/production
+ environment on which simulations may run.
+ Often these automated task are used as quality gates which
+ need to be passed successfully in order to be able to integrate
+ the code change into some mainline.
+ Developers are able to "integrate" their contributions
+ "continuously" and due to a high level of automation many of the time
+ consuming tasks don't need to be done manually.
+ Thus, researchers can focus on doing research and not on doing
+ tedious tasks again and again.
+ </p>
+ <p>
+ <a href="https://gitlab.hzdr.de/help/ci/README.md" type="button" class="btn btn-outline-secondary btn-sm">
+ <i class="fas fa-file-alt"></i> Documentation
+ </a>
+ </p>
+ </div>
+</div>
+
+<div class="image-block">
+ <img
+ class="help-image right"
+ alt="A container ship carrying some containers."
+ src="{{ site.directory.images | relative_url }}/services/undraw_Container_ship_ok1c.svg"
+ />
+ <div>
+ <h3>GitLab Container Registry</h3>
+ <p>
+ Containers have become very popular: Gitlab takes that into account
+ by offering Container Registry very similar to Docker Hub.
+ Once research software developers build their own images they can
+ be stored centrally in such a registry for later reuse.
+ </p>
+ <p>
+ <a href="https://gitlab.hzdr.de/help/user/packages/container_registry/index.md" type="button" class="btn btn-outline-secondary btn-sm">
+ <i class="fas fa-file-alt"></i> Documentation
+ </a>
+ </p>
+ </div>
+</div>
+
+<div class="image-block">
+ <img
+ class="help-image left"
+ alt="A software developer inspecting some packages."
+ src="{{ site.directory.images | relative_url }}/services/undraw_order_delivered_p6ba.svg"
+ />
+ <div>
+ <h3>GitLab Package Registry</h3>
+ <p>
+ Package Registries exist already for a long time, GitLab supports
+ the most prominent candidates like PyPI (Python), Conan (C++),
+ Maven (Java), NPM (NodeJS), Composer (PHP), NuGet (.NET), etc.
+ so that packages can be stored independently from these public
+ registries. On top GitLab also adds access control to
+ keep the group of project members manageable.
+ </p>
+ <p>
+ <a href="https://gitlab.hzdr.de/help/user/packages/package_registry/index.md" type="button" class="btn btn-outline-secondary btn-sm">
+ <i class="fas fa-file-alt"></i> Documentation
+ </a>
+ </p>
+ </div>
+</div>
+
+<div class="image-block">
+ <img
+ class="help-image right"
+ alt="A software developer with a bookshelf with some books."
+ src="{{ site.directory.images | relative_url }}/services/undraw_Bookshelves_re_lxoy.svg"
+ />
+ <div>
+ <h3>GitLab Pages</h3>
+ <p>
+ Additionally, there is a feature called GitLab Pages that can be
+ used to publish static web sites e.g. your documentation.
+ Like other features, e.g. GitLab Container andd Package Registries,
+ GitLab Pages can be used during automation with CI pipelines.
+ Each time a contribution is made to your project
+ your documentation is rebuilt including the new changes
+ and automatically made accessible to anyone with the right permissions.
+ </p>
+ <p>
+ <a href="https://gitlab.hzdr.de/help/user/project/pages/index.md" type="button" class="btn btn-outline-secondary btn-sm">
+ <i class="fas fa-file-alt"></i> Documentation
+ </a>
+ </p>
+ </div>
+</div>
+
+<div class="image-block">
+ <img
+ class="help-image left"
+ alt="A helpdesk agent at his/her desk."
+ src="{{ site.directory.images | relative_url }}/services/undraw_feeling_proud_qne1.svg"
+ />
+ <div>
+ <h3>Help and Support</h3>
+ <p>
+ Please contact us regarding questions, issues, bugs or ideas
+ on how to improve the service via the HIFIS Helpdesk.
+
+ {% include contact_us/mini.html contact_mail_link=site.contact_mail_for_gitlab %}
+ {% include helpdesk/mini.html %}
+
+ </p>
+ </div>
+</div>
+
+<div class="image-attrib">Images by Katerina Limpitsouni via <a href="https://undraw.co/">undraw.co</a></div>
diff --git a/services/training.md b/services/software/training.md
similarity index 94%
rename from services/training.md
rename to services/software/training.md
index 0f73fd985a5afb8918c5fc2510a940268b33a550..e8079808b0102e01d4493e8db2b038f6eb34a708 100644
--- a/services/training.md
+++ b/services/software/training.md
@@ -1,14 +1,13 @@
---
title: Education & Training
-title_image: coding_background.jpg
+title_image: group-of-people-watching-on-laptop-1595385.jpg
layout: services/default
author: none
additional_css:
- title/service-title-buttons.css
excerpt:
- "The service portfolio of HIFIS Software is structured into 4 different
- components that seamlessly interoperate with each other: Education &
- Training, Technology, Consulting and Community Services."
+ "In Education & Training we offer courses, materials or workshops to help you
+ in getting started or in boosting your software engineering practice."
---
The purpose of the Education & Training component is to offer courses, materials, and workshops to help you in getting started, or to boost your engineering practices.