elixir-toolkit-theme 4.2.0 → 6.0.0

data/_includes/footer.html

@@ -1,5 +1,12 @@
+{%- assign EMPTY = "" | split: "" %}
+{%- assign footer_columns = site.data.footer.columns | default: EMPTY %}
+{%- assign footer_copyright = site.data.footer.copyright %}
+{%- assign footer_extra_line = site.data.footer.extra_line %}
+{%- if footer_columns != EMPTY or footer_copyright or footer_extra_line %}
 <footer id="footer">
+    {%- if footer_columns != EMPTY or footer_extra_line %}
     <div class="container py-4 g-lg-5">
+        {%- if footer_columns != EMPTY %}
         <div class="row g-4 d-flex justify-content-between">
             {%- for column in site.data.footer.columns %}
             {%- if column.type == "image" %}
@@ -32,19 +39,21 @@
             {%- endif %}
             {%- endfor %}
         </div>
-        {%- unless site.data.footer.extra_line == nil %}
+        {%- endif %}
+        {%- if footer_extra_line %}
         <div class="row">
             <div class="text-center pt-4 mb-0">
-                {{site.data.footer.extra_line | markdownify }}
+                {{footer_extra_line | markdownify }}
             </div>
         </div>
-        {%- endunless %}
+        {%- endif %}
     </div>
+    {%- endif %}
     <div class="copyright py-4">
         <div class="container g-lg-5 d-flex justify-content-between flex-column flex-lg-row">
-            {%- unless site.data.footer.copyright == nil %}
-            <div class="d-flex align-items-center mb-3 mb-lg-0 mx-auto mx-lg-0 text-center">{{ site.data.footer.copyright | markdownify }}</div>
-            {%- endunless %}
+            {%- if footer_copyright %}
+            <div class="d-flex align-items-center mb-3 mb-lg-0 mx-auto mx-lg-0 text-center">{{ footer_copyright | markdownify }}</div>
+            {%- endif %}
             <div class="d-flex align-items-center mx-auto ms-lg-4 me-lg-0">
                 <a id="ett-logo" class="text-nowrap me-lg-5 me-xxlg-0" href="https://elixir-belgium.github.io/elixir-toolkit-theme">Built with
                     <svg data-name="ETT logo" xmlns="http://www.w3.org/2000/svg" width="30" height="30" viewBox="0 0 77.2 77.12">
@@ -72,3 +81,4 @@
         </div>
     </div>
 </footer>
+{%- endif %}

data/_includes/github-buttons.html

@@ -1,30 +1,26 @@
-{%- assign show_github_edit_button = site.theme_variables.github_buttons.edit_me | default: true %}
-{%- assign show_github_history_button = site.theme_variables.github_buttons.history | default: true %}
-{%- assign show_github_open_issue_button = site.theme_variables.github_buttons.open_issue | default: true %}
-
-{%- if show_github_edit_button or show_github_history_button or show_github_open_issue_button %}
+{%- assign show_github_edit_button = site.theme_variables.github_buttons.edit_me %}
+{%- assign show_github_history_button = site.theme_variables.github_buttons.history %}
+{%- assign show_github_open_issue_button = site.theme_variables.github_buttons.open_issue %}
+{%- unless show_github_edit_button and show_github_history_button and show_github_open_issue_button == false %}
 <div id="edit-me" class="btn-group">
-    {% if show_github_edit_button %}
-    {% assign repo_url = page.custom_repo_url | default: site.github.repository_url %}
-    {% if page.custom_editme %}
-    {% assign file_path = page.custom_editme %}
-    {% else %}
-    {% assign file_path = page.custom_file_path | default: page.path %}
-    {% endif %}
+    {%- unless show_github_edit_button == false %}
+    {%- assign repo_url = page.github.repository_url | default: site.github.repository_url %}
+    {%- assign repo_branch = page.github.branch | default: site.github.source.branch %}
+    {%- assign file_path = page.github.file_path | default: page.path %}
     <a role="button" data-bs-toggle="tooltip"
         title="Propose changes to the content of this page on {{site.theme_variables.git_host | default: 'GitHub' }}"
-        href="{{repo_url}}/blob/{{site.github.source.branch}}/{{file_path}}"
-        class="btn btn-sm hover-primary text-primary"><i class="fa-solid fa-pencil-alt"></i></a>
-    {%- endif %}
-    {%- if show_github_open_issue_button %}
+        href="{{repo_url}}/blob/{{repo_branch}}/{{file_path}}" class="btn btn-sm hover-primary text-primary"><i
+            class="fa-solid fa-pencil-alt"></i></a>
+    {%- endunless %}
+    {%- unless show_github_open_issue_button == false %}
     <a role="button" data-bs-toggle="tooltip" title="Report an issue"
         href="{{repo_url}}/issues/new?title={{'Issue on page: ' | url_encode }}{{page.title | url_encode }}&amp;body={{'I would like to report an issue on the ' | url_encode }}{{page.title | url_encode }}{{' page at `'| url_encode }}{{page.url | url_encode }}{{'`. Description of the issue:' | url_encode }}"
         class="btn btn-sm hover-primary text-primary"><i class="fa-solid fa-exclamation"></i></a>
-    {%- endif %}
-    {%- if show_github_history_button %}
+    {%- endunless %}
+    {%- unless show_github_history_button == false %}
     <a role="button" data-bs-toggle="tooltip" title="Check out the history of this page"
-        href="{{repo_url}}/commits/{{site.github.source.branch}}/{{file_path}}"
-        class="btn btn-sm hover-primary text-primary"><i class="fa-solid fa-history"></i></a>
-    {%- endif %}
+        href="{{repo_url}}/commits/{{repo_branch}}/{{file_path}}" class="btn btn-sm hover-primary text-primary"><i
+            class="fa-solid fa-history"></i></a>
+    {%- endunless %}
 </div>
-{%- endif %}
+{%- endunless %}

data/_includes/head.html

@@ -1,38 +1,42 @@
+{%- capture keywords %}
+{%- if page.related_pages %}
+{%- for section in page.related_pages %}
+{%- 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 %}
+{%- if page.type %}
+{%- assign subtitle = page.type | replace: "_", " " %}
+{%- endif %}
+{%- capture title %}{% if page.url == "/" %}{{site.title}}{% elsif page.title %}{% if subtitle %}{{subtitle}}: {% endif %}{{ page.title }} | {{ site.title }}{%- else %}{{ site.title }}{% endif %}{% endcapture %}
+{%- capture description %}{% if page.url == "/" %}{{site.description}}{% elsif page.description %}{{ page.description | strip_html | replace: '\n', ' ' | truncatewords: 30, '...' }}{% elsif page.summary %}{{ page.summary | strip_html | replace: '\n', ' ' | truncatewords: 30, '...' }}{% else %}{{ page.content | strip_html | replace: '\n', ' ' | truncatewords: 30, '...' }}{% endif %}{% endcapture %}
 <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <title>{{title}}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta name="description" content="{% if page.description %}{{ page.description | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
-    {%- capture keywords %}
-    {%- if page.related_pages %}
-    {%- for section in page.related_pages %}
-    {%- 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="description" content="{{description}}">
     <meta name="keywords" content="{{keywords}}">
-    <meta property="og:title" content="{{ site.title }}" />
-    <meta property="og:description" content="{{ site.description }}" />
+    <meta property="og:title" content="{{title}}" />
+    <meta property="og:description" content="{{description}}" />
+    <meta property="og:type" content="article">
+    <meta property="og:url" content="{{ page.url | absolute_url }}">
     <meta property="og:image" content="//{{site.github.url | remove: 'https://' | remove: 'http://'}}/assets/img/apple-touch-icon.png" />
-    <meta name="apple-mobile-web-app-title" content="{{site.title}}">
-    <meta name="msapplication-TileColor" content="#{{site.theme_variables.theme_color | default: 0d6efd }}">
+    <meta property="og:logo" content="//{{site.github.url | remove: 'https://' | remove: 'http://'}}/assets/img/apple-touch-icon.png" />
+    <meta name="apple-mobile-web-app-title" content="{{title}}">
     <meta name="theme-color" content="#{{site.theme_variables.theme_color | default: 0d6efd }}">
     {%- if page.no_robots %}
     <meta name="robots" content="noindex" />
     {%- endif %}
-    {%- if page.type %}
-    {%- assign subtitle = page.type | replace: "_", " " | capitalize %}
-    {%- endif %}
-    <title>{% if page.title %}{% if subtitle %}{{subtitle}}: {% endif %}{{ page.title }} | {{ site.title }}{%- else %}{{ site.title }}{% endif %}</title>
     <!-- Syntax highlighting  -->
     <link rel="stylesheet" href="{{ 'assets/css/syntax.css' | relative_url }}">
     <!-- Country flags  -->
@@ -53,9 +57,10 @@
     <script src="{{ 'assets/js/bootstrap.bundle.min.js' | relative_url }}"></script>
     <script src="{{ 'assets/js/anchor.min.js' | relative_url }}"></script>
     {% if page.toc or page.toc == nil %}<script src="{{ 'assets/js/toc.js' | relative_url }}?{{site.time | date: '%s'}}"></script>{% endif %}
-    <script src="{{ 'assets/js/jquery.navgoco.js' | relative_url }}"></script>
     <script src="{{ 'assets/js/main.js' | relative_url }}?{{site.time | date: '%s'}}"></script>
+    {%- unless site.theme_variables.topnav.search == false  %}
     <script src="{{ 'assets/js/search.js' | relative_url }}"></script>
+    {%- endunless %}
     <script src="{{ 'assets/js/clipboard.min.js' | relative_url }}"></script>
     {%- if page.datatable == true %}
     <!-- Include the standard DataTables bits -->
@@ -69,11 +74,12 @@
     <script type="text/javascript" charset="utf8" src="{{ 'assets/js/dataTables.dateTime.min.js' | relative_url }}"></script>
     <script type="text/javascript" charset="utf8" src="{{ 'assets/js/searchBuilder.bootstrap5.min.js' | relative_url }}"></script>
     {%- endif %}
+    {%- assign pagelength = site.theme_variables.datatables.pagelength | default: 10 %}
     <script type="text/javascript">
         $(document).ready(function () {
             $('table.display').each(function() {
                 $(this).DataTable({
-                    lengthMenu: [[10, 25, 50, 100, -1], [10, 25, 50, 100, "All"]],
+                    lengthMenu: [[{{ pagelength }}, {{ pagelength | times: 2 }}, {{ pagelength | times: 5 }}, {{ pagelength | times: 10 }}, -1], [{{ pagelength }}, {{ pagelength | times: 2 }}, {{ pagelength | times: 5 }}, {{ pagelength | times: 10 }}, "All"]],
                     stateSave: true,
                     searching: true,
                     {%- if site.theme_variables.datatables.searchbuilder %}
@@ -82,13 +88,13 @@
                     },
                     {%- endif %}
                     info: true,
-                    pageLength: 10,
+                    pageLength: {{ pagelength }},
                     language: {
                         searchPlaceholder: "Type here..."
                     },
                     "drawCallback": function ( settings ){
                         var tableId = settings.nTable.id;
-                        if(settings.fnRecordsTotal() < 10){     
+                        if(settings.fnRecordsTotal() < {{ pagelength }}){     
                             $('#'+tableId+'_wrapper .dt-length').hide();
                             $('#'+tableId+'_wrapper .dt-paging').hide();
                             $('#'+tableId+'_wrapper .dt-search').hide();
@@ -101,12 +107,12 @@
         });
     </script>
     {%- endif %}
+    <script src="{{ 'assets/js/custom.js' | relative_url }}?{{site.time | date: '%s'}}"></script>
     <!-- favicon -->
     <link rel="apple-touch-icon" sizes="180x180" href="{{ 'assets/img/apple-touch-icon.png' | relative_url }}">
     <link rel="icon" type="image/png" sizes="32x32" href="{{ 'assets/img/favicon-32x32.png' | relative_url }}">
     <link rel="icon" type="image/png" sizes="16x16" href="{{ 'assets/img/favicon-16x16.png' | relative_url }}">
     <link rel="manifest" href="{{ 'assets/img/site.webmanifest' | relative_url }}">
-    <link rel="mask-icon" href="{{ 'assets/img/safari-pinned-tab.svg' | relative_url }}" color="#{{site.theme_variables.theme_color | default: 0d6efd }}">
     <link rel="shortcut icon" href="{{ 'assets/img/favicon.ico' | relative_url }}">
     <!-- Schema.org metadata -->
     {% include schemasorg.html %}

data/_includes/more-information-tiles.html

@@ -63,7 +63,7 @@
 {%- if actual_fairsharing %}
 <!-- FAIRsharing -->
 <a data-bs-toggle="collapse" href="#fairsharing_collapse" role="button" aria-expanded="false" aria-controls="fairsharing_collapse" class="d-flex align-items-baseline pb-3 border-top info-collapse">
-    <h3 class="mb-0 flex-grow-1 mt-3 text-dark">Links to FAIRsharing</h3><i class="fa-solid fa-chevron-down fs-5"></i>
+    <h3 class="mb-0 flex-grow-1 mt-3 text-dark">Links to FAIRsharing</h3><i class="fa-solid fa-chevron-right fs-5"></i>
 </a>
 <div class="collapse info-card" id="fairsharing_collapse">
     <div class="mt-2 p-3 pb-5">
@@ -85,7 +85,7 @@
 {%- if actual_faircookbook %}
 <!-- FAIR Cookbook -->
 <a data-bs-toggle="collapse" href="#faircookbook_collapse" role="button" aria-expanded="false" aria-controls="faircookbook_collapse" class="d-flex align-items-baseline pb-3 border-top info-collapse">
-    <h3 class="mb-0 flex-grow-1 mt-3 text-dark">Links to FAIR Cookbook</h3><i class="fa-solid fa-chevron-down fs-5"></i>
+    <h3 class="mb-0 flex-grow-1 mt-3 text-dark">Links to FAIR Cookbook</h3><i class="fa-solid fa-chevron-right fs-5"></i>
 </a>
 <div class="collapse info-card" id="faircookbook_collapse">
     <div class="mt-2 p-3 pb-5">
@@ -107,7 +107,7 @@
 {%- if actual_dsw %}
 <!-- DSW -->
 <a data-bs-toggle="collapse" href="#dsw_collapse" role="button" aria-expanded="false" aria-controls="dsw_collapse" class="d-flex align-items-baseline pb-3 border-top info-collapse">
-    <h3 class="mb-0 flex-grow-1 mt-3 text-dark">Links to DSW</h3><i class="fa-solid fa-chevron-down fs-5"></i>
+    <h3 class="mb-0 flex-grow-1 mt-3 text-dark">Links to DSW</h3><i class="fa-solid fa-chevron-right fs-5"></i>
 </a>
 <div class="collapse info-card" id="dsw_collapse">
     <div class="mt-2 p-3 pb-5">
@@ -129,7 +129,7 @@
 {%- if actual_rdmkit %}
 <!-- RDMkit -->
 <a data-bs-toggle="collapse" href="#rdmkit_collapse" role="button" aria-expanded="false" aria-controls="rdmkit_collapse" class="d-flex align-items-baseline pb-3 border-top info-collapse">
-    <h3 class="mb-0 flex-grow-1 mt-3 text-dark">Links to RDMkit</h3><i class="fa-solid fa-chevron-down fs-5"></i>
+    <h3 class="mb-0 flex-grow-1 mt-3 text-dark">Links to RDMkit</h3><i class="fa-solid fa-chevron-right fs-5"></i>
 </a>
 <div class="collapse info-card" id="rdmkit_collapse">
     <div class="mt-2 p-3 pb-5">
@@ -152,7 +152,7 @@
 {%- if actual_training %}
 <!-- Training -->
 <a data-bs-toggle="collapse" href="#training_collapse" role="button" aria-expanded="false" aria-controls="training_collapse" class="d-flex align-items-baseline pb-3 border-top info-collapse">
-    <h3 class="mb-0 flex-grow-1 mt-3 text-dark">Training</h3><i class="fa-solid fa-chevron-down fs-5"></i>
+    <h3 class="mb-0 flex-grow-1 mt-3 text-dark">Training</h3><i class="fa-solid fa-chevron-right fs-5"></i>
 </a>
 <div class="collapse info-card" id="training_collapse">
     <div class="mt-2 p-3 pb-5">

data/_includes/news.html

@@ -8,7 +8,7 @@
     {%- for new in news reversed%}
     <li>
       <span class="title mb-1">{{ new.name | escape }}</span>
-      <p class="text-muted"><i class="far fa-calendar me-2"></i><time>{{ new.date | date_to_long_string }}</time>{% if new.linked_pr %} - <i class="fa-solid fa-code-branch me-2"></i><a href="{{ site.github.repository_url | append: '/pull/' | append: new.linked_pr }}">{{new.linked_pr }}</a>{% endif %}</p>
+      <p class="text-muted"><i class="far fa-calendar me-2"></i><time>{{ new.date | date_to_long_string }}</time>{% if new.linked_pr %} - <i class="fa-solid fa-code-branch me-2"></i><a href="{{ site.github.repository_url | append: '/pull/' | append: new.linked_pr }}"><span>{{new.linked_pr }}</span></a>{% endif %}</p>
       {%- if new.description %}
       {%- assign word_count = new.description | split: " " | size %}
       {%- if include.truncate == true and word_count > 40 %}

data/_includes/page-metadata-tabs.html

@@ -0,0 +1,92 @@
+{%- comment -%} Check if any tab has actual content (not empty arrays) {%- endcomment -%}
+{%- assign has_contributors = false -%}
+{%- assign has_coordinators = false -%}
+{%- assign has_editors = false -%}
+{%- assign has_affiliations = false -%}
+{%- assign has_citations = false -%}
+
+{%- if page.contributors and page.contributors.size > 0 -%}{%- assign has_contributors = true -%}{%- endif -%}
+{%- if page.coordinators and page.coordinators.size > 0 -%}{%- assign has_coordinators = true -%}{%- endif -%}
+{%- if page.editors and page.editors.size > 0 -%}{%- assign has_editors = true -%}{%- endif -%}
+{%- if page.affiliations and page.affiliations.size > 0 -%}{%- assign has_affiliations = true -%}{%- endif -%}
+{%- if page.page_citation -%}{%- assign has_citations = true -%}{%- endif -%}
+
+{% if has_contributors or has_coordinators or has_editors or has_affiliations or has_citations %}
+
+{%- comment -%} Determine which tab should be active by default {%- endcomment -%}
+{%- assign first_tab = nil -%}
+{%- unless first_tab -%}{%- if has_contributors -%}{%- assign first_tab = "contributors" -%}{%- endif -%}{%- endunless -%}
+{%- unless first_tab -%}{%- if has_coordinators -%}{%- assign first_tab = "coordinators" -%}{%- endif -%}{%- endunless -%}
+{%- unless first_tab -%}{%- if has_editors -%}{%- assign first_tab = "editors" -%}{%- endif -%}{%- endunless -%}
+{%- unless first_tab -%}{%- if has_affiliations -%}{%- assign first_tab = "affiliations" -%}{%- endif -%}{%- endunless -%}
+{%- unless first_tab -%}{%- if has_citations -%}{%- assign first_tab = "citations" -%}{%- endif -%}{%- endunless -%}
+
+<div class="page-metadata p-4 mt-5 rounded">
+    <nav>
+        <div class="nav nav-tabs mb-3" id="nav-credits" role="tablist">
+            {%- if has_contributors %}
+            <button class="nav-link {% if first_tab == 'contributors' %}active{% endif %}" id="credits-contributors-tab" data-bs-toggle="tab" data-bs-target="#credits-contributors" type="button" role="tab" aria-controls="credits-contributors" aria-selected="{% if first_tab == 'contributors' %}true{% else %}false{% endif %}">
+                <i class="fa-solid fa-users me-2"></i>
+                Contributors
+            </button>
+            {%- endif %}
+            {%- if has_coordinators %}
+            <button class="nav-link {% if first_tab == 'coordinators' %}active{% endif %}" id="credits-coordinators-tab" data-bs-toggle="tab" data-bs-target="#credits-coordinators" type="button" role="tab" aria-controls="credits-coordinators" aria-selected="{% if first_tab == 'coordinators' %}true{% else %}false{% endif %}">
+                <i class="fa-solid fa-crown me-2"></i>
+                Coordinators
+            </button>
+            {%- endif %}
+            {%- if has_editors %}
+            <button class="nav-link {% if first_tab == 'editors' %}active{% endif %}" id="credits-editors-tab" data-bs-toggle="tab" data-bs-target="#credits-editors" type="button" role="tab" aria-controls="credits-editors" aria-selected="{% if first_tab == 'editors' %}true{% else %}false{% endif %}">
+                <i class="fa-solid fa-comment-dots me-2"></i>
+                Editors
+            </button>
+            {% endif %}
+            {%- if has_affiliations %}
+            <button class="nav-link {% if first_tab == 'affiliations' %}active{% endif %}" id="credits-affiliations-tab" data-bs-toggle="tab" data-bs-target="#credits-affiliations" type="button" role="tab" aria-controls="credits-affiliations" aria-selected="{% if first_tab == 'affiliations' %}true{% else %}false{% endif %}">
+                <i class="fa-solid fa-building-columns me-2"></i>
+                Affiliations
+            </button>
+            {%- endif %}
+            {%- if has_citations %}
+            <button class="nav-link {% if first_tab == 'citations' %}active{% endif %}" id="credits-cite-tab" data-bs-toggle="tab" data-bs-target="#credits-citations" type="button" role="tab" aria-controls="credits-cite" aria-selected="{% if first_tab == 'citations' %}true{% else %}false{% endif %}">
+                <i class="fa-solid fa-quote-left me-2"></i>
+                Citation
+            </button>
+            {%- endif %}
+        </div>
+    </nav>
+
+    <div class="tab-content" id="nav-creditsContent">
+        {%- if has_contributors %}
+        <div class="tab-pane {% if first_tab == 'contributors' %}show active{% endif %}" id="credits-contributors" role="tabpanel">
+            {% include contributor-minitiles-page.html contributors_list=page.contributors sort=site.theme_variables.page_metadata.contributors_sort %}
+        </div>
+        {%- endif %}
+        {%- if has_coordinators %}
+        <div class="tab-pane {% if first_tab == 'coordinators' %}show active{% endif %}" id="credits-coordinators" role="tabpanel">
+            <div class="coordinators">
+                {% include contributor-minitiles-page.html contributors_list=page.coordinators sort=site.theme_variables.page_metadata.coordinators_sort %}
+            </div>
+        </div>
+        {%- endif %}
+        {%- if has_editors %}
+        <div class="tab-pane {% if first_tab == 'editors' %}show active{% endif %}" id="credits-editors" role="tabpanel">
+            <div class="editors">
+                {% include contributor-minitiles-page.html contributors_list=page.editors sort=site.theme_variables.page_metadata.editors_sort %}
+            </div>
+        </div>
+        {%- endif %}
+        {%- if has_affiliations %}
+        <div class="tab-pane {% if first_tab == 'affiliations' %}show active{% endif %}" id="credits-affiliations" role="tabpanel">
+            {% include affiliation-tiles-page.html affiliations_list=page.affiliations sort=site.theme_variables.page_metadata.affiliations_sort %}
+        </div>
+        {%- endif %}
+        {%- if has_citations %}
+        <div class="tab-pane {% if first_tab == 'citations' %}show active{% endif %}" id="credits-citations" role="tabpanel">
+            {% include citation-page.html contributors_list=page.contributors sort=site.theme_variables.page_metadata.contributors_sort %}
+        </div>
+        {%- endif %}
+    </div>
+</div>
+{% endif %}

data/_includes/pageids-overview.html

@@ -1,6 +1,6 @@
 {%- assign sidebar = site.data.sidebars[include.sidebar]['subitems'] -%}
 {%- for sections in sidebar %}
-{%- assign section = sections.title | downcase | replace: " ", "_" %}
+{%- assign section = sections.title | replace: " ", "_" %}
 {%- assign section_pages = site.pages | where:"type", section | where_exp: "item", "item.search_exclude != true" | where_exp: "item", "item.page_id != nil"   %}
 {%- unless section_pages.size == 0 %}
 <h2>{{sections.title}}</h2>

data/_includes/related-pages.html

@@ -23,7 +23,7 @@
                     <img src="{{page_hit.type_img | relative_url}}" class="type-icon me-2" alt="{{page_hit.type}} icon">
                     {%- endif %}
                     {%- if page_hit.type %}
-                    <span class=""><small>{{page_hit.type | replace: "_", " " | capitalize }}</small></span>
+                    <span class=""><small>{{page_hit.type | replace: "_", " " }}</small></span>
                     {%- endif %}
                 </div>
                 <a class="stretched-link section-title" aria-label="Go to the {{page_hit.title}} page" href="{{ page_hit.url | relative_url }}">

data/_includes/resource-table-all.html

@@ -26,7 +26,7 @@
 {%- endif %}
 {% if site.theme_variables.headings.resource-table-all-collapse %}<h3 class="mb-0 mt-3 flex-grow-1 text-dark">{% else %}<h2 class="h2-like fs-2">{% endif %}{{site.theme_variables.headings.resource-table-all | default: 'Tools and resources on this page' }}{% if site.theme_variables.headings.resource-table-all-collapse %}</h3>{% else % %}</h2>{% endif %}
 {%- if site.theme_variables.headings.resource-table-all-collapse %}
-    <i class="fa-solid fa-chevron-down fs-5"></i>
+    <i class="fa-solid fa-chevron-right fs-5"></i>
 </a>
 <div class="collapse info-card" id="tools_collapse">
 {%- endif %}
@@ -57,21 +57,14 @@
         <tbody>
             {%- for tool in tools %}
             <tr>
-                {%- assign instances_tool = 0 %}
-                {%- assign query = "related_pages." | append: page.type %}
-                {%- for country_page in country_pages %}
-                {%- assign instance_matches = country_page.national_resources | where: "instance_of", tool.id | where_exp:"resource","resource.related_pages != nil" | where: query, include.tag %}
-                {%- unless instance_matches.size == 0 %}
-                {%- assign instances_tool = instances_tool | plus: instance_matches.size %}
-                {%- endunless %}
-                {%- endfor %}
+                {%- assign instances_tool = tool.instances | size %}
                 {% if tool.url %}
                 <td><a href="{{tool.url}}">{{tool.name}}</a></td>
                 {%- else %}
                 <td>{{tool.name}}</td>
                 {%- endif %}
                 <td>{{tool.description}}
-                    {%- if tool.instance_of or tool.how_to_access or instances_tool != 0 != 0 and include.tag != nil %}
+                    {%- if tool.instance_of or tool.how_to_access or instances_tool != 0 %}
                     {%- assign linked_tool = site.data.tool_and_resource_list | where:"id", tool.instance_of | first %}
                     <div class="d-block mt-1">
                         {%- if linked_tool %}
@@ -80,11 +73,30 @@
                         {%- 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 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 %}
+                        {%- if instances_tool > 0 %}
+                        {%- assign dropdown_id = 'instances-dd-' | append: forloop.index0 %}
+                        <div class="dropdown d-inline-block">
+                            <button class="btn btn-badge btn-outline-primary dropdown-toggle"
+                                    type="button"
+                                    id="{{ dropdown_id }}"
+                                    data-bs-toggle="dropdown"
+                                    aria-expanded="false">
+                            <i class="fa-solid fa-globe me-2"></i>Instances
+                            </button>
+                            <ul class="dropdown-menu" aria-labelledby="{{ dropdown_id }}">
+                            {%- for inst in tool.instances %}
+                                <li>
+                                    <a class="dropdown-item no-ext-icon" href="{{ inst.url }}">
+                                        {{ inst.name }}
+                                        {%- if inst.country_code.size != 0 %}
+                                            <span class="flag-icon ms-2 shadow-sm flag-icon-{{ inst.country_code | downcase }}"></span>
+                                        {%- endif %}
+                                    </a>
+                                </li>
+                            {%- endfor %}
+                            </ul>
+                        </div>
+                        {%- endif %}
                     </div>
                     {%- endif %}
                 </td>
@@ -92,7 +104,7 @@
                 {%- 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 }}" data-bs-toggle="tooltip" title="{{related_page.type | replace: '_', ' ' | capitalize }}"><span class="badge default-badge">{{ related_page.title | truncate: 25 }}</span></a>
+                <a href="{{related_page.url | relative_url }}" data-bs-toggle="tooltip" title="{{related_page.type | replace: '_', ' ' }}"><span class="badge default-badge">{{ related_page.title | truncate: 25 }}</span></a>
                 {%- endunless %}
                 {%- endfor %}
                 {%- endcapture %}
@@ -137,7 +149,7 @@
 {%- endif %}
     <h3 class="{% if site.theme_variables.headings.resource-table-all-collapse %}mb-0 mt-3 flex-grow-1 text-dark {% endif %}">National resources</h3>
 {%- if site.theme_variables.headings.resource-table-all-collapse %}
-    <i class="fa-solid fa-chevron-down fs-5"></i>
+    <i class="fa-solid fa-chevron-right fs-5"></i>
 </a>
 <div class="collapse info-card" id="nat_tools_collapse">
 {%- endif %}

data/_includes/resource-table-page.html

@@ -47,7 +47,7 @@
                 {%- for tag in section[1] %}
                 {%- unless tag == page.page_id %}
                 {%- assign related_page = site.pages | where:"page_id",tag | first %}
-                <a class="nohover" href="{{related_page.url | relative_url }}"  data-bs-toggle="tooltip" title="{{related_page.type | replace: '_', ' ' | capitalize}}"><span class="badge default-badge">{{ related_page.title | truncate: 25 }}</span></a>
+                <a class="nohover" href="{{related_page.url | relative_url }}"  data-bs-toggle="tooltip" title="{{related_page.type | replace: '_', ' ' }}"><span class="badge default-badge">{{ related_page.title | truncate: 25 }}</span></a>
                 {%- endunless %}
                 {%- endfor %}
                 {%- endunless %}
@@ -126,7 +126,7 @@
                 {%- 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 }}"  data-bs-toggle="tooltip" title="{{related_page.type | replace: '_', ' ' | capitalize}}"><span class="badge default-badge">{{ related_page.title | truncate: 25 }}</span></a>
+                <a href="{{related_page.url | relative_url }}"  data-bs-toggle="tooltip" title="{{related_page.type | replace: '_', ' ' }}"><span class="badge default-badge">{{ related_page.title | truncate: 25 }}</span></a>
                 {%- endunless %}
                 {%- endfor %}
                 {%- endcapture %}

data/_includes/scroll-top.html

@@ -1,5 +1,5 @@
 {%- if site.theme_variables.back_to_top or site.theme_variables.back_to_top == nil %}
 <button id="back-to-top" class="btn btn-primary btn-sm rounded-pill" type="button" aria-hidden="true" onclick="topFunction()">
-    <i class="fa-solid fa-arrow-up"></i>
+    <i class="fa-solid fa-arrow-up"></i><span class="visually-hidden">Back to top button</span>
 </button>
 {%- 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-tiles"><i class="fa-solid fa-magnifying-glass"></i></span>
-            <input type="text" id="title-search" class="form-control" onkeyup="StartSearch();" placeholder="Find your page..." aria-label="{{page.type | replace: '_', ' ' |}}" aria-describedby="search-label-tiles">
+            <input type="text" id="title-search" class="form-control" onkeyup="StartSearch();" placeholder="Find your page..." aria-label="{{page.type | replace: '_', ' ' }}" aria-describedby="search-label-tiles">
             <button class="btn btn-primary" title="Button to clear search" type="button" id="clearsearch">
                 <i class="fa-solid fa-backspace"></i>
             </button>
@@ -90,7 +90,7 @@
                     <img src="{{current_page.type_img | relative_url}}" class="type-icon me-2" alt="{{current_page.type}} icon">
                     {%- endif %}
                     {%- if current_page.type %}
-                    <span class=""><small>{{current_page.type | replace: "_", " " | capitalize }}</small></span>
+                    <span class=""><small>{{current_page.type | replace: "_", " " }}</small></span>
                     {%- endif %}
                 </div>
                 <a class="stretched-link section-title" aria-label="Go to the {{current_page.title}} page" href="{{ current_page.url | relative_url }}">
@@ -164,7 +164,7 @@
                 }
                 const cols = document.querySelectorAll(".navigation-tiles .col");
                 for (col of cols) {
-                    const colCategories = col.getAttribute("data-affiliations").split(" ");
+                    const colCategories = (col.getAttribute("data-affiliations") ?? "").split(" ");
                     if (colCategories.indexOf(this.value) != -1 || this.value === "reset") {
                         col.classList.remove("d-none");
                     } else {
@@ -181,7 +181,7 @@
                     document.getElementById("affiliations-input").selectedIndex = null;
                     const cols = document.querySelectorAll(".navigation-tiles .col");
                     for (col of cols) {
-                        const colCategories = col.getAttribute("data-affiliations").split(" ");
+                        const colCategories = (col.getAttribute("data-affiliations") ?? "").split(" ");
                         col.classList.remove("d-none");
                     }
                 }
@@ -198,13 +198,17 @@
         const input = document.getElementById("title-search");
         if (input) {
             const cols = document.querySelectorAll(".navigation-tiles .col");
-            let filter = input.value.toLowerCase();
+            const filter = input.value.toLowerCase();
+
             var affiliations = document.getElementById('affiliations-input');
             if (affiliations) {
                 document.getElementById("affiliations-input").selectedIndex = null;
             }
+
             for (let i = 0; i < cols.length; i++) {
-                let body = cols[i].querySelector(".card-body");
+                let body = cols[i].querySelector(".card-body") || cols[i].querySelector(".section-title");
+                if (!body) continue; // skip cols that don’t have searchable content
+
                 if (body.innerText.toLowerCase().indexOf(filter) > -1) {
                     cols[i].classList.remove("d-none");
                 } else {
@@ -212,7 +216,8 @@
                 }
             }
         }
-    }
+    };
+
     $(document).ready(function () {
         var clearsearch = document.getElementById("clearsearch");
         if (clearsearch) {