elixir-toolkit-theme 1.16.0 → 1.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e594bc835007894473c6ddf99303cb504e9185fc6941e9c623dffeaf7fcca1fe
-  data.tar.gz: fcaedf30964ced54fb8e46a052fc051ce60e636f0b74589bc8d321a38b9d655b
+  metadata.gz: 8974445df1cfdf69a5a0bc624bebace7dc8dd1d3865d28001b6098be12dd4d48
+  data.tar.gz: 4aa16186b7890329f81bd5766e042e1b098c3f7c438061ffed2e49bd9278c568
 SHA512:
-  metadata.gz: 385835a9201de2cf2d7dac08ec02b2811cb3b3d35cc42c28c350aab5f5366f5406fc8493dbf0371eeaa42fe2d3a2aa24f627a5a1a94f65fb7a439fbaf10d42cd
-  data.tar.gz: f8b225c028e67571f9e4df65a1038911650a63f20be7feeefaa36f3e3158481ed3bd5d89790954b7c9166507cfc3e4eaa3c49fb8c7e206e0df727d1f37830119
+  metadata.gz: fc9d21cbe26bf4978d51009ccb97b8ccc9701c2ed3adc6abd087d99c3600c792a109cbccc333dec8ae6ef75cd8f9946f2507e20421a1987d3c8d7c24ccd41b96
+  data.tar.gz: b9043913369071d3ec4eb0dbebec2ef01d07bae10dd0d78c9bd92c156e4b65b91a6104b4deb2ad1d01bcfbd03867a5a66cc9d113430381e5560688c675167f1d

data/README.md

@@ -23,13 +23,16 @@ Its key features:
 
 ## Installation
 
-### via GitHub Pages remote theme
+### via GitHub Pages remote theme (installation free!)
 
-The quickiest way to use Just The Docs is to use GitHub pages [remote theme](https://blog.github.com/2017-11-29-use-any-theme-with-github-pages/) feature in your `config.yml` file:
+The quickest way to use the elixir-toolkit-theme is to use the GitHub pages [remote theme](https://blog.github.com/2017-11-29-use-any-theme-with-github-pages/) feature in your `config.yml` file:
 
 ```yaml
 remote_theme: ELIXIR-Belgium/elixir-toolkit-theme
 ```
+
+It also allows you to use a specific version of the theme by add `@X.X.X` to make sure your website keeps working iif breaking changes get introduced.
+
 ### via RubyGems:
 
 Alternatively you can install it as a Ruby Gem (preferred way if you use GitLab).
@@ -96,7 +99,7 @@ docker run -it --rm -p [::1]:4000:4000 -v $PWD:/srv/jekyll jekyll/jekyll:latest
 
 This will start the docker container and serve the website locally. Make sure the `.\_site` is not yet created to avoid permission errors.
 
-## This theme is known to be used in:
+## This theme is known to be used in
 
 - [RDMkit](https://rdmkit.elixir-europe.org/)
 - [WorkflowHub project](https://about.workflowhub.eu/)

data/_includes/events.html

@@ -1,5 +1,5 @@
 <div class="events {{include.event_type}}s">
-  {%- if include.title == "true" %}
+  {%- if include.title == true%}
   <h2>{{include.event_type | replace: "_", " " | capitalize}}s</h2>
   {%- endif %}
   {%- assign events = site.data.events %}
@@ -16,7 +16,7 @@
       {%- endif %}
       {%- if event.description %}
       {%- assign word_count = event.description | split: " " | size %}
-      {%- if include.truncate == "true" and  word_count > 40 %}
+      {%- if include.truncate == true and word_count > 40 %}
       <p class="mb-0"><a data-bs-toggle="collapse" href="#collapse-{{count}}" role="button" aria-expanded="false" aria-controls="collapse-{{count}}">
         View description
       </a>
@@ -32,7 +32,7 @@
     {%- assign count = count | plus: 1 %}
     {%- endfor %}
   </ul>
-  {%- if include.caption == "true" %}
+  {%- if include.caption == true%}
   <small>An overview of all our events can be fount on the <a href="{{'/events' | relative_url}}">events page</a>.</small>
   {%- endif %}
 </div>

data/_includes/head.html

@@ -6,9 +6,17 @@
     {%- capture keywords %}
     {%- if page.related_pages %}
     {%- for section in page.related_pages %}
-    {%- unless section[1] == nil %}{{ section[1] | join: ', ' }}
-    {%- endunless %}
+    {%- unless section[1].size == 0 %}
+    {%- for keywordstr in section[1] %}
+    {%- assign keywordpage = site.pages | where: "page_id", keywordstr | first  %}
+    {%- if allkeywords %}
+    {%- assign allkeywords = allkeywords | append: ", " | append: keywordstr | append: ", " | append: keywordpage.title %}
+    {%- else %}
+    {%- assign allkeywords = allkeywords | append: keywordstr | append: ", " | append: keywordpage.title %}
+    {%- endif %}
     {%- endfor %}
+    {%- endunless %}
+    {%- endfor %}{{allkeywords}}
     {%- endif %}
     {%- endcapture %}
     <meta name="keywords" content="{{keywords}}">
@@ -46,7 +54,6 @@
     <script src="{{ 'assets/js/anchor.min.js' | relative_url }}"></script>
     <script src="{{ 'assets/js/toc.js' | relative_url }}"></script>
     <script src="{{ 'assets/js/jquery.navgoco.js' | relative_url }}"></script>
-    <script src="{{ 'assets/js/jquery.cookie.min.js' | relative_url }}"></script>
     <script src="{{ 'assets/js/main.js' | relative_url }}"></script>
     <script src="{{ 'assets/js/search.js' | relative_url }}"></script>
     {%- if page.datatable == true %}

data/_includes/image.html

@@ -13,7 +13,7 @@
     {%- endif %}
     {%- if include.caption %}
     <figcaption class="figure-caption">
-    {{include.caption}}
+    {{ include.caption | markdownify }}
     </figcaption>
     {%- endif %}
 {%- if include.inline != true %}

data/_includes/more-information-tiles.html

@@ -17,13 +17,13 @@
                                 <div class="col-2 d-flex align-items-center justify-content-center">
                                     {%- assign registry = training.registry |  downcase %}
                                     {%- if registry  == "tess" %}
-                                    <img alt="TeSS logo" class="img-fluid" src="assets/img/tess_logo.svg">
+                                    <img alt="TeSS logo" class="img-fluid" src="{{ 'assets/img/tess_logo.svg' | relative_url }}">
                                     {%- elsif registry == "zenodo" %}
-                                    <img alt="Zenodo logo" class="img-fluid" src="assets/img/zenodo_logo.svg">
+                                    <img alt="Zenodo logo" class="img-fluid" src="{{ 'assets/img/zenodo_logo.svg' | relative_url }}">
                                     {%- elsif registry == "youtube" %}
-                                    <img alt="Youtube logo" class="img-fluid" src="assets/img/youtube_logo.svg">
+                                    <img alt="Youtube logo" class="img-fluid" src="{{ 'assets/img/youtube_logo.svg' | relative_url }}">
                                     {%- elsif registry == "carpentries" %}
-                                    <img alt="Carpentries" class="img-fluid" src="assets/img/carpentries_logo.svg">
+                                    <img alt="Carpentries" class="img-fluid" src="{{ 'assets/img/carpentries_logo.svg' | relative_url }}">
                                     {%- else %}
                                     <i class="fa-solid fa-external-link-alt text-primary fs-5"></i>
                                     {%- endif %}
@@ -53,7 +53,7 @@
                         <a class="btn bg-white hover-primary text-start" data-bs-toggle="tooltip" data-bs-placement="right" title="FAIRCookbook" href="{{ recipe.url }}">
                             <div class="row g-1">
                                 <div class="col-2 d-flex align-items-center justify-content-center">
-                                    <img alt="FAIRCookbook logo" class="img-fluid" src="assets/img/fairplus_compact_logo.svg">
+                                    <img alt="FAIRCookbook logo" class="img-fluid" src="{{ 'assets/img/fairplus_compact_logo.svg' | relative_url }}">
                                 </div>
                                 <div class="col-10 d-flex align-items-center">
                                     <span class="text-start">Step-by-step process for: {{recipe.name}}</span>
@@ -69,7 +69,7 @@
                         <a class="btn bg-white hover-primary text-start" data-bs-toggle="tooltip" data-bs-placement="right" title="DSW" href="{{ site.dsw_deep_link_prefix | append: question.uuid }}">
                             <div class="row g-1">
                                 <div class="col-2 d-flex align-items-center justify-content-center">
-                                    <img alt="DSW logo" class="img-fluid" src="assets/img/dsw_compact_logo.svg">
+                                    <img alt="DSW logo" class="img-fluid" src="{{ 'assets/img/dsw_compact_logo.svg' | relative_url }}">
                                 </div>
                                 <div class="col-10 d-flex align-items-center">
                                     <span class="text-start">Support for DMP on: {{question.name}}</span>
@@ -85,7 +85,7 @@
                         <a class="btn bg-white hover-primary text-start" data-bs-toggle="tooltip" data-bs-placement="right" title="FAIRsharing" href="{{ standard.url }}">
                             <div class="row g-1">
                                 <div class="col-2 d-flex align-items-center justify-content-center">
-                                    <img alt="FAIRsharing logo" class="img-fluid" src="assets/img/fairsharing_compact_logo.svg">
+                                    <img alt="FAIRsharing logo" class="img-fluid" src="{{ 'assets/img/fairsharing_compact_logo.svg' | relative_url }}">
                                 </div>
                                 <div class="col-10 d-flex align-items-center">
                                     <span class="text-start">FAIRsharing collection about: {{standard.name}}</span>
@@ -101,7 +101,7 @@
                         <a class="btn bg-white hover-primary text-start" data-bs-toggle="tooltip" data-bs-placement="right" title="RDMkit" href="{{ rdmdoc.url }}">
                             <div class="row g-1">
                                 <div class="col-2 d-flex align-items-center justify-content-center">
-                                    <img alt="RDMkit logo" class="img-fluid" src="assets/img/rdmkit_compact_logo.svg">
+                                    <img alt="RDMkit logo" class="img-fluid" src="{{ 'assets/img/rdmkit_compact_logo.svg' | relative_url }}">
                                 </div>
                                 <div class="col-10 d-flex align-items-center">
                                     <span class="text-start">Data management guidelines on: {{rdmdoc.name}}</span>

data/_includes/news.html

@@ -1,8 +1,8 @@
 <div class="news">
-  {%- if include.title == "true" %}
-  <h2>Whats new?</h2>
+  {%- if include.title == true %}
+  <h2>What's new?</h2>
   {%- endif %}
-  {%- assign news = site.data.news | sort: "date"%}
+  {%- assign news = site.data.news | sort: "date" %}
   {%- assign count = 0 %}
   <ul class="list-unstyled mt-3">
     {%- for new in news reversed%}
@@ -11,7 +11,7 @@
       <p class="text-muted"><i class="far fa-calendar me-2"></i><time>{{ new.date | date_to_long_string }}</time>{% if new.linked_pr %}<b> - </b><i class="fa-solid fa-code-branch"></i><a href="{{ site.github.repository_url | append: '/pull/' | append: new.linked_pr }}">{{new.linked_pr }}</a>{% endif %}</p>
       {%- if new.description %}
       {%- assign word_count = new.description | split: " " | size %}
-      {%- if include.truncate == "true" and  word_count > 40 %}
+      {%- if include.truncate == true and word_count > 40 %}
       <p class="mb-0"><a data-bs-toggle="collapse" href="#collapse-{{count}}" role="button" aria-expanded="false" aria-controls="collapse-{{count}}">
         View description
       </a>
@@ -30,7 +30,7 @@
     {%- endif %}
     {%- endfor %}
   </ul>
-  {%- if include.caption == "true" %}
+  {%- if include.caption == true %}
   <small>For more news please visit our <a href="{{ '/news' | relative_url }}">news page</a>.</small>
   {%- endif %}
 </div>

data/_includes/related-pages.html

@@ -23,7 +23,7 @@
                     {%- assign metadata = section_pages | where:"page_id", page_id %}
                     {%- for page_hit in metadata %}
                     <li class="d-grid">
-                        <a class="btn bg-white hover-primary text-start" href="{{ page_hit.url | relative_url }}"><span>{{page_hit.title}}{% if page_hit.description %}</span><br><small class="text-muted">{{ page_hit.description | capitalize }}</small>{% endif %}</a>
+                        <a class="btn bg-white hover-primary text-start" href="{{ page_hit.url | relative_url }}"><span>{{page_hit.title}}{% if page_hit.description %}</span><br><small class="text-muted">{{ page_hit.description }}</small>{% endif %}</a>
                     </li>
                     {%- endfor %}
                     {%- endfor %}

data/_includes/resource-table-all.html

@@ -1,12 +1,12 @@
 {%- assign tools = site.data.tool_and_resource_list | where:"related_pages", include.tag %}
-{%- assign country_pages = site.pages | where_exp: "item", "item.search_exclude != true" | where_exp:"item","item.resources != nil" %}
+{%- assign country_pages = site.pages | where_exp: "item", "item.search_exclude != true" | where_exp:"item","item.national_resources != nil" %}
 {%- unless tools.size == 0 %}
 {%- if include.tag %}
 <h2>Relevant tools and resources</h2>
 {%- endif %}
 <a class="visually-hidden-focusable" href='#skip-tool-table'>Skip tool table</a>
 <div class="table-responsive mt-4 mb-5">
-    <table id="tooltable" class="table display">
+    <table class="tooltable table display">
         <thead>
             <tr class="text-nowrap">
                 <th>Tool or resource {%- if include.tag -%}
@@ -26,12 +26,12 @@
         <tbody>
             {%- for tool in tools | sort %}
             <tr>
-                {%- assign total_county_tools = 0 %}
                 {%- assign instances_tool = 0 %}
+                {%- assign total_county_tools = 0 %}
                 {%- assign query = "related_pages." | append: page.type %}
                 {%- for country_page in country_pages %}
-                {%- assign instance_matches = country_page.resources | where: "instance_of", tool.name | where_exp:"resource","resource.related_pages != nil" | where: query, include.tag %}
-                {%- assign tool_matches = country_page.resources | where_exp:"resource","resource.related_pages != nil" | where: query, include.tag %}
+                {%- assign instance_matches = country_page.national_resources | where: "instance_of", tool.name | where_exp:"resource","resource.related_pages != nil" | where: query, include.tag %}
+                {%- assign tool_matches = country_page.national_resources | where_exp:"resource","resource.related_pages != nil" | where: query, include.tag %}
                 {%- unless tool_matches.size == 0 %}
                 {%- assign total_county_tools = total_county_tools | plus: tool_matches.size %}
                 {%- endunless %}
@@ -39,17 +39,27 @@
                 {%- assign instances_tool = instances_tool | plus: instance_matches.size %}
                 {%- endunless %}
                 {%- endfor %}
-                {% if tool.link %}
-                <td><a href="{{tool.link}}">{{tool.name}}</a></td>
+                {% if tool.url %}
+                <td><a href="{{tool.url}}">{{tool.name}}</a></td>
                 {%- else %}
                 <td>{{tool.name}}</td>
                 {%- endif %}
                 <td>{{tool.description}}
-                    {%- unless instances_tool == 0 or total_county_tools == 0 or include.tag == nil %}
-                    <a href="#national-resources-button" class="d-block mt-1">
-                        <span class="badge text-white bg-primary"><i class="fa-solid fa-arrow-circle-down me-2"></i>Different instances available</span>
-                    </a>
-                    {%- endunless %}
+                    {%- if instances_tool != 0 and total_county_tools != 0 and include.tag != nil or tool.instance_of or tool.how_to_access %}
+                    <div class="d-block mt-1">
+                        {%- if tool.instance_of %}
+                        <span class="d-inline-block" tabindex="0" data-bs-toggle="tooltip" title="This resource is an instance of {{tool.instance_of}}"><span class="badge text-primary border border-primary">{{tool.instance_of}}</span></span>
+                        {%- endif %}
+                        {%- if tool.how_to_access %}
+                        <span class="d-inline-block" tabindex="0" data-bs-toggle="tooltip" title="{{tool.how_to_access}}"><span class="badge text-primary border border-primary"> <i class="fa-solid fa-key"></i></span></span>
+                        {%- endif %}
+                        {%- unless instances_tool == 0 or total_county_tools == 0 or include.tag == nil %}    
+                        <a href="#national-resources-button">
+                            <span class="badge text-white bg-primary"><i class="fa-solid fa-arrow-circle-down me-2"></i>Different instances available</span>
+                        </a>
+                        {%- endunless %}
+                    </div>
+                    {%- endif %}
                 </td>
                 {%- capture related_pages %}
                 {%- for tag in tool.related_pages %}
@@ -84,9 +94,9 @@
             {%- assign hide_ids = "resource_title" %}
             {%- for country_page in country_pages %}
             {%- if include.tag %}
-            {%- assign tool_matches = country_page.resources| where_exp:"resource","resource.related_pages != nil" | where: query, include.tag %}
+            {%- assign tool_matches = country_page.national_resources| where_exp:"resource","resource.related_pages != nil" | where: query, include.tag %}
             {%- else %}
-            {%- assign tool_matches = country_page.resources %}
+            {%- assign tool_matches = country_page.national_resources %}
             {%- endif %}
             {%- for tool in tool_matches %}
             {%- assign tool_id = tool.name | slugify %}
@@ -110,7 +120,7 @@
                 {%- if tool.related_pages %}
                 {%- capture related_pages %}
                 {%- for section in tool.related_pages %}
-                {%- unless section.size == 0 %}
+                {%- unless section[1].size == 0 %}
                 {%- for tag in section[1] %}
                 {%- unless tag == page.page_id %}
                 {%- assign related_page = site.pages | where:"page_id",tag | first %}
@@ -124,7 +134,20 @@
                 {%- else %}
                 <td></td>
                 {%- endif %}
-                <td></td>
+                <td>
+                    {%- if tool.registry.biotools %}
+                    <a data-bs-toggle="tooltip" data-bs-original-title="Bio.tools" href="https://bio.tools/{{tool.registry.biotools}}"><span class="badge bg-dark text-white hover-primary"><i class="fa-solid fa-info me-2"></i>Tool info</span></a>
+                    {%- endif %}
+                    {%- if tool.registry.fairsharing %}
+                    <a data-bs-toggle="tooltip" data-bs-original-title="FAIRsharing" href="https://fairsharing.org/FAIRsharing.{{tool.registry.fairsharing}}"><span class="badge bg-dark text-white hover-primary"><i class="fa-solid fa-database me-2"></i>Standards/Databases</span></a>
+                    {%- endif %}
+                    {%- if tool.registry.fairsharing-coll %}
+                    <a data-bs-toggle="tooltip" data-bs-original-title="FAIRsharing collection" href="https://fairsharing.org/{{tool.registry.fairsharing-coll}}"><span class="badge bg-dark text-white hover-primary"><i class="fa-solid fa-database me-2"></i>Standards/Databases</span></a>
+                    {%- endif %}
+                    {%- if tool.registry.tess %}
+                    <a data-bs-toggle="tooltip" data-bs-original-title="TeSS" href="https://tess.elixir-europe.org/search?q={{tool.registry.tess}}"><span class="badge bg-dark text-white hover-primary"><i class="fa-solid fa-graduation-cap me-2"></i>Training</span></a>
+                    {%- endif %}
+                </td>
             </tr>
             {%- endfor %}
             {%- endfor %}

data/_includes/resource-table-page.html

@@ -1,14 +1,21 @@
-{%- if page.resources %}
-{%- assign tools = page.resources %}
-<h2>Relevant tools and resources</h2>
-<a class="visually-hidden-focusable" href='#skip-tool-table'>Skip tool table</a>
+{%- if page.national_resources %}
+{%- assign tools = page.national_resources %}
+<h2>Tools and resources</h2>
+<h3>Tailored to users in {{page.title}}</h3>
+<p>Developed and/or deployed by institutions and organisations in {{page.title}}.</p>
+<a class="visually-hidden-focusable" href='#skip-tool-table-1'>Skip tool table</a>
 <div class="table-responsive mt-4 mb-5">
-    <table id="tooltable" class="table display">
+    <table class="tooltable table display">
         <thead>
             <tr class="text-nowrap">
                 <th>Resource</th>
                 <th>Description</th>
                 <th>Related pages</th>
+                <th>Registry
+                    <a data-bs-toggle="tooltip" data-bs-original-title="Links to related information in ELIXIR registries: related policies and standards in FAIRsharing, scientific and technical descriptions of the resource in bio.tools, and related training in TeSS.">
+                        <i class="fa-solid fa-info-circle"></i>
+                    </a>
+                </th>
             </tr>
         </thead>
         <tbody>
@@ -33,7 +40,7 @@
                 {%- if tool.related_pages %}
                 {%- capture related_pages %}
                 {%- for section in tool.related_pages %}
-                {%- unless section.size == 0 %}
+                {%- unless section[1].size == 0 %}
                 {%- for tag in section[1] %}
                 {%- unless tag == page.page_id %}
                 {%- assign related_page = site.pages | where:"page_id",tag | first %}
@@ -47,11 +54,93 @@
                 {%- else %}
                 <td></td>
                 {%- endif %}
+                <td>
+                    {%- if tool.registry.biotools %}
+                    <a data-bs-toggle="tooltip" data-bs-original-title="Bio.tools" href="https://bio.tools/{{tool.registry.biotools}}"><span class="badge bg-dark text-white hover-primary"><i class="fa-solid fa-info me-2"></i>Tool info</span></a>
+                    {%- endif %}
+                    {%- if tool.registry.fairsharing %}
+                    <a data-bs-toggle="tooltip" data-bs-original-title="FAIRsharing" href="https://fairsharing.org/FAIRsharing.{{tool.registry.fairsharing}}"><span class="badge bg-dark text-white hover-primary"><i class="fa-solid fa-database me-2"></i>Standards/Databases</span></a>
+                    {%- endif %}
+                    {%- if tool.registry.fairsharing-coll %}
+                    <a data-bs-toggle="tooltip" data-bs-original-title="FAIRsharing collection" href="https://fairsharing.org/{{tool.registry.fairsharing-coll}}"><span class="badge bg-dark text-white hover-primary"><i class="fa-solid fa-database me-2"></i>Standards/Databases</span></a>
+                    {%- endif %}
+                    {%- if tool.registry.tess %}
+                    <a data-bs-toggle="tooltip" data-bs-original-title="TeSS" href="https://tess.elixir-europe.org/search?q={{tool.registry.tess}}"><span class="badge bg-dark text-white hover-primary"><i class="fa-solid fa-graduation-cap me-2"></i>Training</span></a>
+                    {%- endif %}
+                </td>
             </tr>
             {%- endfor %}
         </tbody>
     </table>
 </div>
-<div id="skip-tool-table"></div>
-
+<div id="skip-tool-table-1"></div>
 {%- endif %}
+{%- if page.ref_to_main_resources %}
+{%- assign tool_names = page.ref_to_main_resources %}
+<h3>{{page.title}} contributes to</h3>
+<p>Institutions and organisations in {{page.title}} are actively involved in the development of the following tools and resources.</p>
+<a class="visually-hidden-focusable" href='#skip-tool-table-2'>Skip tool table</a>
+<div class="table-responsive mt-4 mb-5">
+    <table class="tooltable table display">
+        <thead>
+            <tr class="text-nowrap">
+                <th>Resource</th>
+                <th>Description</th>
+                <th>Related pages</th>
+                <th>Registry
+                    <a data-bs-toggle="tooltip" data-bs-original-title="Links to related information in ELIXIR registries: related policies and standards in FAIRsharing, scientific and technical descriptions of the resource in bio.tools, and related training in TeSS.">
+                        <i class="fa-solid fa-info-circle"></i>
+                    </a>
+                </th>
+            </tr>
+        </thead>
+        <tbody>
+            {%- for tool_name in tool_names | sort %}
+            {%- assign tool =  site.data.tool_and_resource_list | where:"name", tool_name | first %}
+            <tr>
+                {% if tool.url %}
+                <td><a href="{{tool.url}}">{{tool.name}}</a>
+                </td>
+                {%- else %}
+                <td>{{tool.name}}</td>
+                {%- endif %}
+                <td>{{tool.description | markdownify }}
+                    {%- if tool.instance_of or tool.how_to_access %}
+                    <div class="d-block mt-1">
+                        <span class="d-inline-block" tabindex="0" data-bs-toggle="tooltip" title="This resource is an instance of {{tool.instance_of}}"><span class="badge text-primary border border-primary">{{tool.instance_of}}</span></span>
+                        {%- if tool.how_to_access %}
+                        <span class="d-inline-block" tabindex="0" data-bs-toggle="tooltip" title="{{tool.how_to_access}}"><span class="badge text-primary border border-primary"> <i class="fa-solid fa-key"></i></span></span>
+                        {%- endif %}
+                    </div>
+                    {%- endif %}
+                </td>
+                {%- capture related_pages %}
+                {%- for tag in tool.related_pages %}
+                {%- unless tag == page.page_id %}
+                {%- assign related_page = site.pages | where:"page_id",tag | first %}
+                <a href="{{related_page.url | relative_url }}"><span class="badge default-badge">{{related_page.title}}</span></a>
+                {%- endunless %}
+                {%- endfor %}
+                {%- endcapture %}
+                <td>{{related_pages}}</td>
+                <td>
+                    {%- if tool.registry.biotools %}
+                    <a data-bs-toggle="tooltip" data-bs-original-title="Bio.tools" href="https://bio.tools/{{tool.registry.biotools}}"><span class="badge bg-dark text-white hover-primary"><i class="fa-solid fa-info me-2"></i>Tool info</span></a>
+                    {%- endif %}
+                    {%- if tool.registry.fairsharing %}
+                    <a data-bs-toggle="tooltip" data-bs-original-title="FAIRsharing" href="https://fairsharing.org/FAIRsharing.{{tool.registry.fairsharing}}"><span class="badge bg-dark text-white hover-primary"><i class="fa-solid fa-database me-2"></i>Standards/Databases</span></a>
+                    {%- endif %}
+                    {%- if tool.registry.fairsharing-coll %}
+                    <a data-bs-toggle="tooltip" data-bs-original-title="FAIRsharing collection" href="https://fairsharing.org/{{tool.registry.fairsharing-coll}}"><span class="badge bg-dark text-white hover-primary"><i class="fa-solid fa-database me-2"></i>Standards/Databases</span></a>
+                    {%- endif %}
+                    {%- if tool.registry.tess %}
+                    <a data-bs-toggle="tooltip" data-bs-original-title="TeSS" href="https://tess.elixir-europe.org/search?q={{tool.registry.tess}}"><span class="badge bg-dark text-white hover-primary"><i class="fa-solid fa-graduation-cap me-2"></i>Training</span></a>
+                    {%- endif %}
+                </td>
+            </tr>
+            {%- endfor %}
+        </tbody>
+    </table>
+</div>
+<div id="skip-tool-table-2"></div>
+{%- endif %}

data/_includes/section-navigation-tiles.html

@@ -37,7 +37,7 @@
     <div class="col">
         <div class="input-group">
             <span class="input-group-text" id="search-label">Search</span>
-            <input type="text" id="title-search" class="form-control" onkeyup="buttonUp();" placeholder="Type here..." aria-label="{{page.type | replace: '_', ' ' |}}" aria-describedby="search-label">
+            <input type="text" id="title-search" class="form-control" onkeyup="StartSearch();" placeholder="Type here..." aria-label="{{page.type | replace: '_', ' ' |}}" aria-describedby="search-label">
             <button class="btn btn-primary" title="Button to clear search" type="button" id="clearsearch">
                 <i class="fa-solid fa-backspace"></i>
             </button>
@@ -63,7 +63,7 @@
     <div class="col" data-affiliations="{{affiliations_classes}}" related-pages="{{related_pages_classes}}">
         <div class="card h-100">
             <div class="card-header">
-                <a aria-label="Go to the {{current_page.title}} page" href="{{ current_page.url | relative_url }}">
+                <a class="stretched-link" aria-label="Go to the {{current_page.title}} page" href="{{ current_page.url | relative_url }}">
                     <h3 class="card-title m-0">{{current_page.title}}</h3>
                 </a>
             </div>
@@ -71,21 +71,64 @@
                 {%- if current_page.description %}
                 <p class="card-text">{{ current_page.description}}</p>
                 {%- endif %}
+            </div>
+            <div class="px-3 pb-3 d-flex justify-content-between">
                 {%- if current_page.related_pages %}
+                {%- assign nonempty = false %}
                 {%- for section in current_page.related_pages %}
-                {%- unless section[1] == nil %}
-                <div>
-                    <span><b><small>{{ section[0] | replace: "_", " " | capitalize }}: </small></b></span>
-                    {%- for page_id in section[1] %}
-                    {%- assign section_pages = site.pages | where:"type", section[0] %}
-                    {%- assign metadata = section_pages | where:"page_id", page_id %}
-                    {%- for page_hit in metadata %}
-                    <a href="{{ page_hit.url | relative_url }}"><span class="badge">{{page_hit.title | truncate: 20 }}</span></a>
-                    {%- endfor %}
-                    {%- endfor %}
-                </div>
+                {%- unless section[1].size == 0 %}
+                {%- assign nonempty = true %}
                 {%- endunless %}
                 {%- endfor %}
+                {%- if nonempty %}
+                <div class="dropdown">
+                    <button class="btn  btn-sm dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">
+                      Related pages
+                    </button>
+                    <ul class="dropdown-menu px-2 py-0 border-0 shadow">
+                        {%- for section in current_page.related_pages %}
+                        {%- unless section[1].size == 0 %}
+                        <li><h6 class="dropdown-header">{{ section[0] | replace: "_", " " | capitalize }}</h6></li>
+                        {%- for page_id in section[1] %}
+                        {%- assign section_pages = site.pages | where:"type", section[0] %}
+                        {%- assign metadata = section_pages | where:"page_id", page_id %}
+                        {%- for page_hit in metadata %}
+                        <li><a class="dropdown-item rounded" href="{{ page_hit.url | relative_url }}">{{page_hit.title }}</a></li>
+                        {%- endfor %}
+                        {%- endfor %}
+                        {%- endunless %}
+                        {%- endfor %}
+                    </ul>
+                </div>
+                {%- endif %}
+                {%- endif %}
+                {%- if current_page.dsw or current_page.faircookbook %}
+                <div class="btn-group btn-group-sm" role="group">
+                    {%- if current_page.faircookbook %}
+                    <div class="btn-group btn-group-sm" role="group">
+                        <button class="btn dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">
+                            <img alt="faircookbook logo" src="{{ 'assets/img/fairplus_compact_logo.svg' | relative_url }}">
+                        </button>
+                        <ul class="dropdown-menu px-2 py-0 border-0 shadow">
+                            {%- for item in current_page.faircookbook %}
+                            <li><a class="dropdown-item rounded" href="{{ item.url }}">{{item.name }}</a></li>
+                            {%- endfor %}
+                        </ul>
+                    </div>
+                    {%- endif %}
+                    {%- if current_page.dsw %}
+                    <div class="btn-group btn-group-sm" role="group">
+                        <button class="btn dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">
+                            <img alt="DSW logo" src="{{ 'assets/img/dsw_compact_logo.svg' | relative_url }}">
+                        </button>
+                        <ul class="dropdown-menu px-2 py-0 border-0 shadow">
+                            {%- for item in current_page.dsw %}
+                            <li><a class="dropdown-item rounded" href="{{ site.dsw_deep_link_prefix | append: item.uuid }}">{{item.name }}</a></li>
+                            {%- endfor %}
+                        </ul>
+                    </div>
+                    {%- endif %}
+                </div>
                 {%- endif %}
             </div>
             {%- if current_page.affiliations %}
@@ -100,7 +143,7 @@
                     {%- if affiliation.size == 2 %}
                     {%- assign country_link = site.pages | where:"country_code",country | first %}
                     {%- if country_link %}
-                    <a role="button" href="{{country_link.url}}" data-bs-toggle="tooltip" title="{{allcountries[country]}}" class="btn btn-sm bg-white hover-primary">
+                    <a role="button" href="{{'country_link.url' | relative_url}}" data-bs-toggle="tooltip" title="{{allcountries[country]}}" class="btn btn-sm bg-white hover-primary">
                         {%- else %}
                         <a role="button" data-bs-toggle="tooltip" title="{{allcountries[country]}}" class="btn btn-sm bg-white hover-primary disabled" aria-disabled="true">
                             {%- endif %}
@@ -171,7 +214,7 @@
      * Search cards
      */
 
-    var buttonUp = () => {
+    var StartSearch = () => {
         const input = document.getElementById("title-search");
         if (input) {
             const cols = document.querySelectorAll(".navigation-tiles .col");

data/_includes/topnav.html

@@ -2,7 +2,7 @@
 <header>
     <a class="visually-hidden-focusable" href='#main'>Skip to content</a>
     <a class="visually-hidden-focusable" href='#footer'>Skip to footer</a>
-    <nav class="navbar navbar-expand-lg mb-3 mb-lg-5">
+    <nav class="navbar navbar-{{ site.theme_variables.topnav.theme | default: 'light' }} navbar-expand-lg mb-3 mb-lg-5">
         <div class="container">
             <a class="navbar-brand" href="{{ '/' | relative_url }}"><img class="{% if site.topnav_title %}me-3 {% endif %}img-fluid" alt="{{site.title}} logo" src="{{ site.theme_variables.topnav.brand_logo | default: 'assets/img/main_logo.svg' | relative_url }}">{% if site.topnav_title %}<span class="me-0 me-lg-3">{{site.topnav_title}}</span>{% endif %}</a>
             <button class="navbar-toggler text-primary" type="button" data-bs-toggle="collapse" data-bs-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
@@ -55,6 +55,7 @@
                         <a class="nav-link ps-2 d-flex align-items-center" href="{{site.github.repository_url}}"><i class="fa-brands fa-github me-2"></i>{{site.theme_variables.git_host | default: 'GitHub' }}</a>
                     </li>
                     {%- endif %}
+                    {%- unless include.search == false %}
                     <!--start search-->
                     <li class="nav-item ms-0 ms-lg-3 my-2 my-lg-0">
                         <div class="position-relative">
@@ -65,6 +66,7 @@
                         </div>
                     </li>
                     <!--end search-->
+                    {%- endunless %}
                 </ul>
             </div>
         </div>

data/_includes/training-table-all.html

@@ -1,6 +1,6 @@
 <a class="visually-hidden-focusable" href='#skip-tool-table'>Skip tool table</a>
 <div class="table-responsive mt-4 mb-5">
-    <table id="trainingtable" class="table display">
+    <table class="trainingtable table display">
         <thead>
             <tr class="text-nowrap">
                 <th>Name

data/_sass/_bootstrap_variables.scss

@@ -6,5 +6,3 @@ $dark:          #212529;
 
 /*-----Custom values for Bootstrap variables-----*/
 $link-decoration: none;
-$nav-link-color: $dark;
-$nav-link-hover-color: $primary;

data/_sass/bootstrap/_buttons.scss

@@ -4,7 +4,6 @@
 
 .btn {
   display: inline-block;
-  align-self: center;
   font-family: $btn-font-family;
   font-weight: $btn-font-weight;
   line-height: $btn-line-height;

data/_sass/bootstrap/bootstrap-grid.scss

@@ -1,5 +1,5 @@
 /*!
- * Bootstrap Grid v5.1.2 (https://getbootstrap.com/)
+ * Bootstrap Grid v5.1.3 (https://getbootstrap.com/)
  * Copyright 2011-2021 The Bootstrap Authors
  * Copyright 2011-2021 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)

data/_sass/bootstrap/bootstrap-reboot.scss

@@ -1,5 +1,5 @@
 /*!
- * Bootstrap Reboot v5.1.2 (https://getbootstrap.com/)
+ * Bootstrap Reboot v5.1.3 (https://getbootstrap.com/)
  * Copyright 2011-2021 The Bootstrap Authors
  * Copyright 2011-2021 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)