Merge branch 'master' into '38-support-helpdesk-contact-formular'

Use mail adress `support@hifis.net` and position as in branch 38

# Conflicts:
#   contact.md

_data/hifis_team.yml

@@ -72,7 +72,7 @@
   cluster: overall
 - id: fuhrmann
   name: "Fuhrmann, Patrick"
-  image: "anon_freepic.jpg"
+  image: "Patrick_Fuhrmann.jpg"
   location:
     campus: desy
   position: "Backbone Cluster Management"

_includes/frontpage/title-content.html

@@ -10,11 +10,11 @@
         <a href="https://software.hifis.net" class="btn btn-light btn-lg text-dark">
             <i class="fas fa-laptop-code"></i> Helmholtz Software
         </a>
-        <a href="{{ '/contact' | relative_url }}" class="btn btn-light btn-lg text-dark">
-            <i class="fas fa-question"></i> Support
+        <a href="{{ '/you-and-hifis' | relative_url }}" class="btn btn-light btn-lg text-dark">
+            <i class="fas fa-user-plus"></i> HIFIS for you
         </a>
         <a href="{{ '/contact' | relative_url }}" class="btn btn-light btn-lg text-dark">
-            <i class="fas fa-location-arrow"></i> Contact
+            <i class="fas fa-question"></i> Support + Contact
         </a>
     </div>
 </div>

_layouts/frontpage.html

@@ -45,18 +45,22 @@
             <div class="frontpage-mission-jumbotron">
                 <section>
                     <div class="info-col">
+                        
                         <div class="info-box">
-                            <a href="{% link you-and-hifis/index.md %}" class="btn btn-outline-primary">
-                                <h3><i class="fas fa-user-plus" aria-hidden="true"></i>&nbsp; You & HIFIS</h3>
+                            <a href="{% link mission/index.html %}" class="btn btn-outline-primary">
+                                <h3><i class="fas fa-atom" aria-hidden="true"></i>&nbsp; HIFIS Mission</h3>
                             </a>
-                            <p>Our purpose is to support you - as scientist, Helmholtz employee or research project.</p>
+                            <p>Our mission is to strengthen and develop the ICT competences of the whole Helmholtz Association. 
+                            We want to support you - as a scientist, Helmholtz employee or stakeholder of research projects.</p>
                         </div>
+                        
                         <div class="info-box">
-                            <a href="{% link mission/index.html %}" class="btn btn-outline-primary">
-                                <h3><i class="fas fa-atom" aria-hidden="true"></i>&nbsp; HIFIS Mission</h3>
+                            <a href="{% link mission/publications.md %}" class="btn btn-outline-primary">
+                                <h3><i class="fas fa-atom" aria-hidden="true"></i>&nbsp; Publications and Documentation</h3>
                             </a>
-                            <p>Strengthening and developing the ICT competences of the whole Helmholtz Association.</p>
+                            <p>See here for publications, documentations and presentations about HIFIS.</p>
                         </div>
+                        
                         <div class="info-box">
                             <a href="{% link partners.md %}" class="btn btn-outline-primary">
                                 <h3><i class="fas fa-globe-europe" aria-hidden="true"></i>&nbsp; HIFIS Partners</h3>
@@ -64,6 +68,7 @@
                             <p>Take a look at our partners, within the Helmholtz Association and throughout the World.
                             </p>
                         </div>
+                        
                         <div class="info-box">
                             <a href="{% link roadmap/index.md %}" class="btn btn-outline-primary">
                                 <h3><i class="fas fa-road" aria-hidden="true"></i>&nbsp; Now & tomorrow - The HIFIS
@@ -71,9 +76,9 @@
                                 </h3>
                             </a>
                             <p>Get the latest updates of the HIFIS roadmap, summarizing our goals for the months
-                                andyears to
-                                come.</p>
+                                and years to come.</p>
                         </div>
+                        
                     </div>
                 </section>
             </div>

_layouts/team.html

@@ -19,7 +19,7 @@ It does on purpose NOT include the content of the markdown page.
                 <div>
                     <h1>Contact us!</h1>
 
-                    Write the HIFIS team: <code class="language-plaintext highlighter-rouge">office-at-hifis.net</code>
+                    Write the HIFIS team: <code class="language-plaintext highlighter-rouge"><a href="mailto:contact@hifis.net">contact@hifis.net</a></code>
 
 
                     <h1>Team</h1>

_posts/2020/07/2020-07-31-hip-hmc-calls.md

@@ -10,7 +10,6 @@ categories:
 excerpt_separator: <!--more-->
 ---
 
-## Project calls
 Two of our fellow Helmholtz Incubator platforms (HMC and HIP) recently announced their project calls.
 Make sure to not miss the respective deadlines in September and October!
 <!--more-->
@@ -32,3 +31,9 @@ More information on the call [can be found here](https://helmholtz-metadaten.de/
 
 
 
+<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>

_posts/2020/08/2020-08-03-HZI.md

+---
+title: "HZI-HIFIS collaboration for Coronavirus Surveys"
+title_image: default 
+data: 2020-08-03
+authors:
+  - jandt
+layout: blogpost
+categories:
+  - news
+excerpt_separator: <!--more-->
+---
+
+## HZI-led Coronavirus Sero-Survey in collaboration with HIFIS
+The [German Center for Infection Research (DZIF)](https://www.dzif.de) builds a platform collecting methodologies and results of coronavirus antibody studies. 
+In cooperation with HIFIS and led by scientists at the [Helmholtz Centre for Infection Research (HZI)](https://www.helmholtz-hzi.de), the project "LEOSS.sero-survey" is being implemented.
+<!--more-->
+
+#### The LEOSS.sero-survey platform
+The envisioned platform offers research groups the possibility to jointly evaluate anonymised data from various studies of different origins. 
+This helps to increase statistical significance and study robustness. 
+The approach drives the need for a commonly accessible data management. 
+Virtual resources of the Helmholtz Association can be used for that. 
+In this context, a data management system is being provided as a pilot project within HIFIS 
+by the [Helmholtz-Zentrum Berlin (HZB)](https://www.helmholtz-berlin.de/).
+
+#### Invitation for contribution
+Interested researchers and centers are invited to participate in the LEOSS.sero-survey. Please visit the [**SeroHub Portal**](https://serohub.net/en/) for further information and getting started.
+
+<a type="button" class="btn btn-outline-primary btn-lg" href="https://www.dzif.de/en/how-many-people-are-now-immune-sars-cov-2">
+  <i class="fas fa-external-link-alt"></i> Read more
+</a>
+
+

_posts/2020/08/2020-08-10-sp-last-iteration.md

+---
+title: "Last steps towards initial service portfolio"
+title_image: default
+data: 2020-08-10
+authors:
+  - Schollmaier, Laura 
+layout: blogpost
+categories:
+  - news
+excerpt_separator: <!--more-->
+---
+
+Starting with over 100 services as candidates for the upcoming Helmholtz Cloud, we had to define transparent and objective criteria to make the services comparable. 
+We established a service selection process consisting of three iterations to shrink the service candidate list to a handable size. Now we are conducting the 3rd and last iteration of the service selection in which each remaining service is documented with detailed information.
+Using this information the final score of each service can be calculated. The score will give priority on which services will be integrated into Helmholtz Cloud first.
+

cloud-platform.md

@@ -30,6 +30,10 @@ Further functionality of the first version includes
 * Possibility to access a service via a link
 * Indication of service status
 
+This design preview gives you an idea how the web application will look like:
+
+![Preview of the Cloud Access Layer](./assets/img/screenshots/cloud-platform-preview-small.png)
+
 Later versions will contain more enhanced features like
 * Personal workspace with overview about the personal set of services
 * Possibility to request more specific setup of services
@@ -38,4 +42,4 @@ Later versions will contain more enhanced features like
 If you have suggestions about additional use cases and functionality, please feel free to contact us. We appreciate all input from the user community!
 
 ## Contact us:
-`contact-at-hifis.net`
+[contact@hifis.net](mailto:contact@hifis.net)

faq.md

@@ -34,7 +34,7 @@ and
 [Support platform](https://software.hifis.net/services/consulting) is already available.
 
 #### [Anything I can do to get things done faster?][4]
-We have several pilot cloud services and installations running. Please [contact our HIFIS Office](mailto:office@hifis.net) if you need urgent assistance.
+We have several pilot cloud services and installations running. Please [contact us](mailto:contact@hifis.net) if you need urgent assistance.
 
 #### [Where can I register for a newsletter?][6]
 Currently, we do not send newsletters as it would imply for us to collect large amounts of personal data. To stay updated, you are invited to check out 
@@ -46,7 +46,7 @@ besides, of course, regularly checking our website and [**news section!**](news)
 #### [My Helmholtz center is not directly involved into HIFIS. Do you still help me?][5]
 Yes, of course. HIFIS is a Helmholtz-wide platform that aims to
 provide offers for **all** Helmholtz centers. 
-Please [contact our HIFIS Office](mailto:office@hifis.net) or any of the [HIFIS team members](team) to get assistance.
+Please [contact us](mailto:contact@hifis.net) or any of the [HIFIS team members](team) to get assistance.
 
 
 #### [How should I acknowledge HIFIS assistance in a publication?][10]

mission/index.html

@@ -20,30 +20,10 @@ excerpt:
         secure and easy-to-use collaborative environment with efficiently accessible ICT services from anywhere. HIFIS
         will also support the development of research software with a high level of quality, visibility and
         sustainability.</p>
+    <p> Documentation, Full Proposal texts and Publications <a href="{% link mission/publications.md %}">can be found here</a>.
+    </p>
 </div>
-<div class="image-block">
-    <img class="help-image right" alt="pic"
-        src="{{ site.directory.images | append: 'illustrations/undraw_online_information_4ui6.svg' | relative_url }}" />
-    <div>
-        <h1 id="documentation-and-publications">Documentation and Publications</h1>
-        <h3 id="hifis-proposal">HIFIS Proposal</h3>
-        <p>The original platform proposal for HIFIS
-            <a href="https://www.helmholtz.de/fileadmin/user_upload/01_forschung/Helmholtz_Inkubator_HIFIS.pdf">can be
-                found here</a>.</p>
-
-        <h3 id="documentation">Documentation</h3>
-        <p>The technical documentation for HIFIS architectural components
-            <a href="https://hifis.pages.hzdr.de/hifis-technical-documentation/">is located here (restricted
-                access)</a>.</p>
 
-        <h3 id="reports-and-conference-contributions">Reports and Conference Contributions</h3>
-        <ul>
-            <li>Annual report</li>
-            <li>Abstracts</li>
-            <li>SAB Report</li>
-        </ul>
-    </div>
-</div>
 <div class="image-block">
     <img class="help-image left" alt="pic"
         src="{{ site.directory.images | append: 'illustrations/undraw_team_spirit_hrr4.svg' | relative_url }}" />

mission/publications.md

+---
+title: Publications on HIFIS
+title_image: default
+layout: default
+excerpt:
+    Documentation and Publications on HIFIS.
+---
+## HIFIS Proposal
+The original platform proposal for HIFIS [can be found here](https://www.helmholtz.de/fileadmin/user_upload/01_forschung/Helmholtz_Inkubator_HIFIS.pdf).
+
+## Technical Documentation
+The technical documentation for HIFIS architectural components is [**located here**](https://hifis.pages.hzdr.de/hifis-technical-documentation/).
+
+The access is currently restricted to HIFIS members. Most of the documentation is planned to be made publicly available by Q4, 2020.
+
+## Reports and Conference Contributions
+* Annual report
+* Abstracts
+* SAB Report
+* Presentations of HIFIS Conference, as far as public anyway.
+
+

you-and-hifis/index.md

@@ -24,16 +24,11 @@ To this aim, since summer 2019, we are setting up the HIFIS platform, that is bu
 ### Helmholtz Cloud
 The cloud team is currently preparing the Initial Service Portfolio.
 In interviews with different groups of scientists and with IT specialists of all centers a list of over 100 potential IT services was compiled.
-Based on an evaluation matrix with a list of selection criteria, approximately 20 of 25 services will be compiled as an Initial Service Portfolio.
-{% comment %}
-TODO: Add link
-{% endcomment %}
-You can find more information here.
+Based on an evaluation matrix with a list of selection criteria, approximately 20 of 25 services will be compiled as an Initial Service Portfolio. 
 
-The most promising candidates so far are:
-List of Top 50 Services or examples
+The most promising candidates so far are e.g. JupyterHub, OpenStack, GitLab, Storage on demand, Sync&Share, Kubernetes, Redmine, LimeSurvey, Mattermost, Rocket.Chat, Zammad, Singularity, etc.
 
-The first IT services are expected to be technically available by the end of 2020. Please contact us if you are interested in using them.
+The first IT services are expected to be technically available by the end of 2020. Please [contact us](mailto:contact@hifis.net) if you are interested in using them.
 
 #### Becoming Service Provider for a new Service
 You have a new IT service, application or program and you would like to provide it to other users via the Helmholtz Cloud, e.g. another Helmholtz Centre or a European partner organization?
@@ -41,16 +36,15 @@ You have a new IT service, application or program and you would like to provide
 Please get in touch with us. The portfolio of the Helmholtz Cloud will be continuously expanded and updated.
 
 #### Your feedback about the service portfolio
-Your contribution is very valuable to us. We would like to exchange views with our users on a regular basis in order optimize the composition of the service portfolio continuously. Please write to us if we may contact you.
+Your contribution is very valuable to us. We would like to exchange views with our users on a regular basis in order optimize the composition of the service portfolio continuously. [Please write to us](mailto:contact@hifis.net) if we may contact you.
 
-#### Service Portfolio
+#### Helmholtz Cloud Service Portfolio
 The Helmholtz Cloud will appear as a federated cloud. All services are hosted by one of the 19 Helmholtz centers. There will be some services that are available for all Helmholtz employees. But in many cases, it will be unavoidable to sign an additional agreement between the providing center and the using organization. So, the services you can use will depend if the agreements between your organization and the providing Helmholtz center exists.
 
 All services in the Helmholtz Cloud are for free.
 
 #### International Connectivity
-The Helmholtz Cloud is accessible for international users via “EGI”, “AAI”. You will be able to use your XXX Account to login.
-
+The Helmholtz Cloud is accessible for international users via the Helmholtz AAI. Helmholtz AAI is a member of <a href="https://edugain.org/" target="_blank">eduGAIN</a>, so if your institution participates in eduGAIN you will be able to authenticate with your home institution credentials. We are also planning to provide social logins, like GitHub or OrcID, in case your institution does not participate in eduGAIN.
 ### Software Services
 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.