elixir-toolkit-theme 1.16.0 → 1.17.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: e594bc835007894473c6ddf99303cb504e9185fc6941e9c623dffeaf7fcca1fe
4
- data.tar.gz: fcaedf30964ced54fb8e46a052fc051ce60e636f0b74589bc8d321a38b9d655b
3
+ metadata.gz: faa89cf0a705783f323a0752072a8e207c05a0aa2af59350dd048707bd56fa93
4
+ data.tar.gz: cd5d72045a94edecdc128ecc085d0aa1e276c9da7abd1c14f062694f7ae6f790
5
5
  SHA512:
6
- metadata.gz: 385835a9201de2cf2d7dac08ec02b2811cb3b3d35cc42c28c350aab5f5366f5406fc8493dbf0371eeaa42fe2d3a2aa24f627a5a1a94f65fb7a439fbaf10d42cd
7
- data.tar.gz: f8b225c028e67571f9e4df65a1038911650a63f20be7feeefaa36f3e3158481ed3bd5d89790954b7c9166507cfc3e4eaa3c49fb8c7e206e0df727d1f37830119
6
+ metadata.gz: ae9c134c870219a3c626069f6ecfac20840b6d8d3e44b800f69dc859ac61d8d8eb1d5fc6e9d57bf4bf9a4210ca33ba6069b0058abf16d78c5223a5be9a9caf24
7
+ data.tar.gz: 7a912281fd2e2cdffff99a9de4525a66336abaf03d23959aaed7c6ff5b2261eba7ca6f7ec97727b89d8735568536c22c19b1a430ba365625f421bb4dfb7eefc6
data/_includes/head.html CHANGED
@@ -6,9 +6,17 @@
6
6
  {%- capture keywords %}
7
7
  {%- if page.related_pages %}
8
8
  {%- for section in page.related_pages %}
9
- {%- unless section[1] == nil %}{{ section[1] | join: ', ' }}
10
- {%- endunless %}
9
+ {%- unless section[1] == nil %}
10
+ {%- for keywordstr in section[1] %}
11
+ {%- assign keywordpage = site.pages | where: "page_id", keywordstr | first %}
12
+ {%- if allkeywords %}
13
+ {%- assign allkeywords = allkeywords | append: ", " | append: keywordstr | append: ", " | append: keywordpage.title %}
14
+ {%- else %}
15
+ {%- assign allkeywords = allkeywords | append: keywordstr | append: ", " | append: keywordpage.title %}
16
+ {%- endif %}
11
17
  {%- endfor %}
18
+ {%- endunless %}
19
+ {%- endfor %}{{allkeywords}}
12
20
  {%- endif %}
13
21
  {%- endcapture %}
14
22
  <meta name="keywords" content="{{keywords}}">
@@ -1,12 +1,12 @@
1
1
  {%- assign tools = site.data.tool_and_resource_list | where:"related_pages", include.tag %}
2
- {%- assign country_pages = site.pages | where_exp: "item", "item.search_exclude != true" | where_exp:"item","item.resources != nil" %}
2
+ {%- assign country_pages = site.pages | where_exp: "item", "item.search_exclude != true" | where_exp:"item","item.national_resources != nil" %}
3
3
  {%- unless tools.size == 0 %}
4
4
  {%- if include.tag %}
5
5
  <h2>Relevant tools and resources</h2>
6
6
  {%- endif %}
7
7
  <a class="visually-hidden-focusable" href='#skip-tool-table'>Skip tool table</a>
8
8
  <div class="table-responsive mt-4 mb-5">
9
- <table id="tooltable" class="table display">
9
+ <table class="tooltable table display">
10
10
  <thead>
11
11
  <tr class="text-nowrap">
12
12
  <th>Tool or resource {%- if include.tag -%}
@@ -26,12 +26,12 @@
26
26
  <tbody>
27
27
  {%- for tool in tools | sort %}
28
28
  <tr>
29
- {%- assign total_county_tools = 0 %}
30
29
  {%- assign instances_tool = 0 %}
30
+ {%- assign total_county_tools = 0 %}
31
31
  {%- assign query = "related_pages." | append: page.type %}
32
32
  {%- for country_page in country_pages %}
33
- {%- assign instance_matches = country_page.resources | where: "instance_of", tool.name | where_exp:"resource","resource.related_pages != nil" | where: query, include.tag %}
34
- {%- assign tool_matches = country_page.resources | where_exp:"resource","resource.related_pages != nil" | where: query, include.tag %}
33
+ {%- assign instance_matches = country_page.national_resources | where: "instance_of", tool.name | where_exp:"resource","resource.related_pages != nil" | where: query, include.tag %}
34
+ {%- assign tool_matches = country_page.national_resources | where_exp:"resource","resource.related_pages != nil" | where: query, include.tag %}
35
35
  {%- unless tool_matches.size == 0 %}
36
36
  {%- assign total_county_tools = total_county_tools | plus: tool_matches.size %}
37
37
  {%- endunless %}
@@ -39,17 +39,27 @@
39
39
  {%- assign instances_tool = instances_tool | plus: instance_matches.size %}
40
40
  {%- endunless %}
41
41
  {%- endfor %}
42
- {% if tool.link %}
43
- <td><a href="{{tool.link}}">{{tool.name}}</a></td>
42
+ {% if tool.url %}
43
+ <td><a href="{{tool.url}}">{{tool.name}}</a></td>
44
44
  {%- else %}
45
45
  <td>{{tool.name}}</td>
46
46
  {%- endif %}
47
47
  <td>{{tool.description}}
48
- {%- unless instances_tool == 0 or total_county_tools == 0 or include.tag == nil %}
49
- <a href="#national-resources-button" class="d-block mt-1">
50
- <span class="badge text-white bg-primary"><i class="fa-solid fa-arrow-circle-down me-2"></i>Different instances available</span>
51
- </a>
52
- {%- endunless %}
48
+ {%- if instances_tool != 0 and total_county_tools != 0 and include.tag != nil or tool.instance_of or tool.how_to_access %}
49
+ <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>
52
+ {%- endif %}
53
+ {%- if tool.how_to_access %}
54
+ <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>
55
+ {%- endif %}
56
+ {%- unless instances_tool == 0 or total_county_tools == 0 or include.tag == nil %}
57
+ <a href="#national-resources-button">
58
+ <span class="badge text-white bg-primary"><i class="fa-solid fa-arrow-circle-down me-2"></i>Different instances available</span>
59
+ </a>
60
+ {%- endunless %}
61
+ </div>
62
+ {%- endif %}
53
63
  </td>
54
64
  {%- capture related_pages %}
55
65
  {%- for tag in tool.related_pages %}
@@ -84,9 +94,9 @@
84
94
  {%- assign hide_ids = "resource_title" %}
85
95
  {%- for country_page in country_pages %}
86
96
  {%- if include.tag %}
87
- {%- assign tool_matches = country_page.resources| where_exp:"resource","resource.related_pages != nil" | where: query, include.tag %}
97
+ {%- assign tool_matches = country_page.national_resources| where_exp:"resource","resource.related_pages != nil" | where: query, include.tag %}
88
98
  {%- else %}
89
- {%- assign tool_matches = country_page.resources %}
99
+ {%- assign tool_matches = country_page.national_resources %}
90
100
  {%- endif %}
91
101
  {%- for tool in tool_matches %}
92
102
  {%- assign tool_id = tool.name | slugify %}
@@ -124,7 +134,20 @@
124
134
  {%- else %}
125
135
  <td></td>
126
136
  {%- endif %}
127
- <td></td>
137
+ <td>
138
+ {%- if tool.registry.biotools %}
139
+ <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>
140
+ {%- endif %}
141
+ {%- if tool.registry.fairsharing %}
142
+ <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>
143
+ {%- endif %}
144
+ {%- if tool.registry.fairsharing-coll %}
145
+ <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>
146
+ {%- endif %}
147
+ {%- if tool.registry.tess %}
148
+ <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
+ {%- endif %}
150
+ </td>
128
151
  </tr>
129
152
  {%- endfor %}
130
153
  {%- endfor %}
@@ -1,14 +1,21 @@
1
- {%- if page.resources %}
2
- {%- assign tools = page.resources %}
3
- <h2>Relevant tools and resources</h2>
4
- <a class="visually-hidden-focusable" href='#skip-tool-table'>Skip tool table</a>
1
+ {%- if page.national_resources %}
2
+ {%- assign tools = page.national_resources %}
3
+ <h2>Tools and resources</h2>
4
+ <h3>Tailored to users in {{page.title}}</h3>
5
+ <p>Developed and/or deployed by institutions and organisations in {{page.title}}.</p>
6
+ <a class="visually-hidden-focusable" href='#skip-tool-table-1'>Skip tool table</a>
5
7
  <div class="table-responsive mt-4 mb-5">
6
- <table id="tooltable" class="table display">
8
+ <table class="tooltable table display">
7
9
  <thead>
8
10
  <tr class="text-nowrap">
9
11
  <th>Resource</th>
10
12
  <th>Description</th>
11
13
  <th>Related pages</th>
14
+ <th>Registry
15
+ <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.">
16
+ <i class="fa-solid fa-info-circle"></i>
17
+ </a>
18
+ </th>
12
19
  </tr>
13
20
  </thead>
14
21
  <tbody>
@@ -47,11 +54,93 @@
47
54
  {%- else %}
48
55
  <td></td>
49
56
  {%- endif %}
57
+ <td>
58
+ {%- if tool.registry.biotools %}
59
+ <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>
60
+ {%- endif %}
61
+ {%- if tool.registry.fairsharing %}
62
+ <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>
63
+ {%- endif %}
64
+ {%- if tool.registry.fairsharing-coll %}
65
+ <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>
66
+ {%- endif %}
67
+ {%- if tool.registry.tess %}
68
+ <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
+ {%- endif %}
70
+ </td>
50
71
  </tr>
51
72
  {%- endfor %}
52
73
  </tbody>
53
74
  </table>
54
75
  </div>
55
- <div id="skip-tool-table"></div>
56
-
76
+ <div id="skip-tool-table-1"></div>
57
77
  {%- endif %}
78
+ {%- if page.ref_to_main_resources %}
79
+ {%- assign tool_names = page.ref_to_main_resources %}
80
+ <h3>{{page.title}} contributes to</h3>
81
+ <p>Institutions and organisations in {{page.title}} are actively involved in the development of the following tools and resources.</p>
82
+ <a class="visually-hidden-focusable" href='#skip-tool-table-2'>Skip tool table</a>
83
+ <div class="table-responsive mt-4 mb-5">
84
+ <table class="tooltable table display">
85
+ <thead>
86
+ <tr class="text-nowrap">
87
+ <th>Resource</th>
88
+ <th>Description</th>
89
+ <th>Related pages</th>
90
+ <th>Registry
91
+ <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.">
92
+ <i class="fa-solid fa-info-circle"></i>
93
+ </a>
94
+ </th>
95
+ </tr>
96
+ </thead>
97
+ <tbody>
98
+ {%- for tool_name in tool_names | sort %}
99
+ {%- assign tool = site.data.tool_and_resource_list | where:"name", tool_name | first %}
100
+ <tr>
101
+ {% if tool.url %}
102
+ <td><a href="{{tool.url}}">{{tool.name}}</a>
103
+ </td>
104
+ {%- else %}
105
+ <td>{{tool.name}}</td>
106
+ {%- endif %}
107
+ <td>{{tool.description | markdownify }}
108
+ {%- if tool.instance_of or tool.how_to_access %}
109
+ <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 %}
112
+ <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
+ {%- endif %}
114
+ </div>
115
+ {%- endif %}
116
+ </td>
117
+ {%- capture related_pages %}
118
+ {%- for tag in tool.related_pages %}
119
+ {%- unless tag == page.page_id %}
120
+ {%- assign related_page = site.pages | where:"page_id",tag | first %}
121
+ <a href="{{related_page.url | relative_url }}"><span class="badge default-badge">{{related_page.title}}</span></a>
122
+ {%- endunless %}
123
+ {%- endfor %}
124
+ {%- endcapture %}
125
+ <td>{{related_pages}}</td>
126
+ <td>
127
+ {%- if tool.registry.biotools %}
128
+ <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>
129
+ {%- endif %}
130
+ {%- if tool.registry.fairsharing %}
131
+ <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>
132
+ {%- endif %}
133
+ {%- if tool.registry.fairsharing-coll %}
134
+ <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>
135
+ {%- endif %}
136
+ {%- if tool.registry.tess %}
137
+ <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
+ {%- endif %}
139
+ </td>
140
+ </tr>
141
+ {%- endfor %}
142
+ </tbody>
143
+ </table>
144
+ </div>
145
+ <div id="skip-tool-table-2"></div>
146
+ {%- endif %}
@@ -1,6 +1,6 @@
1
1
  <a class="visually-hidden-focusable" href='#skip-tool-table'>Skip tool table</a>
2
2
  <div class="table-responsive mt-4 mb-5">
3
- <table id="trainingtable" class="table display">
3
+ <table class="trainingtable table display">
4
4
  <thead>
5
5
  <tr class="text-nowrap">
6
6
  <th>Name
data/assets/css/main.scss CHANGED
@@ -39,10 +39,6 @@ main {
39
39
  margin-top: $spacer * 1.5;
40
40
  }
41
41
 
42
- h2+h3 {
43
- margin-top: $spacer * 0.5;
44
- }
45
-
46
42
  h3+h4 {
47
43
  margin-top: $spacer * 0.25;
48
44
  }
@@ -432,7 +428,7 @@ table {
432
428
 
433
429
  // Tool table column width optimizations
434
430
 
435
- #tooltable {
431
+ .tooltable {
436
432
  tr th:nth-child(1) {
437
433
  width: 25%;
438
434
  }
@@ -450,8 +446,8 @@ table {
450
446
  }
451
447
  }
452
448
 
453
- #tooltable td:nth-child(1) a,
454
- #trainingtable td:nth-child(1) a {
449
+ .tooltable td:nth-child(1) a,
450
+ .trainingtable td:nth-child(1) a {
455
451
  font-weight: bold;
456
452
  }
457
453
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: elixir-toolkit-theme
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.16.0
4
+ version: 1.17.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - bedroesb
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-05-27 00:00:00.000000000 Z
11
+ date: 2022-06-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: jekyll