Merge branch 'add-panosc-outcomes' into 'master'

Add PaNOSC outcomes

See merge request !7

Gemfile.lock

 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.4)
+      public_suffix (>= 2.0.2, < 6.0)
     colorator (1.1.0)
-    concurrent-ruby (1.1.8)
-    em-websocket (0.5.2)
+    concurrent-ruby (1.2.2)
+    em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
-      http_parser.rb (~> 0.6.0)
+      http_parser.rb (~> 0)
     eventmachine (1.2.7)
-    ffi (1.14.2)
+    ffi (1.15.5)
     forwardable-extended (2.6.0)
-    http_parser.rb (0.6.0)
-    i18n (1.8.9)
+    google-protobuf (3.23.3-x86_64-linux)
+    http_parser.rb (0.8.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    jekyll (4.2.0)
+    jekyll (4.3.2)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
       i18n (~> 1.0)
-      jekyll-sass-converter (~> 2.0)
+      jekyll-sass-converter (>= 2.0, < 4.0)
       jekyll-watch (~> 2.0)
-      kramdown (~> 2.3)
+      kramdown (~> 2.3, >= 2.3.1)
       kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
-      mercenary (~> 0.4.0)
+      mercenary (>= 0.3.6, < 0.5)
       pathutil (~> 0.9)
-      rouge (~> 3.0)
+      rouge (>= 3.0, < 5.0)
       safe_yaml (~> 1.0)
-      terminal-table (~> 2.0)
-    jekyll-sass-converter (2.1.0)
-      sassc (> 2.0.1, < 3.0)
+      terminal-table (>= 1.8, < 4.0)
+      webrick (~> 1.7)
+    jekyll-sass-converter (3.0.0)
+      sass-embedded (~> 1.54)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    kramdown (2.3.0)
+    kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    liquid (4.0.3)
-    listen (3.4.1)
+    liquid (4.0.4)
+    listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.4.0)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (4.0.6)
-    rb-fsevent (0.10.4)
+    public_suffix (5.0.1)
+    rake (13.0.6)
+    rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rexml (3.2.4)
-    rouge (3.26.0)
+    rexml (3.2.5)
+    rouge (4.1.2)
     safe_yaml (1.0.5)
-    sassc (2.4.0)
-      ffi (~> 1.9)
-    terminal-table (2.0.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
-    unicode-display_width (1.7.0)
+    sass-embedded (1.63.6)
+      google-protobuf (~> 3.23)
+      rake (>= 13.0.0)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    unicode-display_width (2.4.2)
+    webrick (1.8.1)
 
 PLATFORMS
-  ruby
+  x86_64-linux
 
 DEPENDENCIES
   jekyll
 
 BUNDLED WITH
-   2.1.4
+   2.4.15

_data/facilities.yml

@@ -11,6 +11,7 @@
           # link: https://visa.alba-cells.es
       - Search-API
       - FAIR-IF
+      - Search
     planned:
       - OAI-PMH
       - DS-wizard
@@ -63,6 +64,7 @@
       - AAI
     wip:
       - Search-API
+      - Search
     under-eval:
       - PaN-training
       - VISA
@@ -79,6 +81,7 @@
       - AAI
       - VINYL
       - FAIR-IF
+      - Search
     wip:
       - PaNET
     under-eval:
@@ -93,6 +96,7 @@
     adopted:
       - Search-API
       - OAI-PMH
+      - Search
     wip:
       - VISA
 
@@ -106,6 +110,7 @@
       - OAI-PMH
       - FAIR-IF
       - AAI
+      - Search
     wip:
       - VISA
       - PaN-training
@@ -156,6 +161,7 @@
       - FAIR-IF
       - AAI
       - VINYL
+      - Search
     wip:
       - Search-API
 
@@ -168,6 +174,7 @@
       - T&V-F
       - OAI-PMH
       - Search-API
+      - Search
     wip:
       - FAIR-IF
 
@@ -180,6 +187,7 @@
       - Search-API
       - OAI-PMH
       - PaNET
+      - Search
     planned:
       - FAIR-IF
     not:

_data/outcomes.yml

@@ -7,6 +7,7 @@
   doi: 10.5281/zenodo.7684470
   last-update: 2023-02-28
   keywords: standard, metadata, PID, search
+  adoption-table-relevant: true
 
 - name: Nexus ontology
   short-name: Nexus-O
@@ -34,6 +35,7 @@
   doi: 10.5281/zenodo.7743913
   last-update: 2023-03-17
   keywords: search, catalogue
+  adoption-table-relevant: true
 
 - name: OAI-PMH endpoint for data catalogues
   short-name: OAI-PMH
@@ -43,15 +45,16 @@
   doi: 10.5281/zenodo.7789134
   last-update: 2023-03-31
   keywords: standard, metadata, search, catalogue
+  adoption-table-relevant: true
 
 - name: PaN training catalogue
   short-name: PaN-training
-  project: ExPaNDS
-  description: Catalogue of training material, workflows and events for the PaN community
+  project: ExPaNDS, PaNOSC
+  description: Catalogue of training material, workflows and events for the PaN community and e-learning platform for online interactive courses with Jupyter notebooks
   status: in production
   doi: 10.5281/zenodo.7732603
   last-update: 2023-03-14
-  keywords: training
+  keywords: training, e-learning
 
 - name: VISA
   short-name: VISA
@@ -61,6 +64,7 @@
   doi: 10.5281/zenodo.7788839
   last-update: 2023-03-31
   keywords: data analysis, compute, data access
+  adoption-table-relevant: true
 
 - name: PaN FAIR implementation framework
   short-name: FAIR-IF
@@ -70,6 +74,7 @@
   doi: 10.5281/zenodo.7804712
   last-update: 2023-04-12
   keywords: FAIR, data policy, metadata, DMPs, PIDs, FAIR assessment, RDM
+  adoption-table-relevant: true
   
 - name: Testing and validation framework
   short-name: T&V-F
@@ -79,3 +84,31 @@
   doi: 10.5281/zenodo.7867091
   last-update: 2023-05-04
   keywords: research software, data analysis, testing, validation, software quality
+
+- name: European Photon and Neutron open data search portal
+  short-name: Search
+  project: PaNOSC
+  description: Federated search engine for PaN data across Europe
+  status: in production
+  link: https://data.panosc.eu
+  keywords: search, metadata, open data
+  adoption-table-relevant: true
+  last-update: 2023-07-17
+
+- name: PaN software catalogue
+  short-name: SWcat
+  link: https://software.pan-data.eu/
+  project: PaNOSC
+  status: in production
+  description: Database of software used mainly for data analysis of neutron and photon experiments
+  keywords: search, research software, data analysis
+  last-update: 2023-07-17
+
+- name: Virtual neutron and x-ray laboratory
+  short-name: ViNYL
+  description: Simulation and modelling of PaN sources, beamlines and experimental instruments
+  project: PaNOSC
+  status: in production
+  keywords: simulation, digital twin
+  doi: 10.5281/zenodo.6562106
+  last-update: 2022-05-18

_sass/main.scss

@@ -37,6 +37,11 @@ h1, th, strong, .focus {
 h1 {
   padding-top: $padding-big;
   font-size: $big-font-size;
+  a {
+    color: inherit;
+    font-size: inherit;
+    text-decoration: none;
+  }
 }
 
 h2 {
@@ -60,6 +65,7 @@ p, td {
 // links
 a:hover {
   color: $color-strong;
+  text-decoration: underline;
 }
 
 // images

_sass/variables.scss

@@ -10,7 +10,7 @@ $resp-small-font-size: 12px;
 $resp-big-font-size: 16px;
 
 $padding-std: 8px;
-$padding-small: $padding-std / 2.1;
+$padding-small: calc($padding-std / 2.1);
 $padding-big: 3 * $padding-std;
 $line-height-std: 1.4;
 $border-std: 1px;
@@ -22,8 +22,8 @@ $resp-margin-std: 80px;
 $resp-margin-small: $resp-margin-std * 0.7;
 $resp-margin-big: 2 * $resp-margin-std;
 
-$box-size: $max-width / 3 - $margin-std;
-$resp-box-size: $resp-max-width / 3 - $resp-margin-std;
+$box-size: calc($max-width / 3) - $margin-std;
+$resp-box-size: calc($resp-max-width / 3) - $resp-margin-std;
 
 $color-strong: hsl(221, 81%, 30%);
 $color-fade: hsl(221, 81%, 95%);

outcomes.html

@@ -16,7 +16,11 @@ The adoption status of these outcomes by our member facilities is shown <a href=
 {% for outcome in sorted_outcomes %}
   {% assign uniqid = outcome.name | split: " " | join: "-" %}
   <h1 id="{{uniqid}}">
-    {{ outcome.name }}
+    {% if outcome.link %}<a href="{{ outcome.link }}">
+      {{ outcome.name }}</a>
+    {% else %}
+      {{ outcome.name }}
+    {% endif %}
     {% if outcome.doi %}<a href="https://doi.org/{{ outcome.doi }}"><img src="https://zenodo.org/badge/DOI/{{ outcome.doi }}.svg" alt="(link)" style="float: right"></a>{% endif %}
     {% if outcome.keywords %}
       {% assign keywords = outcome.keywords | split: ", " | sort_natural %}
@@ -34,7 +38,7 @@ The adoption status of these outcomes by our member facilities is shown <a href=
 {% endfor %}
 
 <h1 id="adoption-table">Adoption status</h1>
-{% assign adoption_outcomes = site.data.outcomes | sort_natural %} <!-- must be filtered according to need for a facility-based adoption or not -->
+{% assign adoption_outcomes = site.data.outcomes | sort_natural | where:"adoption-table-relevant",true %}
 <table>
   <tr>
     <th><strong>Facility</strong></th>