Merge branch 'main' of github.com:ELIXIR-Belgium/elixir-toolkit-theme…

… into pr/PhilReedData/290-1

.github/workflows/jekyll.yml

@@ -2,6 +2,7 @@ name: Jekyll site CI
 
 on:
   push:
+    branches: [ main, master ]
   pull_request:
     branches: [ main, master ]
   workflow_dispatch:
@@ -13,17 +14,17 @@ permissions:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout
         uses: actions/checkout@v3
         with:
           ref: ${{ github.event.inputs.branch }}
 
       - name: Setup Ruby
-        uses: ruby/setup-ruby@v1.127.0
+        uses: ruby/setup-ruby@v1.196.0
         with:
-          ruby-version: '3.1'
+          ruby-version: '3.3'
           bundler-cache: true
           cache-version: 0
 

.github/workflows/stats.yml

@@ -14,9 +14,12 @@ jobs:
         uses: actions/checkout@v4
         with:
           ref: stats
-
+      - name: Set up Python 3.11
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
       - name: Install python dependencies
-        run: pip install numpy
+        run: pip install numpy requests
 
       - name: Update Stats File
         run: python var/github_traffic.py --token ${{ secrets.STATS_TOKEN }}

.github/workflows/update_data.yml

@@ -1,4 +1,4 @@
-name: Update data
+name: Update Country ISO Code YAML
 on:
   schedule:
     - cron:  '0 13 * * 1'

Gemfile

@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 gem "elixir-toolkit-theme-plugins", "~> 0.1.10"
-gem "webrick", "~> 1.8.1"
+gem "webrick", "~> 1.8.2"
 gem "jekyll", "~> 4.3.2"
 gem "jemoji", "~> 0.13.0"
 gem "kramdown-parser-gfm", "~> 1.1"

README.md

@@ -37,7 +37,7 @@ remote_theme: ELIXIR-Belgium/elixir-toolkit-theme
 You can lock it onto a specific version using:
 
 ```yaml
-remote_theme: ELIXIR-Belgium/elixir-toolkit-theme@3.0.1
+remote_theme: ELIXIR-Belgium/elixir-toolkit-theme@3.2.0
 ```
 
 ### Using Ruby Gems (alternative)
@@ -50,7 +50,7 @@ gem "elixir-toolkit-theme"
 You can lock it onto a specific version like this:
 
 ```ruby
-gem "elixir-toolkit-theme", "~> 3.0.1"
+gem "elixir-toolkit-theme", "~> 3.2.0"
 ```
 
 And add this line to your Jekyll site's `_config.yml`:

_config.yml

@@ -66,6 +66,8 @@ theme_variables:
   #   edit_me: true
   #   open_issue: true
   #   history: true
+  # datatables:
+  #   searchbuilder: True
   # headings:
   #   related-pages: Related pages
   #   more-information-tiles: More information

_data/tool_and_resource_list.yml

@@ -53,3 +53,7 @@
   registry:
     fairsharing: 6fba91
     europmc: 35297548
+- description: Discover tools and best practices for working with infectious disease data. IDTk provides general guidance as well as specific information for pathogen characterisation, socioeconomic data, human biomolecular data, and human clinical and health data.
+  id: idtk
+  name: Infectious Diseases Toolkit (IDTk)
+  url: https://www.infectious-diseases-toolkit.org/

_includes/head.html

@@ -62,13 +62,25 @@
     <link rel="stylesheet" type="text/css" href="{{ 'assets/css/dataTables.bootstrap5.min.css' | relative_url }}">
     <script type="text/javascript" charset="utf8" src="{{ 'assets/js/jquery.dataTables.min.js' | relative_url }}"></script>
     <script type="text/javascript" charset="utf8" src="{{ 'assets/js/dataTables.bootstrap5.min.js' | relative_url }}"></script>
+    {%- if site.theme_variables.datatables.searchbuilder %}
+    <link rel="stylesheet" type="text/css" href="{{ 'assets/css/dataTables.dateTime.min.css' | relative_url }}">
+    <link rel="stylesheet" type="text/css" href="{{ 'assets/css/searchBuilder.bootstrap5.min.css' | relative_url }}">
+    <script type="text/javascript" charset="utf8" src="{{ 'assets/js/dataTables.searchBuilder.min.js' | relative_url }}"></script>
+    <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 %}
     <script type="text/javascript">
         $(document).ready(function () {
             $('table.display').each(function() {
                 $(this).DataTable({
                     lengthMenu: [[10, 25, 50, 100, -1], [10, 25, 50, 100, "All"]],
                     stateSave: true,
                     searching: true,
+                    {%- if site.theme_variables.datatables.searchbuilder %}
+                    layout: {
+                        top1Start: 'searchBuilder'
+                    },
+                    {%- endif %}
                     info: true,
                     pageLength: 10,
                     language: {
@@ -82,6 +94,7 @@
                             $('#'+tableId+'_wrapper .dt-search').hide();
                             $('#'+tableId+'_wrapper .dt-info').hide();
                         }
+                        $('.dt-layout-table .dt-layout-full').addClass('table-responsive');
                     }
                 });
             })

_includes/section-navigation-tiles-simple.html

@@ -1,6 +1,6 @@
 {%- assign allcountries = site.data.countries %}
 {%- assign except = include.except | split: ", " %}
-<div class="row row-cols-1 row-cols-md-2 row-cols-lg-{{ include.col | default: 2 }} gy-2 gx-4 my-4 navigation-tiles">
+<div class="row row-cols-1 row-cols-md-2 row-cols-lg-{{ include.col | default: 2 }} gy-4 navigation-tiles">
     {%- for current_page in site.pages | sorted %}
     {%- if current_page.title and current_page.search_exclude != true and current_page.type == include.type %}
     {%- unless except contains current_page.name %}

assets/css/main.scss

@@ -807,7 +807,7 @@ footer {
     border-radius: $border-radius;
     padding: 0.1rem 0.25rem;
 
-    &:hover {
+    &:hover, &:active {
         text-decoration: none !important;
         color: $primary;
     }