Skip to content

GitLab

Commit 1f74c3c1 authored by Ken Hawkins's avatar Ken Hawkins
Browse files

Implement multi-location jobs; update components 

As requested by HD HR (Jean-Paul).
parent 89e5c7df
Pipeline #152713 passed with stages
in 1 minute and 57 seconds
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 320 additions and 207 deletions
package.json
View file @ 1f74c3c1
......@@ -29,50 +29,50 @@
"@node-sass/node-module-importer": "1.2.3",
"@visual-framework/embl-breadcrumbs-lookup": "2.0.1",
"@visual-framework/embl-conditional-edit": "1.0.3",
"@visual-framework/embl-content-hub-loader": "1.0.8",
"@visual-framework/embl-content-hub-loader": "1.0.9",
"@visual-framework/embl-content-meta-properties": "1.0.1",
"@visual-framework/embl-favicon": "1.0.2",
"@visual-framework/embl-grid": "2.1.2",
"@visual-framework/embl-logo": "1.1.0",
"@visual-framework/embl-notifications": "1.0.1",
"@visual-framework/embl-notifications": "1.0.2",
"@visual-framework/vf-analytics-google": "1.0.3",
"@visual-framework/vf-banner": "1.7.1",
"@visual-framework/vf-body": "1.1.0",
"@visual-framework/vf-body": "1.2.0",
"@visual-framework/vf-box": "2.3.1",
"@visual-framework/vf-breadcrumbs": "2.0.3",
"@visual-framework/vf-card": "2.5.4",
"@visual-framework/vf-card": "2.5.5",
"@visual-framework/vf-card-container": "3.1.2",
"@visual-framework/vf-cluster": "1.0.2",
"@visual-framework/vf-code-example": "1.2.1",
"@visual-framework/vf-config": "1.0.1-alpha.0",
"@visual-framework/vf-content": "1.4.2",
"@visual-framework/vf-core": "2.2.20",
"@visual-framework/vf-design-tokens": "3.4.0",
"@visual-framework/vf-content": "1.5.2",
"@visual-framework/vf-core": "2.2.23",
"@visual-framework/vf-design-tokens": "3.4.1",
"@visual-framework/vf-divider": "2.0.0",
"@visual-framework/vf-extensions": "1.0.0-rc.1",
"@visual-framework/vf-favicon": "1.0.2",
"@visual-framework/vf-font-plex-mono": "1.1.1",
"@visual-framework/vf-font-plex-sans": "1.1.1",
"@visual-framework/vf-footer": "1.1.1",
"@visual-framework/vf-form__core": "1.1.0",
"@visual-framework/vf-form__core": "1.1.2",
"@visual-framework/vf-global-header": "3.1.1",
"@visual-framework/vf-grid": "1.4.1",
"@visual-framework/vf-header": "2.0.2",
"@visual-framework/vf-heading": "1.0.1",
"@visual-framework/vf-hero": "3.2.0",
"@visual-framework/vf-hero": "3.2.2",
"@visual-framework/vf-intro": "1.4.7",
"@visual-framework/vf-lede": "1.0.1",
"@visual-framework/vf-link": "2.0.0",
"@visual-framework/vf-link-list": "1.3.4",
"@visual-framework/vf-logo": "1.5.1",
"@visual-framework/vf-navigation": "2.2.2",
"@visual-framework/vf-navigation": "3.0.0-beta.1",
"@visual-framework/vf-no-js": "1.0.1",
"@visual-framework/vf-polyfill-js": "1.0.0-alpha.1",
"@visual-framework/vf-sass-config": "2.5.0",
"@visual-framework/vf-sass-config": "2.5.3",
"@visual-framework/vf-sass-utilities": "1.0.1",
"@visual-framework/vf-search": "2.0.0",
"@visual-framework/vf-section-header": "1.3.3",
"@visual-framework/vf-stack": "2.1.0",
"@visual-framework/vf-stack": "2.1.1",
"@visual-framework/vf-summary": "1.4.2",
"@visual-framework/vf-summary-container": "1.0.0",
"@visual-framework/vf-tabs": "1.2.1",
......@@ -94,6 +94,6 @@
"homepage": "https://github.com/visual-framework/vf-eleventy#readme",
"keywords": [],
"devDependencies": {
"@visual-framework/ebi-header-footer": "2.0.0"
"@visual-framework/ebi-header-footer": "2.0.2"
}
}
src/site/_includes/cards-ebi.njk
View file @ 1f74c3c1
......@@ -2,7 +2,7 @@
<div class="vf-card-container__inner">
{#- For some reason multiple render/includes aren't working in some contexts in this template ... #}
<article class="vf-card vf-card--brand vf-card--bordered">
<img src="https://acxngcvroo.cloudimg.io/v7/https://www.embl.org/files/wp-content/uploads/ebi-jobs-campus-south-building.jpg" alt="Aerial image of EMBL-EBI South building on campus" class="vf-card__image" loading="lazy">
<img src="https://acxngcvroo.cloudimg.io/v7/https://www.embl.org/files/wp-content/uploads/ebi-jobs-campus-south-building.jpg?w=500&h=300&func=crop" alt="Aerial image of EMBL-EBI South building on campus" class="vf-card__image" loading="lazy">
<div class="vf-card__content | vf-stack vf-stack--400">
<h3 class="vf-card__heading"><a class="vf-card__link" href="//www.ebi.ac.uk/about/jobs/career-profiles">Life at EMBL-EBI<svg aria-hidden="true" class="vf-card__heading__icon | vf-icon vf-icon-arrow--inline-end" width="1em" height="1em" xmlns="http://www.w3.org/2000/svg">
<path d="M0 12c0 6.627 5.373 12 12 12s12-5.373 12-12S18.627 0 12 0C5.376.008.008 5.376 0 12zm13.707-5.209l4.5 4.5a1 1 0 010 1.414l-4.5 4.5a1 1 0 01-1.414-1.414l2.366-2.367a.25.25 0 00-.177-.424H6a1 1 0 010-2h8.482a.25.25 0 00.177-.427l-2.366-2.368a1 1 0 011.414-1.414z" fill="currentColor" fill-rule="nonzero"></path>
......@@ -13,7 +13,7 @@
</div>
</article>
<article class="vf-card vf-card--brand vf-card--bordered">
<img src="https://acxngcvroo.cloudimg.io/v7/https://www.embl.org/files/wp-content/uploads/ebi-jobs-staff-benefits.jpg" alt="EMBL-EBI staff member sitting on campus with a coffee" class="vf-card__image" loading="lazy">
<img src="https://acxngcvroo.cloudimg.io/v7/https://wwwdev.ebi.ac.uk/sites/ebi.ac.uk/files/styles/large/public/groups/external_relations/images/Events/all-at-ebi_stepping_down_EBI.jpg?w=500&h=300&func=crop" alt="EMBL-EBI staff members" class="vf-card__image" loading="lazy">
<div class="vf-card__content | vf-stack vf-stack--400">
<h3 class="vf-card__heading"><a class="vf-card__link" href="//www.ebi.ac.uk/about/jobs/benefits">Employee benefits <svg aria-hidden="true" class="vf-card__heading__icon | vf-icon vf-icon-arrow--inline-end" width="1em" height="1em" xmlns="http://www.w3.org/2000/svg">
<path d="M0 12c0 6.627 5.373 12 12 12s12-5.373 12-12S18.627 0 12 0C5.376.008.008 5.376 0 12zm13.707-5.209l4.5 4.5a1 1 0 010 1.414l-4.5 4.5a1 1 0 01-1.414-1.414l2.366-2.367a.25.25 0 00-.177-.424H6a1 1 0 010-2h8.482a.25.25 0 00.177-.427l-2.366-2.368a1 1 0 011.414-1.414z" fill="currentColor" fill-rule="nonzero"></path>
......
src/site/_includes/filter/job-location.njk
View file @ 1f74c3c1
......@@ -21,6 +21,13 @@
{% elseif key | makeLowercase in job.field_jobs_duty_station | makeLowercase %}
{% set counter = counter + 1 %}
{% endif -%}
{% if job.field_jobs_duty_station | striptags == "All EMBL Sites (Germany, UK, France, Italy, Spain)" %}
{# If all duty stations, count for all #}
{% if key != 'rome' and key != 'EMBO' %}
{# Except for rome, because that's what HR said #}
{% set counter = counter + 1 %}
{% endif %}
{% endif %}
{% endfor -%}
<div class="vf-form__item vf-form__item--checkbox">
......
src/site/index.njk
View file @ 1f74c3c1
......@@ -221,9 +221,19 @@ body .vf-hero {
{% else %}
in <span class="jplist-duty-station">{{ job.field_jobs_duty_station | striptags }}</span>
{% endif %}
{% if job.field_jobs_duty_station | striptags == "All EMBL Sites (Germany, UK, France, Italy, Spain)" %}
{# If all duty stations, count for all #}
{% if key != 'rome' and key != 'EMBO' %}
{# Except for rome, because that's what HR said #}
<span class="jplist-duty-station">barcelona</span>
<span class="jplist-duty-station">grenoble</span>
<span class="jplist-duty-station">hamburg</span>
<span class="jplist-duty-station">heidelberg</span>
<span class="jplist-duty-station">hinxton</span>
{% endif %}
{% endif %}
</p>
{# Hidden fields for data sorting #}
<div class="vf-u-display-none | used-for-filtering">
<span class="jplist-event-time">
......
yarn.lock
View file @ 1f74c3c1
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment