Skip to content

GitLab

Commit 6d24028d authored by Jacek Lebioda's avatar Jacek Lebioda
Browse files

Merge branch 'jekyll-4.0' into 'develop' 

Jekyll 4.0

See merge request !2
parents 18581c50 963c179b
Hide whitespace changes
Inline Side-by-side
Showing with 53 additions and 54 deletions
_includes/footer.html
View file @ 6d24028d
......@@ -2,48 +2,48 @@
<div id="site-footer-primary-wrapper" class="margin-wrapper flex">
<div>
<h3>
<a href="{{ site.baseurl }}/about-node/">About the Node</a>
<a href="{{ '/about-node/' | relative_url }}">About the Node</a>
</h3>
<ul>
<li><a href="{{ site.baseurl }}/about-node/team">Team</a></li>
<li><a href="{{ site.baseurl }}/about-node/collaborations">Collaborations</a></li>
<li><a href="{{ site.baseurl }}/about-node/funding-and-governance">Funding and governance</a></li>
<li><a href="{{ site.baseurl }}/about-node/vacancies">Vacancies</a></li>
<li><a href="{{ site.baseurl }}/contact">Contact</a></li>
<li><a href="{{ '/about-node/team' | relative_url }}">Team</a></li>
<li><a href="{{ '/about-node/collaborations' | relative_url }}">Collaborations</a></li>
<li><a href="{{ '/about-node/funding-and-governance' | relative_url }}">Funding and governance</a></li>
<li><a href="{{ '/about-node/vacancies' | relative_url }}">Vacancies</a></li>
<li><a href="{{ '/contact' | relative_url }}">Contact</a></li>
</ul>
</div>
<div>
<h3>
<a href="{{ site.baseurl }}/services/">Services</a>
<a href="{{ '/services/' | relative_url }}">Services</a>
</h3>
<ul>
<li><a href="{{ site.baseurl }}/sustainability-data/">Sustainability of data</a></li>
<li><a href="{{ site.baseurl }}/sustainability-tools/">Sustainability of tools</a></li>
<li><a href="{{ site.baseurl }}/gdpr-activities/">GDPR activities</a></li>
<li><a href="{{ site.baseurl }}/data-information-system-daisy/">DAISY</a></li>
<li><a href="{{ '/sustainability-data/' | relative_url }}">Sustainability of data</a></li>
<li><a href="{{ '/sustainability-tools/' | relative_url }}">Sustainability of tools</a></li>
<li><a href="{{ '/gdpr-activities/' | relative_url }}">GDPR activities</a></li>
<li><a href="{{ '/data-information-system-daisy/' | relative_url }}">DAISY</a></li>
</ul>
</div>
<div>
<h3>
<a href="{{ site.baseurl }}/events/">Events</a>
<a href="{{ '/events/' | relative_url }}">Events</a>
</h3>
<ul>
<li><a href="{{ site.baseurl }}/events/workshops_and_courses">Workshops and courses</a></li>
<li><a href="{{ site.baseurl }}/events/meetings_and_conferences">Meetings and conferences</a></li>
<li><a href="{{ '/events/workshops_and_courses' | relative_url }}">Workshops and courses</a></li>
<li><a href="{{ '/events/meetings_and_conferences' | relative_url }}">Meetings and conferences</a></li>
</ul>
</div>
<div>
<h3>
<a href="{{ site.baseurl }}/privacy/">Privacy</a>
<a href="{{ '/privacy/' | relative_url }}">Privacy</a>
</h3>
<ul>
<li><a href="{{ site.baseurl }}/privacy/cookies">Cookies</a></li>
<li><a href="{{ site.baseurl }}/privacy/terms_of_use">Terms of use</a></li>
<li><a href="{{ '/privacy/cookies' | relative_url }}">Cookies</a></li>
<li><a href="{{ '/privacy/terms_of_use' | relative_url }}">Terms of use</a></li>
</ul>
</div>
<div>
<a href="http://www.elixir-europe.org" title="ELIXIR Europe's web site">
<img src="https://elixir-europe.org/system/files/white-orange-logo.png" alt="Elixir logo" width="150px" class="site-footer-primary-logo" />
<img src="{{ 'assets/ELIXIR_EU.png' | relative_url }}" title="ELIXIR Europe logo" alt="ELIXIR Europe logo" width="150px" class="site-footer-primary-logo" />
</a>
</div>
</div>
......
_includes/header.html
View file @ 6d24028d
<header id="site-header" role="banner" aria-label="Site header">
<div id="site-header-wrapper" class="margin-wrapper body-wrapper">
<a href="{{ site.baseurl }}/" class="elixir-image">
<img src="{{ site.baseurl }}/assets/ELIXIR_LU.png" title="ELIXIR LU logo" alt="ELIXIR LU logo" />
<a href="{{ '/' | relative_url }}" class="elixir-image">
<img src="{{ 'assets/ELIXIR_LU.png' | relative_url }}" title="ELIXIR LU logo" alt="ELIXIR LU logo" />
</a>
<div class="hamburger">
<input type="checkbox" />
<ul>
<li><a {% if page.layout == 'index' %} class="active" {% endif %} href="{{ site.baseurl }}/">Home</a></li>
<li><a {% if page.section == 'About' %} class="active" {% endif %} href="{{ site.baseurl }}/about-node">About</a></li>
<li><a {% if page.section == 'Services' %} class="active" {% endif %} href="{{ site.baseurl }}/services">Services</a></li>
<li><a {% if page.section == 'Training' %} class="active" {% endif %} href="{{ site.baseurl }}/training">Training</a></li>
<li><a {% if page.section == 'Events' %} class="active" {% endif %} href="{{ site.baseurl }}/events">Events</a></li>
<li><a {% if page.section == 'News' %} class="active" {% endif %} href="{{ site.baseurl }}/news">News</a></li>
<li><a {% if page.section == 'Contact' %} class="active" {% endif-%} href="{{ site.baseurl }}/contact">Contact</a></li>
<li><a {% if page.section == 'Search' %} class="active" {% endif-%} href="{{ site.baseurl }}/search">Search</a></li>
<li><a {% if page.layout == 'index' %} class="active" {% endif %} href="{{ '/' | relative_url }}">Home</a></li>
<li><a {% if page.section == 'About' %} class="active" {% endif %} href="{{ '/about-node' | relative_url }}">About</a></li>
<li><a {% if page.section == 'Services' %} class="active" {% endif %} href="{{ '/services' | relative_url }}">Services</a></li>
<li><a {% if page.section == 'Training' %} class="active" {% endif %} href="{{ '/training' | relative_url }}">Training</a></li>
<li><a {% if page.section == 'Events' %} class="active" {% endif %} href="{{ '/events' | relative_url }}">Events</a></li>
<li><a {% if page.section == 'News' %} class="active" {% endif %} href="{{ '/news' | relative_url }}">News</a></li>
<li><a {% if page.section == 'Contact' %} class="active" {% endif-%} href="{{ '/contact' | relative_url }}">Contact</a></li>
<li><a {% if page.section == 'Search' %} class="active" {% endif-%} href="{{ '/search' | relative_url }}">Search</a></li>
</ul>
</div>
</div>
......
_layouts/index.html
View file @ 6d24028d
......@@ -22,7 +22,7 @@ layout: default
{% if page.introduction_photo %}
<div class="index-photo">
<img src="{{ page.introduction_photo }}" alt="Elixir Luxembourg" />
<img src="{{ '/assets/cover.jpg' | relative_url }}" alt="Elixir Luxembourg" />
</div>
{% endif %}
</div>
......@@ -31,21 +31,21 @@ layout: default
<div class="index-flex">
<div class="index-box">
<img src="{{ site.baseurl }}/assets/buttons/index_events.jpg" alt="Events image" />
<img src="{{ '/assets/buttons/index_events.jpg' | relative_url }}" alt="Events image" />
<div class="index-box-caption">
<a href="{{ site.baseurl }}/events/">Events</a>
<a href="{{ '/events/' | relative_url }}">Events</a>
</div>
</div>
<div class="index-box">
<img src="{{ site.baseurl }}/assets/buttons/index_jobs.jpg" alt="Job vacancies image" />
<img src="{{ '/assets/buttons/index_jobs.jpg' | relative_url }}" alt="Job vacancies image" />
<div class="index-box-caption">
<a href="{{ site.baseurl }}/about-node/vacancies">Job vacancies</a>
<a href="{{ '/about-node/vacancies' | relative_url }}">Job vacancies</a>
</div>
</div>
<div class="index-box">
<img src="{{ site.baseurl }}/assets/buttons/index_flyer.jpg" alt="Flyer image" />
<img src="{{ '/assets/buttons/index_flyer.jpg' | relative_url }}" alt="Flyer image" />
<div class="index-box-caption">
<a href="https://webdav-r3lab.uni.lu/public/elixir/website/pdf/ELIXIR-LU_Flyer_VF.pdf">Download flyer</a>
</div>
......@@ -59,17 +59,17 @@ layout: default
{% for post in paginator.posts %}
<div class="post">
<a class="post-title" href="{{ site.baseurl }}{{ post.url }}">{{ post.title }}</a>
<a class="post-title" href="{{ post.url | relative_url }}">{{ post.title }}</a>
<br />
<span class="post-date">Published on: {{ post.date | date: '%B %d, %Y' }}</span>
<div class="content">
{{ post.content | truncate: 220 }} <a href="{{ site.baseurl }}{{ post.url }}">(read more)</a>
{{ post.content | truncate: 220 }} <a href="{{ post.url | relative_url }}">(read more)</a>
</div>
</div>
{% endfor %}
<h3><a href="{{ site.baseurl }}/news/">See more news...</a></h3>
<h3><a href="{{ '/news/' | relative_url }}">See more news...</a></h3>
{% endif %}
......
_layouts/left_col.html
View file @ 6d24028d
......@@ -8,7 +8,7 @@ layout: default
<h2>{{ page.section }}</h2>
<ul>
{% for link in page.pages %}
<li><a href="{{ site.baseurl }}{{ link.href }}" {% if link.active %}class="active"{% endif %}>{{ link.title }}</a></li>
<li><a href="{{ link.href | relative_url }}" {% if link.active %}class="active"{% endif %}>{{ link.title }}</a></li>
{% endfor %}
</ul>
</div>
......
_layouts/paginated.html
View file @ 6d24028d
......@@ -17,7 +17,7 @@ layout: default
{% for post in paginator.posts %}
<div class="post">
<a class="post-title" href="{{ site.baseurl }}{{ post.url }}">{{ post.title }}</a>
<a class="post-title" href="{{ post.url | relative_url }}">{{ post.title }}</a>
<span class="post-date">Published on: {{ post.date | date: '%B %d, %Y' }}</span>
......@@ -29,7 +29,7 @@ layout: default
<div class="pagination">
{% if paginator.previous_page %}
<a href="{{ site.baseurl }}{{ paginator.previous_page_path }}" class="previous">
<a href="{{ paginator.previous_page_path | relative_url }}" class="previous">
Previous
</a>
{% endif %}
......@@ -39,7 +39,7 @@ layout: default
</span>
{% if paginator.next_page %}
<a href="{{ site.baseurl }}{{ paginator.next_page_path }}" class="next">Next</a>
<a href="{{ paginator.next_page_path | relative_url }}" class="next">Next</a>
{% endif %}
</div>
</div>
......
_layouts/paginated_left_col.html
View file @ 6d24028d
......@@ -8,7 +8,7 @@ layout: default
<h2>{{ page.section }}</h2>
<ul>
{% for link in page.pages %}
<li><a href="{{ site.baseurl }}{{ link.href }}" {% if link.active %}class="active"{% endif %}>{{ link.title }}</a></li>
<li><a href="{{ link.href | relative_url }}" {% if link.active %}class="active"{% endif %}>{{ link.title }}</a></li>
{% endfor %}
</ul>
</div>
......@@ -23,7 +23,7 @@ layout: default
{% for post in paginator.posts %}
<div class="post">
<a class="post-title" href="{{ site.baseurl }}{{ post.url }}">{{ post.title }}</a>
<a class="post-title" href="{{ post.url | relative_url }}">{{ post.title }}</a>
<span class="post-date">Published on: {{ post.date | date: '%B %d, %Y' }}</span>
......@@ -35,7 +35,7 @@ layout: default
<div class="pagination">
{% if paginator.previous_page %}
<a href="{{ site.baseurl }}{{ paginator.previous_page_path }}" class="previous">
<a href="{{ paginator.previous_page_path | relative_url }}" class="previous">
Previous
</a>
{% endif %}
......@@ -45,7 +45,7 @@ layout: default
</span>
{% if paginator.next_page %}
<a href="{{ site.baseurl }}{{ paginator.next_page_path }}" class="next">Next</a>
<a href="{{ paginator.next_page_path | relative_url }}" class="next">Next</a>
{% endif %}
</div>
</div>
......
_layouts/post.html
View file @ 6d24028d
......@@ -7,7 +7,7 @@ layout: default
<h2>{{ page.section }}</h2>
<ul>
{% for link in page.news_pages %}
<li><a href="{{ site.baseurl }}{{ link.href }}" {% if link.active %}class="active" {% endif %}>{{ link.title }}</a></li>
<li><a href="{{ link.href | relative_url }}" {% if link.active %}class="active" {% endif %}>{{ link.title }}</a></li>
{% endfor %}
</ul>
</div>
......@@ -23,7 +23,7 @@ layout: default
{{ content }}
<span class="pull-right">
<a href="{{site.baseurl}}/news">Go back to the news</a>
<a href="{{ '/news' | relative_url }}">Go back to the news</a>
</span>
</div>
</article>
elixir-theme.gemspec
View file @ 6d24028d
......@@ -2,7 +2,7 @@
Gem::Specification.new do |spec|
spec.name = "jekyll-elixir-theme"
spec.version = "0.7.6"
spec.version = "0.8.4"
spec.authors = ["jacek.lebioda"]
spec.email = ["jacek.lebioda@uni.lu"]
......@@ -12,8 +12,8 @@ Gem::Specification.new do |spec|
spec.files = `git ls-files -z`.split("\x0").select { |f| f.match(%r!^(assets|_layouts|_includes|_sass|LICENSE|README)!i) }
spec.add_runtime_dependency "jekyll", "~> 3.8"
spec.add_runtime_dependency "jekyll", "~> 4.0"
spec.add_development_dependency "bundler", "~> 1.16"
spec.add_development_dependency "bundler", "~> 2.0"
spec.add_development_dependency "rake", "~> 12.0"
end
index.md
View file @ 6d24028d
......@@ -7,7 +7,6 @@ introduction: >-
<p>ELIXIR-LU, the Luxembourgish node of ELIXIR, the European infrastructure for life science information, focuses on long-term sustainability of tools and data for Translational Medicine.</p>
<p>Translational Medicine data integrate clinical information with molecular and cellular data for a better understanding of diseases.</p>
<p>ELIXIR-LU aims to facilitate long-term access to those research data and to tools for scientists in both academia and industry. This will allow the reuse of previously generated data to address new research questions and dramatically save time and cost.</p>
introduction_photo: https://elixir-luxembourg.org/sites/default/files/National%20stakeholders_Pic_1.jpg
---
......@@ -31,6 +30,6 @@ Workshops and courses on data management, curation, analytics and visualisation.
---
[![Data Catalog]({{site.baseurl}}/assets/buttons/data_catalog.jpg){:width="155px"}]({{site.baseurl}}/sustainability-data/)
[![Tools Registry]({{site.baseurl}}/assets/buttons/tools_registry.jpg){:width="155px"}]({{site.baseurl}}/sustainability-tools/)
[![GDPR activities]({{site.baseurl}}/assets/buttons/gdpr.jpg){:width="155px"}]({{site.baseurl}}/gdpr-activities/)
[![Data Catalog]({{ '/assets/buttons/data_catalog.jpg' | relative_url }}){:width="155px"}]({{ '/sustainability-data/' | relative_url }})
[![Tools Registry]({{ '/assets/buttons/tools_registry.jpg' | relative_url }}){:width="155px"}]({{ '/sustainability-tools/' | relative_url }})
[![GDPR activities]({{ '/assets/buttons/gdpr.jpg' | relative_url }}){:width="155px"}]({{ '/gdpr-activities/' | relative_url }})
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