diff --git a/_data/hifis_team.yml b/_data/hifis_team.yml index 2561955d59f524b7b2017561601284c5964482a7..6ec8eef899dcbcf3edcec0a30fcf42a0b4850bde 100644 --- a/_data/hifis_team.yml +++ b/_data/hifis_team.yml @@ -31,8 +31,81 @@ # link_as: https://www.facebook.com/my-profile-url # show_as: "My Profile" +- id: guelzow + name: "Guelzow, Volker" + image: "Volker_Guelzow.jpg" + location: + campus: desy + position: "Coordinator and Speaker of HIFIS" + associate: false + rank: 4 + associate: false + cluster: overall +- id: finke + name: "Finke, Ants" + location: + campus: hzb + position: "Coordinator" + associate: false + rank: 3 + associate: false + cluster: overall +- id: konrad + name: "Konrad, Uwe" + image: "Uwe_Konrad.jpg" + location: + campus: hzdr + position: "Coordinator" + associate: false + rank: 3 + associate: false + cluster: overall - id: jandt name: "Jandt, Uwe" + image: "Uwe_Jandt.jpg" + location: + campus: desy + position: "HIFIS Office Management" + associate: false + rank: 2 + associate: false + cluster: overall +- id: fuhrmann + name: "Fuhrmann, Patrick" + image: "anon_freepic.jpg" location: campus: desy + position: "Backbone Cluster Management" + associate: false + rank: 1 + associate: false + cluster: backbone +- id: klotz + name: "Klotz, Andreas" + location: + campus: hzb + position: "Cloud Cluster Management" + associate: false + rank: 1 + associate: false + cluster: cloud +- id: spicker + name: "Spicker, Annette" + image: "Annette_Spicker.jpg" + location: + campus: hzb + position: "Cloud Cluster Management" + associate: false + rank: 1 + associate: false + cluster: cloud +- id: huste + name: "Huste, Tobias" + image: "Tobias_Huste.jpg" + location: + campus: hzdr + position: "Software Cluster Management" + associate: false + rank: 1 associate: false + cluster: software diff --git a/_includes/team_card.html b/_includes/team_card.html index 31e7bd40b3fb05b1c79e87346cd0b247e841e1a8..65f4836d6c9cf2d7f45e5bbe381237d23b617c72 100644 --- a/_includes/team_card.html +++ b/_includes/team_card.html @@ -1,30 +1,30 @@ -{% comment %} +{%- comment -%} A normal team card is designed for acting as a slightly more prominent representation of a person. It features a name, title, organization, position and image of the person and acts as a link to the full member site. -{% endcomment %} +{%- endcomment -%} -{% assign person = include.person %} -{% if person %} -<a href="{{ person.id | prepend: 'members/' | relative_url }}"> - <div class="team-card-normal"> +{%- assign person = include.person -%} +{%- if person -%} +<div class="team-card-normal"> - {% include team_card/image.html %} - - <div> - {% include team_card/organization_short.html person=person %} - {% include team_card/title.html person=person %} - {% include team_card/name.html person=person %} - {% include team_card/position.html person=person %} - {% include team_card/team_member_associate.html person=person %} - </div> + {%- include team_card/image.html -%} + <div> + {%- include team_card/organization_short.html person=person -%} + {%- if person.title -%} + {%- include team_card/title.html person=person -%} + {%- endif -%} + {%- include team_card/name.html person=person -%} + {%- include team_card/position.html person=person -%} + {%- include team_card/team_member_associate.html person=person -%} </div> -</a> -{% else %} + +</div> +{%- else -%} <!-- WARNING: team_card.html was included, but parameter person was not defined --> -{% endif %} +{%- endif -%} diff --git a/_includes/team_card/contacts.html b/_includes/team_card/contacts.html index 62a50302686952829c8423c1d8e1ce6c71945f9d..f037f7229e75bc29a4d2253f3381928808a0f681 100644 --- a/_includes/team_card/contacts.html +++ b/_includes/team_card/contacts.html @@ -1,44 +1,44 @@ -{% assign person = include.person %} -{% if person.contact %} -{% assign contact = person.contact %} +{%- assign person = include.person -%} +{%- if person.contact -%} +{%- assign contact = person.contact -%} <div id="contacts-general"> - {% if contact.email %} + {%- if contact.email -%} <div> <a href="mailto:{{ contact.email }}"> <i class="fas fa-envelope"></i> {{ contact.email }} </a> </div> - {% endif %} + {%- endif -%} - {% if contact.phone %} + {%- if contact.phone -%} <div> <a href="tel:{{ contact.phone }}"> <i class="fas fa-phone"></i> {{ contact.phone }} </a> </div> - {% endif %} + {%- endif -%} - {% if contact.fax %} + {%- if contact.fax -%} <div> <a href="fax:{{ contact.fax }}"> <i class="fas fa-fax"></i> {{ contact.fax }} </a> </div> - {% endif %} + {%- endif -%} - {% if contact.sms %} + {%- if contact.sms -%} <div> <a href="sms:{{ contact.sms }}"> <i class="fas fa-sms"></i> {{ contact.sms }} </a> </div> - {% endif %} + {%- endif -%} </div> -{% endif %} +{%- endif -%} diff --git a/_includes/team_card/contacts_messengers.html b/_includes/team_card/contacts_messengers.html index 7eda6d41576a38cf6d614a6d6b98001e4182088f..c51fe8cb6a7f7d0c0a36be3a7e45d396da6b52db 100644 --- a/_includes/team_card/contacts_messengers.html +++ b/_includes/team_card/contacts_messengers.html @@ -1,27 +1,27 @@ -{% if include.contact %} - {% if include.contact.messengers %} +{%- if include.contact -%} + {%- if include.contact.messengers -%} <div id="contacts-messengers"> - {% for messenger in include.contact.messengers %} - {% assign medium = site.data.messengers[messenger.type] %} + {%- for messenger in include.contact.messengers -%} + {%- assign medium = site.data.messengers[messenger.type] -%} - {% if medium.protocol %} - {% assign proto = medium.protocol %} - {% else %} - {% assign proto = "https"%} - {% endif %} + {%- if medium.protocol -%} + {%- assign proto = medium.protocol -%} + {%- else -%} + {%- assign proto = "https"-%} + {%- endif -%} - {% if medium.fontawesome_class %} - {% assign class = medium.fontawesome_class %} - {% else %} - {% assign class = "far fa-comments" %} - {% endif %} + {%- if medium.fontawesome_class -%} + {%- assign class = medium.fontawesome_class -%} + {%- else -%} + {%- assign class = "far fa-comments" -%} + {%- endif -%} <a href="{{ proto }}:{{ messenger.link_as }}"> <i class="{{ class }}"></i> </a> - {% endfor %} + {%- endfor -%} </div> - {% endif %} -{% else %} + {%- endif -%} +{%- else -%} <!-- WARN included file team_card/contact_messenger, but "contact" was null --> -{% endif %} +{%- endif -%} diff --git a/_includes/team_card/contacts_platforms.html b/_includes/team_card/contacts_platforms.html index c7c265f834382476fd182520c0e9d6e0d2e03403..cc4f90258f5fdc2cc45768130ea859c7dea9487b 100644 --- a/_includes/team_card/contacts_platforms.html +++ b/_includes/team_card/contacts_platforms.html @@ -1,11 +1,11 @@ -{% if include.contact.platforms %} +{%- if include.contact.platforms -%} <div id="contacts-platforms"> - {% for platform in include.contact.platforms %} - {% assign medium = site.data.social_platforms[platform.type] %} + {%- for platform in include.contact.platforms -%} + {%- assign medium = site.data.social_platforms[platform.type] -%} <a href="{{ platform.link_as }}"> <i class="{{ medium.fontawesome_class }}"></i> </a> - {% endfor %} + {%- endfor -%} </div> -{% endif %} +{%- endif -%} diff --git a/_includes/team_card/image.html b/_includes/team_card/image.html index 1560c2f91cc801db628d448104a1077faefefdf6..45539f19ef41ee4ba23d89eb6a901d102789c87b 100644 --- a/_includes/team_card/image.html +++ b/_includes/team_card/image.html @@ -1,4 +1,4 @@ -{% comment %} +{%- comment -%} Includes an image of a person on the page. Assumes that there is a variable "person" already defined. @@ -6,23 +6,23 @@ image file from the site's image directory (see _config.yml). If the image could not be found for any reason, a default avatar image will be substituted. -{% endcomment %} +{%- endcomment -%} -{% assign person = include.person %} -{% if person %} - {% if person.image %} - {% assign image-url = site.directory.images +{%- assign person = include.person -%} +{%- if person -%} + {%- if person.image -%} + {%- assign image-url = site.directory.images | append: "members/" - | append: person.image %} + | append: person.image -%} <img class="portrait" src="{{ image-url | strip | relative_url }}" alt="Picture of {{ person.name }}"> - {% else %} - <div class="portrait"> </div> - {% endif %} -{% else %} + {%- else -%} + <div class="portrait"></div> + {%- endif -%} +{%- else -%} <!-- WARNING: team_card/image.html was included, but no person object was defined --> -{% endif %} +{%- endif -%} diff --git a/_includes/team_card/name.html b/_includes/team_card/name.html index c6be71705cdb4cf67b4996e1ab9d76677f53598c..e9f9b7720da7b5cd666db1e861f58df4ac573ba7 100644 --- a/_includes/team_card/name.html +++ b/_includes/team_card/name.html @@ -1,27 +1,27 @@ -{% comment %} +{%- comment -%} Inserts the name of a person. Assumes that there is a variable "person" already defined. It holds a key "name" and an associated value which is pasted here verbatim. If the key is not present, an informative HTML comment will be inserted. -{% endcomment %} +{%- endcomment -%} -{% assign person = include.person %} -{% if person %} - {% if person.name %} +{%- assign person = include.person -%} +{%- if person -%} + {%- if person.name -%} <span class="name"> {{ person.name }} </span> - {% else %} + {%- else -%} <!-- NOTE: team_card/name.html was included, but person.name was not defined --> - {% endif %} -{% else %} + {%- endif -%} +{%- else -%} <!-- WARNING: team_card/name.html was included, but no person object was defined --> -{% endif %} +{%- endif -%} diff --git a/_includes/team_card/organization_long.html b/_includes/team_card/organization_long.html index 621db598d1aa6d52a272193b7a704f7efcaab987..473962e54673c56004a22f7f4dcee7a7322c2851 100644 --- a/_includes/team_card/organization_long.html +++ b/_includes/team_card/organization_long.html @@ -1,4 +1,4 @@ -{% comment %} +{%- comment -%} Inserts a full data set of an campus of an organization. The data will be formatted as postal address, followed by an external link to the organizations website. @@ -13,68 +13,68 @@ If the key is not valid, an informative HTML comment will be inserted. If available, the parameter "room" will be inserted verbatim at the appropriate position. -{% endcomment %} +{%- endcomment -%} -{% if include.location %} +{%- if include.location -%} -{% assign campus-id = include.location.campus %} -{% assign room = include.location.room %} +{%- assign campus-id = include.location.campus -%} +{%- assign room = include.location.room -%} - {% if campus-id %} - {% assign organization-code = campus-id | split: "-" | first %} - {% assign organization = site.data.helmholtz-centers[organization-code] %} - {% assign location = organization.campii[campus-id] %} + {%- if campus-id -%} + {%- assign organization-code = campus-id | split: "-" | first -%} + {%- assign organization = site.data.helmholtz-centers[organization-code] -%} + {%- assign location = organization.campii[campus-id] -%} - {% if organization and location %} + {%- if organization and location -%} <div class="org-long"> <address> <span class="org-name">{{ organization.name }}</span> <span class="org-name">Campus - {% if location.name %} + {%- if location.name -%} {{ location.name }} - {% else %} + {%- else -%} {{ location.city }} - {% endif %} + {%- endif -%} </span> - {% if room %} + {%- if room -%} <span> {{ room }} </span> - {% endif %} + {%- endif -%} <span> {{ location.street }} </span> <span> {{ location.zip-code }} {{ location.city }} </span> <span> - {% if location.country %} + {%- if location.country -%} {{ location.country }} - {% else %} + {%- else -%} Germany - {% endif %} + {%- endif -%} </span> </address> <div> - {% if location.website %} - {% assign website = location.website %} - {% else %} - {% if organization.website %} - {% assign website = organization.website %} - {% endif %} - {% endif %} + {%- if location.website -%} + {%- assign website = location.website -%} + {%- else -%} + {%- if organization.website -%} + {%- assign website = organization.website -%} + {%- endif -%} + {%- endif -%} - {% if website %} + {%- if website -%} <a href="https://{{ website }}"> <i class="fas fa-external-link-alt"></i> {{ website | split: "/" | first }} </a> - {% endif %} + {%- endif -%} - {% comment %} + {%- comment -%} Space for map button here - {% endcomment %} + {%- endcomment -%} </div> </div> - {% else %} + {%- else -%} <!-- NOTE: team_card/organization_long.html was included, but parameter "location.campus" could not be matched @@ -84,13 +84,13 @@ <div class="org-long"> <address> <span class="org-name">{{ campus-id }}</span> - {% if room %} + {%- if room -%} <span> {{ room }} </span> - {% endif %} + {%- endif -%} </address> </div> - {% endif %} - {% else %} + {%- endif -%} + {%- else -%} <!-- NOTE: team_card/organization_long.html was included, but parameter "location.campus" was not valid. @@ -99,12 +99,12 @@ <div class="org-long-placeholder"> {{ include.location }} </div> - {% endif %} -{% else %} + {%- endif -%} +{%- else -%} <!-- NOTE: team_card/organization_long.html was included, but parameter "location" was not defined. --> <div class="org-long-placeholder"></div> -{% endif %} +{%- endif -%} diff --git a/_includes/team_card/organization_short.html b/_includes/team_card/organization_short.html index 90de721234e0690003a4926052c6039e5b8a0ebc..71f0866cdedd5ab072131a65b5b50afc156fb94e 100644 --- a/_includes/team_card/organization_short.html +++ b/_includes/team_card/organization_short.html @@ -1,4 +1,4 @@ -{% comment %} +{%- comment -%} Inserts the abbreviation of an organization of a person, followed by a slash, if something was printed at all. @@ -6,30 +6,30 @@ It holds a key "organization" and an associated value which is a foreign key into _data/hifis_organizations.yml If the key is not present, an informative HTML comment will be inserted. -{% endcomment %} +{%- endcomment -%} -{% assign person = include.person %} -{% if person %} - {% if person.location.campus %} +{%- assign person = include.person -%} +{%- if person -%} + {%- if person.location.campus -%} <span class="org-short"> - {% assign organization = site.data.helmholtz-centers[person.location.campus] %} - {% if organization %} + {%- assign organization = site.data.helmholtz-centers[person.location.campus] -%} + {%- if organization -%} {{ organization.abbreviation }} - {% else %} + {%- else -%} <!-- NOTE: No further organization info, fallback to verbatim input --> <em>{{ person.location.campus }}</em> - {% endif%} + {%- endif-%} </span> / - {% else %} + {%- else -%} <!-- NOTE: team_card/organization_short.html was included, but person.organization was not defined --> - {% endif %} -{% else %} + {%- endif -%} +{%- else -%} <!-- WARNING: team_card/organization_short.html was included, but no person object was defined --> -{% endif %} +{%- endif -%} diff --git a/_includes/team_card/position.html b/_includes/team_card/position.html index 9f9e9b7a44a7bf25444dd78f899f287678ae8fce..500059ef47f4f79a882bf205e1cfadc3af9bc350 100644 --- a/_includes/team_card/position.html +++ b/_includes/team_card/position.html @@ -1,27 +1,27 @@ -{% comment %} +{%- comment -%} Inserts the position description of a person. Assumes that there is a variable "person" already defined. It holds a key "position" and an associated value which is pasted here verbatim. If the key is not present, an informative HTML comment will be inserted. -{% endcomment %} +{%- endcomment -%} -{% assign person = include.person %} -{% if person %} - {% if person.position %} +{%- assign person = include.person -%} +{%- if person -%} + {%- if person.position -%} <span class="position"> {{ person.position }} </span> - {% else %} + {%- else -%} <!-- NOTE: team_card/position.html was included, but person.position was not defined --> - {% endif %} -{% else %} + {%- endif -%} +{%- else -%} <!-- WARNING: team_card/position.html was included, but no person object was defined --> -{% endif %} +{%- endif -%} diff --git a/_includes/team_card/team_member_associate.html b/_includes/team_card/team_member_associate.html index 234ee8719f72faa64bb51f98ff06d2ef8eb6e904..bfa1973c1b91805584d931bc881dbb6c683769e8 100644 --- a/_includes/team_card/team_member_associate.html +++ b/_includes/team_card/team_member_associate.html @@ -1,18 +1,18 @@ -{% comment %} +{%- comment -%} Associate team members are marked by a badge icon. -{% endcomment %} +{%- endcomment -%} -{% assign person = include.person %} -{% if person %} - {% if person.associate and person.associate == true %} +{%- assign person = include.person -%} +{%- if person -%} + {%- if person.associate and person.associate == true -%} <span class="badge badge-pill badge-secondary" title="Team member is an associate team member."> Associate </span> - {% endif %} -{% else %} + {%- endif -%} +{%- else -%} <!-- WARNING: team_member_associate.html was included, but parameter person was not defined --> -{% endif %} +{%- endif -%} diff --git a/_includes/team_card/title.html b/_includes/team_card/title.html index 6ac5f2b3e5b319b52b7371dccc767847b86516f8..cc0067c56143552a02c6698410c8c3537d59cc73 100644 --- a/_includes/team_card/title.html +++ b/_includes/team_card/title.html @@ -1,27 +1,27 @@ -{% comment %} +{%- comment -%} Inserts the (academic) title of a person. Assumes that there is a variable "person" already defined. It holds a key "title" and an associated value which is pasted here and all spaces are replaced by   If the key is not present, an informative HTML comment will be inserted. -{% endcomment %} +{%- endcomment -%} -{% assign person = include.person %} -{% if person %} - {% if person.title %} +{%- assign person = include.person -%} +{%- if person -%} + {%- if person.title -%} <span class="title"> {{ person.title | replace: " ", " " }} </span> - {% else %} + {%- else -%} <!-- NOTE: team_card/title.html was included, but person.title was not defined --> - {% endif %} -{% else %} + {%- endif -%} +{%- else -%} <!-- WARNING: team_card/title.html was included, but no person object was defined --> -{% endif %} +{%- endif -%} diff --git a/_layouts/roadmap.html b/_layouts/roadmap.html index 7cf50bc315f9ade7e5a2129c5a7d7d9feaedaf15..111e643fd7053fc7482577518591aa574041079d 100644 --- a/_layouts/roadmap.html +++ b/_layouts/roadmap.html @@ -21,7 +21,7 @@ {% if newyear != year %} {% assign year = newyear %} - <h1>{{ newyear }}</h1> + <h1 class="text-center">{{ newyear }}</h1> {% endif %} <div class="roadmap-month"> diff --git a/_layouts/team.html b/_layouts/team.html index ae48e91831223bb8d8e8efa60ee0633a48703b01..8d30c3f99c5eddbce8d2106c65d92fc7442af285 100644 --- a/_layouts/team.html +++ b/_layouts/team.html @@ -1,51 +1,33 @@ +{%- comment -%} +This page uses _data/hifis_team.yml to generate its content. +It does on purpose NOT include the content of the markdown page. +{%- endcomment -%} -{% comment %} - This page uses _data/hifis_team.yml to generate its content. - It does on purpose NOT include the content of the markdown page. -{% endcomment %} - -{% include top.html %} +{%- include top.html -%} <body> - {% include header.html %} + {%- include header.html -%} <main> - {% include title_image.html%} + {%- include title_image.html-%} - {% assign team_members_core = site.data.hifis_team - | where: "associate", false | sort: "name" %} - {% assign team_members_associate = site.data.hifis_team - | where: "associate", true | sort: "name" %} + {%- assign team_members_core = site.data.hifis_team + | where: "associate", false -%} <section> <article> <div> <h1>Team</h1> <div class="team_list"> - {% for person in team_members_core %} - {% include team_card.html person=person %} - {% endfor %} - </div> - </div> - </article> - </section> - - <section> - <article> - <div> - <h1>Associates</h1> - <div class="team_list"> - {% for person in team_members_associate %} - {% include team_card.html person=person %} - {% endfor %} + {%- for person in team_members_core -%} + {%- include team_card.html person=person -%} + {%- endfor -%} </div> </div> </article> </section> </main> - - {% include footer.html %} - + {%- include footer.html -%} </body> </html> diff --git a/_sass/profiles/_team-card-normal.scss b/_sass/profiles/_team-card-normal.scss index 0796a4631d20241de25eedf66c1256a41177be96..39aa3cf8a48c30c47a3d6266e7d757df7c043036 100644 --- a/_sass/profiles/_team-card-normal.scss +++ b/_sass/profiles/_team-card-normal.scss @@ -9,10 +9,7 @@ &:focus, &:hover { background-color: $color-header-light-gray; - - .name { - color: $color-helmholtz-blue; - } + color: $color-helmholtz-blue; } /* diff --git a/_sass/roadmap/_roadmap.scss b/_sass/roadmap/_roadmap.scss index f0fff52845de6cfe1fd3afa5d513c3e0c374991a..514c47aac3a4674925004d2133d10371e81174b9 100644 --- a/_sass/roadmap/_roadmap.scss +++ b/_sass/roadmap/_roadmap.scss @@ -103,7 +103,6 @@ section { @include font-bold; color: $color-helmholtz-blue; - text-align: center; } h2 { diff --git a/assets/img/members/Annette_Spicker.jpg b/assets/img/members/Annette_Spicker.jpg new file mode 100644 index 0000000000000000000000000000000000000000..004d5ba2e86d4e7e98c2abbfbf3a073e773252a2 Binary files /dev/null and b/assets/img/members/Annette_Spicker.jpg differ diff --git a/assets/img/members/Tobias_Huste.jpg b/assets/img/members/Tobias_Huste.jpg new file mode 100644 index 0000000000000000000000000000000000000000..26382e59a180e91fc76da612f82c670b91d3b688 Binary files /dev/null and b/assets/img/members/Tobias_Huste.jpg differ diff --git a/assets/img/members/Uwe_Jandt.jpg b/assets/img/members/Uwe_Jandt.jpg new file mode 100644 index 0000000000000000000000000000000000000000..577d2064f26524acd2a4f79119e4318dc42daa04 Binary files /dev/null and b/assets/img/members/Uwe_Jandt.jpg differ diff --git a/assets/img/members/Uwe_Konrad.jpg b/assets/img/members/Uwe_Konrad.jpg new file mode 100644 index 0000000000000000000000000000000000000000..2cff4e3ace1f58fdc66855ffe319c710090581b5 Binary files /dev/null and b/assets/img/members/Uwe_Konrad.jpg differ diff --git a/assets/img/members/Volker_Guelzow.jpg b/assets/img/members/Volker_Guelzow.jpg new file mode 100644 index 0000000000000000000000000000000000000000..f4007f3bc04da31563e23387fcf7a00b142f5d5d Binary files /dev/null and b/assets/img/members/Volker_Guelzow.jpg differ diff --git a/assets/img/members/anon_freepic.jpg b/assets/img/members/anon_freepic.jpg new file mode 100644 index 0000000000000000000000000000000000000000..5ecd91b4465eea832cc1dddb0538919b4fabe927 Binary files /dev/null and b/assets/img/members/anon_freepic.jpg differ diff --git a/team.md b/team.md new file mode 100644 index 0000000000000000000000000000000000000000..4de68ffbe932f30497a70cd2c09b8a009bf9e3dc --- /dev/null +++ b/team.md @@ -0,0 +1,11 @@ +--- +title: The Team +title_image: default +layout: team +excerpt: A list of HIFIS team members. +--- +{%- comment -%} + This markdown file triggers the generation of the team page. + Only the frontmatter is required by Jekyll. + The contents section does not get rendered into HTML on purpose. +{%- endcomment -%}