elixir-toolkit-theme 1.26.0 → 2.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 6ef4ebf40b6e201b710ec252b5333ab05e29a1ab2d498f3ae08a68eb070897f3
4
- data.tar.gz: df3e16d7a670713d0fe8e93547884721aad320d15e572749cbed49b96dabfc76
3
+ metadata.gz: 50a883750f43ede5fd36322883070d37f2412df14e49a8f33f583a22db9754e5
4
+ data.tar.gz: 3f1b7a3e937a1e8ca8d9cd0a5574091123f79683cb62754331a962f257465383
5
5
  SHA512:
6
- metadata.gz: 6a16e5224092c6774408a45a127c181a0f8e1683af2dfe139254faf8ce968ab09f8337deff75f010d9ca0ca9ea59b7c7465cb2ec9509f37cc59f7e72acdce583
7
- data.tar.gz: 8de88b386adcdd70a791627acea9d1fddd448115aa765b32f83b445e1cc7eff869673cc4a4aa5b9b84490017d13495bb4112ed5782d6e47baa9de06615a092dc
6
+ metadata.gz: 137897f2f78de213f470e7cc70b7b48919445bb7272566e73dfe43e0dc30b1dd7e43ede5b3d7d836a89dfb4cd955611bec4836a563ad6fba350cca16436a4f5f
7
+ data.tar.gz: 667a09391c125561515a0dc32cd0ce558a5615b6f47052769b70fbd088bada7303f70a1dc13e2a7d7d00623d2be0f21daa1551a79077f1a19542b6c07968c04a
data/README.md CHANGED
@@ -1,3 +1,7 @@
1
+ ---
2
+ permalink: /
3
+ ---
4
+
1
5
  [![Gem Version](https://badge.fury.io/rb/elixir-toolkit-theme.svg)](https://badge.fury.io/rb/elixir-toolkit-theme) [![Jekyll site CI](https://github.com/ELIXIR-Belgium/elixir-toolkit-theme/actions/workflows/jekyll.yml/badge.svg)](https://github.com/ELIXIR-Belgium/elixir-toolkit-theme/actions/workflows/jekyll.yml) [![DOI](https://zenodo.org/badge/421495867.svg)](https://zenodo.org/badge/latestdoi/421495867)
2
6
 
3
7
 
@@ -19,30 +23,35 @@ Its key features:
19
23
  - Easy side navigation, top navigation and footer management
20
24
  - Mobile friendly
21
25
  - Create website sections with each section having its own sidebar
22
- - Out of the box search engine optimizations including schema.org attributes and many other matadata attributes
23
- - Support for Google Analytics and Plausible
24
-
25
- ## Installation
26
+ - Out of the box search engine optimizations including schema.org attributes and many other metadata attributes
27
+ - Support for Google Analytics, Matomo and Plausible
26
28
 
27
- ### via GitHub Pages remote theme (installation free!)
29
+ ## Enabling the theme on your Jekyll project
28
30
 
29
- 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:
31
+ The quickest way to use the elixir-toolkit-theme is setting it as a [remote theme](https://blog.github.com/2017-11-29-use-any-theme-with-github-pages/) in your `config.yml` file:
30
32
 
31
33
  ```yaml
32
34
  remote_theme: ELIXIR-Belgium/elixir-toolkit-theme
33
35
  ```
34
36
 
35
- 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.
37
+ You can lock it onto a specific version like using:
36
38
 
37
- ### via RubyGems:
39
+ ```yaml
40
+ remote_theme: ELIXIR-Belgium/elixir-toolkit-theme@1.25.0
41
+ ```
38
42
 
39
- Alternatively you can install it as a Ruby Gem (preferred way if you use GitLab).
43
+ ### Using Ruby Gems (alternative)
40
44
 
41
- Add this line to your Jekyll site's Gemfile:
45
+ Alternatively you can use the Ruby Gem of the theme (needed when using GitLab) by adding this line to your Jekyll site's Gemfile:
42
46
 
43
47
  ```ruby
44
48
  gem "elixir-toolkit-theme"
45
49
  ```
50
+ You can lock it onto a specific version like this:
51
+
52
+ ```ruby
53
+ gem "elixir-toolkit-theme", "~> 1.25.0"
54
+ ```
46
55
 
47
56
  And add this line to your Jekyll site's `_config.yml`:
48
57
 
@@ -50,26 +59,53 @@ And add this line to your Jekyll site's `_config.yml`:
50
59
  theme: elixir-toolkit-theme
51
60
  ```
52
61
 
53
- ## Usage
62
+ ## Deployment
54
63
 
55
- [View the documentation](https://elixir-belgium.github.io/elixir-toolkit-theme/) for usage information (under development).
64
+ ### Via GitHub Actions
56
65
 
57
- ## Deployment
66
+ 1. Make sure you have a GitHub workflow file setup similar to the one in this repo at [.github/workflows/jekyll.yml](https://github.com/ELIXIR-Belgium/elixir-toolkit-theme/blob/main/.github/workflows/jekyll.yml).
58
67
 
59
- ### Using GitHub pages
68
+ 2. Go to Settings > Pages and enable GitHub Actions as a source
69
+ 3. Go to Environments > github-pages and remove the rule under Deployment branches if you want to deploy other branches than master or main via Workflow Dispatch (manually triggered action)
60
70
 
61
- This theme can be used to deploy the website using GitHub pages. Visit the [GitHub documentation](https://docs.github.com/en/pages/setting-up-a-github-pages-site-with-jekyll/) to find out more about how to setup GitHub pages.
71
+ ### Via GitHub Pages
62
72
 
63
- ### Locally using Jekyll
73
+ This is the quickest way to deploy the elixir-toolkit-theme, but gives less flexibility and does not allow you to make use of the new way of tagging tools. Visit the [GitHub documentation](https://docs.github.com/en/pages/setting-up-a-github-pages-site-with-jekyll/) to find out more about how to setup GitHub pages.
64
74
 
65
- 1. If not already present on your machine, install ruby. Note that incompatibility issues may arise with ruby 3.0.0 (released 25.12.20) or newer versions.
75
+ NOTE: This way of deploying does not support the tool-tag in the text of the markdown file to tag tools and resources.
66
76
 
77
+ ### Via GitLab Pages
67
78
 
68
- 1. Install Jekyll
69
- If you have never installed or run a Jekyll site locally on your computer, follow these instructions to install Jekyll:
70
- * Install Jekyll on MacOS/Ubuntu/Other_Linux/Windows: [https://jekyllrb.com/docs/installation/](https://jekyllrb.com/docs/installation/)
79
+ Add an extra `.gitlab-ci.yml` file in the root of the repo with:
80
+
81
+ ```yml
82
+ image: ruby:2.7
71
83
 
72
- 1. Install Bundler and Jekyll
84
+ variables:
85
+ JEKYLL_ENV: production
86
+
87
+ before_script:
88
+ - bundle install
89
+
90
+ pages:
91
+ stage: deploy
92
+ script:
93
+ - bundle exec jekyll build -d public
94
+ artifacts:
95
+ paths:
96
+ - public
97
+ only:
98
+ - master
99
+
100
+ ```
101
+
102
+
103
+ ### Locally using Jekyll
104
+
105
+ 1. If not already present on your machine, install **ruby**.
106
+
107
+ 1. Install Jekyll
108
+ If you have never installed or run a Jekyll site locally on your computer, follow these instructions to install Jekyll: [https://jekyllrb.com/docs/installation/](https://jekyllrb.com/docs/installation/)
73
109
 
74
110
  ```
75
111
  gem install jekyll bundler
@@ -90,11 +126,11 @@ If you have never installed or run a Jekyll site locally on your computer, follo
90
126
  Additional information can be found at the following link: [https://docs.github.com/en/free-pro-team@latest/github/working-with-github-pages/testing-your-github-pages-site-locally-with-jekyll](https://docs.github.com/en/free-pro-team@latest/github/working-with-github-pages/testing-your-github-pages-site-locally-with-jekyll)
91
127
 
92
128
 
93
- ### Using Docker
129
+ ### Locally using Docker
94
130
 
95
131
  If not already installed on your machine, install Docker. From the root of the `elixir-toolkit-theme` directory, run:
96
132
 
97
- ```
133
+ ```sh
98
134
  docker run -it --rm -p [::1]:4000:4000 -v $PWD:/srv/jekyll jekyll/jekyll:latest /bin/bash -c "chmod a+w /srv/jekyll/Gemfile.lock && chmod 777 /srv/jekyll && bundle install && bundle exec jekyll serve --host 0.0.0.0"
99
135
  ```
100
136
 
@@ -113,7 +149,7 @@ This will start the docker container and serve the website locally. Make sure th
113
149
  - [ERIM Research Toolbox](https://eur-nl.github.io/erim-research-toolbox/)
114
150
  - [ELIXIR-UK Fellowship](https://elixir-uk-dash.github.io/rdmkit/)
115
151
 
116
- ## Used packages
152
+ ## Dependencies
117
153
 
118
154
  This theme would not be possible without following open source projects:
119
155
 
@@ -138,7 +174,6 @@ If you like our work, you can add following badge to the readme of your project:
138
174
 
139
175
 
140
176
 
141
-
142
177
  ## License
143
178
 
144
179
  The theme is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
@@ -1,6 +1,6 @@
1
1
  {%- if page.affiliations and page.affiliations.size != 0 %}
2
2
  <span class="d-block h2-like fs-2">Affiliations</span>
3
- <div class="p-4 rounded mt-4 page-contributors d-flex flex-wrap gap-2">
3
+ <div class="mt-4 d-flex flex-wrap gap-2">
4
4
  {%- assign affiliations = site.data.affiliations %}
5
5
  {%- assign page_affiliations = page.affiliations | sort %}
6
6
  {%- assign allcountries = site.data.countries %}
@@ -1,10 +1,22 @@
1
1
  {%- assign contributors = site.data.CONTRIBUTORS %}
2
- {%- assign nr = include.nr | default: 5 %}
2
+ {%- assign nr = include.col | default: 5 %}
3
3
  {%- if include.custom %}
4
- {%- assign allcontributors = include.custom | split: ", " | sort %}
4
+ {%- assign allcontrstr = include.custom %}
5
+ {%- elsif include.role %}
6
+ {%- assign rolefilter = include.role | downcase %}
7
+ {%- for contr in contributors %}
8
+ {%- assign contrrole = contr[1]['role'] | downcase %}
9
+ {%- if include.role == contrrole %}
10
+ {%- if allcontrstr %}
11
+ {%- assign allcontrstr = allcontrstr | append: ", " | append: contr[0] %}
12
+ {%- else %}
13
+ {%- assign allcontrstr = allcontrstr | append: contr[0] %}
14
+ {%- endif %}
15
+ {%- endif %}
16
+ {%- endfor %}
5
17
  {%- else %}
6
18
  {%- for page in site.pages %}
7
- {%- if page.contributors and page.search_exclude != true %}
19
+ {%- if page.contributors and page.search_exclude != true and page.contributors.size != 0 %}
8
20
  {%- assign pagecontr = page.contributors | join: ", " %}
9
21
  {%- if allcontrstr %}
10
22
  {%- assign allcontrstr = allcontrstr | append: ", " | append: pagecontr %}
@@ -14,10 +26,18 @@
14
26
  {%- endif %}
15
27
  {%- endfor %}
16
28
  {%- for contr in contributors %}
29
+ {%- if allcontrstr %}
17
30
  {%- assign allcontrstr = allcontrstr | append: ", " | append: contr[0] %}
31
+ {%- else %}
32
+ {%- assign allcontrstr = allcontrstr | append: contr[0] %}
33
+ {%- endif %}
18
34
  {%- endfor %}
19
- {%- assign allcontributors = allcontrstr | split: ", " | uniq | sort %}
20
35
  {%- endif %}
36
+ {%- unless include.sort == false %}
37
+ {%- assign allcontributors = allcontrstr | split: ", " | uniq | sort %}
38
+ {%- else %}
39
+ {%- assign allcontributors = allcontrstr | split: ", " | uniq %}
40
+ {%- endunless %}
21
41
  <div id="contributors-carousel" class="carousel carousel-dark slide my-4" data-ride="carousel" data-bs-interval="7000">
22
42
  <div class="carousel-inner">
23
43
  {%- assign counter = 0 %}
@@ -29,12 +49,12 @@
29
49
  </div>
30
50
  {%- endif %}
31
51
  <div class="carousel-item {% if counter == 0 %}active{% endif %}">
32
- <div class="row row-cols-5 contributor-cards g-1 g-sm-4 ">
52
+ <div class="row row-cols-{{nr}} contributor-cards g-1 g-xl-4 ">
33
53
  {%- endif %}
34
54
  <div class="col">
35
55
  <div class="card h-100">
36
56
  {%- assign id = contributors[contributor].git | default: 'no_github' %}
37
- <div>
57
+ <div class="position-relative">
38
58
  {%- if contributors[contributor].image_url %}
39
59
  <div class="p-3">
40
60
  <div class="ratio ratio-1x1">
@@ -61,6 +81,9 @@
61
81
  </div>
62
82
  {%- endif %}
63
83
  {%- endif %}
84
+ {%- if contributors[contributor].role %}
85
+ <span class="badge position-absolute top-0 end-0">{{ contributors[contributor].role | capitalize }}</span>
86
+ {%- endif %}
64
87
  </div>
65
88
  <div class="card-body text-center py-0">
66
89
  <p class="card-title">{{ contributor }}</p>
@@ -70,15 +93,15 @@
70
93
  </div>
71
94
  {%- if contributors[contributor].git or contributors[contributor].email or contributors[contributor].orcid %}
72
95
  <div class="card-footer">
73
- <div class="d-flex justify-content-center">
96
+ <div class="d-flex justify-content-center gap-1 gap-md-2">
74
97
  {%- if contributors[contributor].git %}
75
- <div class="mx-1"><a class="btn bg-white text-primary hover-primary rounded-circle social-icons p-0" href="https://github.com/{{id}}"><i class="fa-brands fa-github"></i></a></div>
98
+ <a class="btn bg-white text-primary hover-primary rounded-circle social-icons p-0" href="https://github.com/{{id}}"><i class="fa-brands fa-github"></i></a>
76
99
  {%- endif %}
77
100
  {%- if contributors[contributor].email %}
78
- <div class="mx-1"><a class="btn bg-white text-primary hover-primary rounded-circle social-icons p-0" href="mailto:{{contributors[contributor].email}}"><i class="fa-solid fa-envelope"></i></a></div>
101
+ <a class="btn bg-white text-primary hover-primary rounded-circle social-icons p-0" href="mailto:{{contributors[contributor].email}}"><i class="fa-solid fa-envelope"></i></a>
79
102
  {%- endif %}
80
103
  {%- if contributors[contributor].orcid %}
81
- <div class="mx-1"><a class="btn bg-white text-primary hover-primary rounded-circle social-icons p-0" href="https://orcid.org/{{contributors[contributor].orcid}}"><i class="fa-brands fa-orcid"></i></a></div>
104
+ <a class="btn bg-white text-primary hover-primary rounded-circle social-icons p-0" href="https://orcid.org/{{contributors[contributor].orcid}}"><i class="fa-brands fa-orcid"></i></a>
82
105
  {%- endif %}
83
106
  </div>
84
107
  </div>
@@ -2,7 +2,11 @@
2
2
  <span class="d-block h2-like fs-2">Contributors</span>
3
3
  <div class="p-4 rounded mt-4 page-contributors d-flex flex-wrap gap-2">
4
4
  {%- assign contributors = site.data.CONTRIBUTORS %}
5
+ {%- unless include.sort == false %}
5
6
  {%- assign page_contributors = page.contributors | sort %}
7
+ {%- else %}
8
+ {%- assign page_contributors = page.contributors %}
9
+ {%- endunless %}
6
10
  {%- for contributor in page_contributors %}
7
11
  {%- assign id = contributors[contributor].git | default: 'no_github' %}
8
12
  <div class="dropup-center dropup d-inline-block">
@@ -89,15 +93,15 @@
89
93
  </div>
90
94
  {%- if contributors[contributor].git or contributors[contributor].email or contributors[contributor].orcid %}
91
95
  <div class="card-footer">
92
- <div class="d-flex justify-content-center">
96
+ <div class="d-flex justify-content-center gap-2">
93
97
  {%- if contributors[contributor].git %}
94
- <div class="mx-1"><a class="btn bg-white text-primary hover-primary rounded-circle social-icons p-0" href="https://github.com/{{id}}"><i class="fa-brands fa-github"></i></a></div>
98
+ <a class="btn bg-white text-primary hover-primary rounded-circle social-icons p-0" href="https://github.com/{{id}}"><i class="fa-brands fa-github"></i></a>
95
99
  {%- endif %}
96
100
  {%- if contributors[contributor].email %}
97
- <div class="mx-1"><a class="btn bg-white text-primary hover-primary rounded-circle social-icons p-0" href="mailto:{{contributors[contributor].email}}"><i class="fa-solid fa-envelope"></i></a></div>
101
+ <a class="btn bg-white text-primary hover-primary rounded-circle social-icons p-0" href="mailto:{{contributors[contributor].email}}"><i class="fa-solid fa-envelope"></i></a>
98
102
  {%- endif %}
99
103
  {%- if contributors[contributor].orcid %}
100
- <div class="mx-1"><a class="btn bg-white text-primary hover-primary rounded-circle social-icons p-0" href="https://orcid.org/{{contributors[contributor].orcid}}"><i class="fa-brands fa-orcid"></i></a></div>
104
+ <a class="btn bg-white text-primary hover-primary rounded-circle social-icons p-0" href="https://orcid.org/{{contributors[contributor].orcid}}"><i class="fa-brands fa-orcid"></i></a>
101
105
  {%- endif %}
102
106
  </div>
103
107
  </div>
@@ -1,6 +1,19 @@
1
1
  {%- assign contributors = site.data.CONTRIBUTORS %}
2
+ {%- assign nr = include.col | default: 5 %}
2
3
  {%- if include.custom %}
3
- {%- assign allcontributors = include.custom | split: ", " | sort %}
4
+ {%- assign allcontrstr = include.custom %}
5
+ {%- elsif include.role %}
6
+ {%- assign rolefilter = include.role | downcase %}
7
+ {%- for contr in contributors %}
8
+ {%- assign contrrole = contr[1]['role'] | downcase %}
9
+ {%- if include.role == contrrole %}
10
+ {%- if allcontrstr %}
11
+ {%- assign allcontrstr = allcontrstr | append: ", " | append: contr[0] %}
12
+ {%- else %}
13
+ {%- assign allcontrstr = allcontrstr | append: contr[0] %}
14
+ {%- endif %}
15
+ {%- endif %}
16
+ {%- endfor %}
4
17
  {%- else %}
5
18
  {%- for page in site.pages %}
6
19
  {%- if page.contributors and page.search_exclude != true and page.contributors.size != 0 %}
@@ -19,9 +32,13 @@
19
32
  {%- assign allcontrstr = allcontrstr | append: contr[0] %}
20
33
  {%- endif %}
21
34
  {%- endfor %}
22
- {%- assign allcontributors = allcontrstr | split: ", " | uniq | sort %}
23
35
  {%- endif %}
24
- <div class="row row-cols-2 row-cols-sm-3 row-cols-md-4 row-cols-xl-5 g-4 contributor-cards">
36
+ {%- unless include.sort == false %}
37
+ {%- assign allcontributors = allcontrstr | split: ", " | uniq | sort %}
38
+ {%- else %}
39
+ {%- assign allcontributors = allcontrstr | split: ", " | uniq %}
40
+ {%- endunless %}
41
+ <div class="row row-cols-2 row-cols-sm-3 row-cols-md-4 row-cols-xl-{{nr}} g-4 contributor-cards">
25
42
  {%- for contributor in allcontributors %}
26
43
  <div class="col">
27
44
  <div class="card h-100">
@@ -65,15 +82,15 @@
65
82
  </div>
66
83
  {%- if contributors[contributor].git or contributors[contributor].email or contributors[contributor].orcid %}
67
84
  <div class="card-footer">
68
- <div class="d-flex justify-content-center">
85
+ <div class="d-flex justify-content-center gap-2">
69
86
  {%- if contributors[contributor].git %}
70
- <div class="mx-1"><a class="btn bg-white text-primary hover-primary rounded-circle social-icons p-0" href="https://github.com/{{id}}"><i class="fa-brands fa-github"></i></a></div>
87
+ <a class="btn bg-white text-primary hover-primary rounded-circle social-icons p-0" href="https://github.com/{{id}}"><i class="fa-brands fa-github"></i></a>
71
88
  {%- endif %}
72
89
  {%- if contributors[contributor].email %}
73
- <div class="mx-1"><a class="btn bg-white text-primary hover-primary rounded-circle social-icons p-0" href="mailto:{{contributors[contributor].email}}"><i class="fa-solid fa-envelope"></i></a></div>
90
+ <a class="btn bg-white text-primary hover-primary rounded-circle social-icons p-0" href="mailto:{{contributors[contributor].email}}"><i class="fa-solid fa-envelope"></i></a>
74
91
  {%- endif %}
75
92
  {%- if contributors[contributor].orcid %}
76
- <div class="mx-1"><a class="btn bg-white text-primary hover-primary rounded-circle social-icons p-0" href="https://orcid.org/{{contributors[contributor].orcid}}"><i class="fa-brands fa-orcid"></i></a></div>
93
+ <a class="btn bg-white text-primary hover-primary rounded-circle social-icons p-0" href="https://orcid.org/{{contributors[contributor].orcid}}"><i class="fa-brands fa-orcid"></i></a>
77
94
  {%- endif %}
78
95
  </div>
79
96
  </div>
@@ -11,7 +11,7 @@
11
11
  {%- if column.title != nil %}
12
12
  <span class="footer-title">{{column.title}}</span>
13
13
  {%- endif %}
14
- <ul class="mb-0">
14
+ <ul class="mb-0 list-unstyled">
15
15
  {%- for link in column.children %}
16
16
  {%- if link.url != nil and link.external_url == nil%}
17
17
  <li><a href="{{ link.url | relative_url }}">{{link.url_text}}</a></li>
@@ -1,4 +1,8 @@
1
- {%- assign tools = site.data.tool_and_resource_list | where:"related_pages", include.tag %}
1
+ {%- if include.tag %}
2
+ {%- assign tools = site.data.tool_and_resource_list | add_related_pages | where:"related_pages", include.tag | sort_natural: "name" %}
3
+ {%- else %}
4
+ {%- assign tools = site.data.tool_and_resource_list | add_related_pages | sort_natural: "name" %}
5
+ {%- endif %}
2
6
  {%- assign country_pages = site.pages | where_exp: "item", "item.search_exclude != true" | where_exp:"item","item.national_resources != nil" %}
3
7
  {%- unless tools.size == 0 or tools == nil %}
4
8
  {%- if include.tag %}
@@ -24,13 +28,13 @@
24
28
  </tr>
25
29
  </thead>
26
30
  <tbody>
27
- {%- for tool in tools | sort %}
31
+ {%- for tool in tools %}
28
32
  <tr>
29
33
  {%- assign instances_tool = 0 %}
30
34
  {%- assign total_county_tools = 0 %}
31
35
  {%- assign query = "related_pages." | append: page.type %}
32
36
  {%- for country_page in country_pages %}
33
- {%- assign instance_matches = country_page.national_resources | where: "instance_of", tool.name | where_exp:"resource","resource.related_pages != nil" | where: query, include.tag %}
37
+ {%- assign instance_matches = country_page.national_resources | where: "instance_of", tool.id | where_exp:"resource","resource.related_pages != nil" | where: query, include.tag %}
34
38
  {%- assign tool_matches = country_page.national_resources | where_exp:"resource","resource.related_pages != nil" | where: query, include.tag %}
35
39
  {%- unless tool_matches.size == 0 %}
36
40
  {%- assign total_county_tools = total_county_tools | plus: tool_matches.size %}
@@ -45,10 +49,11 @@
45
49
  <td>{{tool.name}}</td>
46
50
  {%- endif %}
47
51
  <td>{{tool.description}}
48
- {%- if instances_tool != 0 and total_county_tools != 0 and include.tag != nil or tool.instance_of or tool.how_to_access %}
52
+ {%- if tool.instance_of or tool.how_to_access or instances_tool != 0 and total_county_tools != 0 and include.tag != nil %}
53
+ {%- assign linked_tool = site.data.tool_and_resource_list | where:"id", tool.instance_of | first %}
49
54
  <div class="d-block mt-1">
50
- {%- if tool.instance_of %}
51
- <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>
55
+ {%- if linked_tool %}
56
+ <span class="d-inline-block" tabindex="0" data-bs-toggle="tooltip" title="This resource is an instance of {{linked_tool.name}}"><span class="badge text-primary border border-primary">{{linked_tool.name}}</span></span>
52
57
  {%- endif %}
53
58
  {%- if tool.how_to_access %}
54
59
  <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>
@@ -65,7 +70,7 @@
65
70
  {%- for tag in tool.related_pages %}
66
71
  {%- unless tag == page.page_id %}
67
72
  {%- assign related_page = site.pages | where:"page_id",tag | first %}
68
- <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}}</span></a>
73
+ <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>
69
74
  {%- endunless %}
70
75
  {%- endfor %}
71
76
  {%- endcapture %}
@@ -83,6 +88,9 @@
83
88
  {%- if tool.registry.tess %}
84
89
  <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>
85
90
  {%- endif %}
91
+ {%- if tool.registry.europmc %}
92
+ <a data-bs-toggle="tooltip" data-bs-original-title="EuroPMC" href="https://europepmc.org/article/MED/{{tool.registry.europmc}}"><span class="badge bg-dark text-white hover-primary"><i class="fa-solid fa-book me-2"></i>Publication</span></a>
93
+ {%- endif %}
86
94
  </td>
87
95
  </tr>
88
96
  {%- endfor %}
@@ -94,9 +102,9 @@
94
102
  {%- assign hide_ids = "resource_title" %}
95
103
  {%- for country_page in country_pages %}
96
104
  {%- if include.tag %}
97
- {%- assign tool_matches = country_page.national_resources| where_exp:"resource","resource.related_pages != nil" | where: query, include.tag %}
105
+ {%- assign tool_matches = country_page.national_resources | where_exp:"resource","resource.related_pages != nil" | where: query, include.tag | sort_natural: "name" %}
98
106
  {%- else %}
99
- {%- assign tool_matches = country_page.national_resources %}
107
+ {%- assign tool_matches = country_page.national_resources | sort_natural: "name" %}
100
108
  {%- endif %}
101
109
  {%- for tool in tool_matches %}
102
110
  {%- assign tool_id = tool.name | slugify %}
@@ -109,8 +117,11 @@
109
117
  {%- endif %}
110
118
  <td>{{tool.description | markdownify }}
111
119
  {%- if tool.instance_of or tool.how_to_access %}
120
+ {%- assign linked_tool = site.data.tool_and_resource_list | where:"id", tool.instance_of | first %}
112
121
  <div class="d-block mt-1">
113
- <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>
122
+ {%- if linked_tool %}
123
+ <span class="d-inline-block" tabindex="0" data-bs-toggle="tooltip" title="This resource is an instance of {{linked_tool.name}}"><span class="badge text-primary border border-primary">{{linked_tool.name}}</span></span>
124
+ {%- endif %}
114
125
  {%- if tool.how_to_access %}
115
126
  <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>
116
127
  {%- endif %}
@@ -124,7 +135,7 @@
124
135
  {%- for tag in section[1] %}
125
136
  {%- unless tag == page.page_id %}
126
137
  {%- assign related_page = site.pages | where:"page_id",tag | first %}
127
- <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}}</span></a>
138
+ <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>
128
139
  {%- endunless %}
129
140
  {%- endfor %}
130
141
  {%- endunless %}
@@ -147,6 +158,9 @@
147
158
  {%- if tool.registry.tess %}
148
159
  <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>
149
160
  {%- endif %}
161
+ {%- if tool.registry.europmc %}
162
+ <a data-bs-toggle="tooltip" data-bs-original-title="EuroPMC" href="https://europepmc.org/article/MED/{{tool.registry.europmc}}"><span class="badge bg-dark text-white hover-primary"><i class="fa-solid fa-book me-2"></i>Publication</span></a>
163
+ {%- endif %}
150
164
  </td>
151
165
  </tr>
152
166
  {%- endfor %}
@@ -29,8 +29,11 @@
29
29
  {%- endif %}
30
30
  <td>{{tool.description | markdownify }}
31
31
  {%- if tool.instance_of or tool.how_to_access %}
32
+ {%- assign linked_tool = site.data.tool_and_resource_list | where:"id", tool.instance_of | first %}
32
33
  <div class="d-block mt-1">
33
- <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>
34
+ {%- if linked_tool %}
35
+ <span class="d-inline-block" tabindex="0" data-bs-toggle="tooltip" title="This resource is an instance of {{linked_tool.name}}"><span class="badge text-primary border border-primary">{{linked_tool.name}}</span></span>
36
+ {%- endif %}
34
37
  {%- if tool.how_to_access %}
35
38
  <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>
36
39
  {%- endif %}
@@ -44,7 +47,7 @@
44
47
  {%- for tag in section[1] %}
45
48
  {%- unless tag == page.page_id %}
46
49
  {%- assign related_page = site.pages | where:"page_id",tag | first %}
47
- <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}}</span></a>
50
+ <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>
48
51
  {%- endunless %}
49
52
  {%- endfor %}
50
53
  {%- endunless %}
@@ -67,6 +70,9 @@
67
70
  {%- if tool.registry.tess %}
68
71
  <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>
69
72
  {%- endif %}
73
+ {%- if tool.registry.europmc %}
74
+ <a data-bs-toggle="tooltip" data-bs-original-title="EuroPMC" href="https://europepmc.org/article/MED/{{tool.registry.europmc}}"><span class="badge bg-dark text-white hover-primary"><i class="fa-solid fa-book me-2"></i>Publication</span></a>
75
+ {%- endif %}
70
76
  </td>
71
77
  </tr>
72
78
  {%- endfor %}
@@ -76,7 +82,7 @@
76
82
  <div id="skip-tool-table-1"></div>
77
83
  {%- endif %}
78
84
  {%- if page.ref_to_main_resources %}
79
- {%- assign tool_names = page.ref_to_main_resources %}
85
+ {%- assign tool_ids = page.ref_to_main_resources %}
80
86
  <h3>{{page.title}} contributes to</h3>
81
87
  <p>Institutions and organisations in {{page.title}} are actively involved in the development of the following tools and resources.</p>
82
88
  <a class="visually-hidden-focusable" href='#skip-tool-table-2'>Skip tool table</a>
@@ -95,8 +101,8 @@
95
101
  </tr>
96
102
  </thead>
97
103
  <tbody>
98
- {%- for tool_name in tool_names | sort %}
99
- {%- assign tool = site.data.tool_and_resource_list | where:"name", tool_name | first %}
104
+ {%- for tool_id in tool_ids | sort %}
105
+ {%- assign tool = site.data.tool_and_resource_list | where:"id", tool_id | first %}
100
106
  <tr>
101
107
  {% if tool.url %}
102
108
  <td><a href="{{tool.url}}">{{tool.name}}</a>
@@ -106,9 +112,11 @@
106
112
  {%- endif %}
107
113
  <td>{{tool.description | markdownify }}
108
114
  {%- if tool.instance_of or tool.how_to_access %}
115
+ {%- assign linked_tool = site.data.tool_and_resource_list | where:"id", tool.instance_of | first %}
109
116
  <div class="d-block mt-1">
110
- <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>
111
- {%- if tool.how_to_access %}
117
+ {%- if linked_tool %}
118
+ <span class="d-inline-block" tabindex="0" data-bs-toggle="tooltip" title="This resource is an instance of {{linked_tool.name}}"><span class="badge text-primary border border-primary">{{linked_tool.name}}</span></span>
119
+ {%- endif %} {%- if tool.how_to_access %}
112
120
  <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>
113
121
  {%- endif %}
114
122
  </div>
@@ -118,7 +126,7 @@
118
126
  {%- for tag in tool.related_pages %}
119
127
  {%- unless tag == page.page_id %}
120
128
  {%- assign related_page = site.pages | where:"page_id",tag | first %}
121
- <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}}</span></a>
129
+ <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>
122
130
  {%- endunless %}
123
131
  {%- endfor %}
124
132
  {%- endcapture %}
@@ -136,6 +144,9 @@
136
144
  {%- if tool.registry.tess %}
137
145
  <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>
138
146
  {%- endif %}
147
+ {%- if tool.registry.europmc %}
148
+ <a data-bs-toggle="tooltip" data-bs-original-title="EuroPMC" href="https://europepmc.org/article/MED/{{tool.registry.europmc}}"><span class="badge bg-dark text-white hover-primary"><i class="fa-solid fa-book me-2"></i>Publication</span></a>
149
+ {%- endif %}
139
150
  </td>
140
151
  </tr>
141
152
  {%- endfor %}
@@ -143,4 +154,4 @@
143
154
  </table>
144
155
  </div>
145
156
  <div id="skip-tool-table-2"></div>
146
- {%- endif %}
157
+ {%- endif %}
@@ -1,6 +1,6 @@
1
1
  {%- assign allcountries = site.data.countries %}
2
2
  {%- assign except = include.except | split: ", " %}
3
- <div class="row row-cols-1 row-cols-md-2 g-3 my-4 navigation-tiles">
3
+ <div class="row row-cols-1 row-cols-md-2 row-cols-lg-{{ include.col | default: 2 }} g-3 my-4 navigation-tiles">
4
4
  {%- for current_page in site.pages | sorted %}
5
5
  {%- if current_page.title and current_page.search_exclude != true and current_page.type == include.type %}
6
6
  {%- unless except contains current_page.name %}
@@ -46,7 +46,7 @@
46
46
  {%- endunless %}
47
47
  </div>
48
48
  {%- endunless %}
49
- <div class="row row-cols-1 row-cols-md-2 g-4 mb-5 navigation-tiles">
49
+ <div class="row row-cols-1 row-cols-md-2 row-cols-lg-{{ include.col | default: 2 }} g-4 mb-5 navigation-tiles">
50
50
  {%- for current_page in site.pages | sorted %}
51
51
  {%- assign affiliations_classes = "" %}
52
52
  {%- assign related_pages_classes = "" %}
@@ -21,7 +21,7 @@
21
21
  <a class="btn text-start d-block mb-1 sidebar-title disabled" aria-disabled="true">{{sidebar.title}} {{sidebar.version}}</a>
22
22
  {%- endif %}
23
23
  {%- endif %}
24
- <ul class="list-unstyled mb-4 mb-lg-0">
24
+ <ul class="list-unstyled mb-4">
25
25
  {%- for folder in sidebar.subitems %}
26
26
  {%- if page.url == folder.url %}
27
27
  <li class="active{%- if folder.hr %} mt-3{% endif %}">
data/_includes/toc.html CHANGED
@@ -1,8 +1,11 @@
1
+ {%- unless page.toc == false %}
1
2
  <script>
2
3
  $(document).ready(function () {
3
- $('#toc').toc({ minimumHeaders: {{site.theme_variables.toc.min_headers | default: 2 }}, listType: 'ul', noBackToTopLinks: true, showSpeed: 0, headers: '{{site.theme_variables.toc.headers | default: 'main h2' }}' , title: '', classes:{toc:'p-3 rounded my-4'} });
4
+ $('#toc-contents').toc({ minimumHeaders: {{site.theme_variables.toc.min_headers | default: 2 }}, listType: 'ul', classes: { list: 'list-unstyled' }, noBackToTopLinks: true, showSpeed: 0, headers: '{{site.theme_variables.toc.headers | default: 'main h2' }}' , title: '<strong class="my-2">On this page</strong><hr class="my-2">' });
4
5
  });
5
6
  </script>
6
- <div class="col-12 col-sm-7 col-xl-5">
7
- <div id="toc"></div>
8
- </div>
7
+ <button id="btn-toc-hide" class="btn bg-light d-lg-none hover-primary mb-3" type="button" data-bs-toggle="collapse" data-bs-target="#toc-contents" aria-expanded="true" aria-controls="toc-contents">
8
+ <i class="fa-solid fa-up-right-and-down-left-from-center me-2"></i>On this page
9
+ </button>
10
+ <nav id="toc-contents" class="collapse" aria-label="Table of contents"></nav>
11
+ {%- endunless %}