fixing confilcts

.github/workflows/tool_list_conversion.yml

@@ -55,10 +55,6 @@ jobs:
         run: | 
           python var/tools_validator.py --reg --username ${{ secrets.FAIRSHARING_USERNAME }} --password "${{ secrets.FAIRSHARING_PASSWORD }}"
 
-      - name: Fetch country names with corresponding iso
-        run: |
-          python var/country_list.py
-
       - name: Update markdown pages with DSW links
         run: |
           python var/dsw_integration.py

CODEOWNERS

@@ -11,12 +11,12 @@
 CONTRIBUTING.md       @floradanna @pinarpink
 
 # Different Sections
-/pages/your_tasks       @DanFaria @floradanna @nazeeefa
+/pages/your_tasks       @DanFaria @floradanna @nazeeefa @marikapop @diana-pilvar
 /pages/your_role       @smza @pinarpink
-/pages/data_life_cycle       @wittigue @floradanna @smza
+/pages/data_life_cycle       @wittigue @floradanna @smza @marikapop
 /pages/tool_assembly       @korbinib @bianchini88
 /pages/your_domain       @DanFaria @pinarpink @bianchini88 @lauportell
-/pages/national_resources       @lauportell @nazeeefa
+/pages/national_resources       @lauportell @nazeeefa @diana-pilvar
 
 #About
 /pages/about/about.md       @frederikcoppens @CaroleGoble

Gemfile

@@ -1,17 +1,18 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-gem "elixir-toolkit-theme-plugins", "~> 0.1.9"
-gem "webrick", "~> 1.7"
-gem "jekyll", "~> 4.3.1"
-gem "jemoji", "~> 0.13.0"
-gem "kramdown-parser-gfm", "~> 1.1"
+gem 'elixir-toolkit-theme-plugins', '~> 0.1.9'
+gem 'webrick', '~> 1.7'
+gem 'jekyll', '~> 4.3.1'
+gem 'jemoji', '~> 0.13.0'
+gem 'kramdown-parser-gfm', '~> 1.1'
+gem 'jekyll-octicons'
 
 group :jekyll_plugins do
-  gem "jekyll-redirect-from", "~> 0.16.0"
-  gem "jekyll-sitemap", "~> 1.4"
-  gem "jekyll-github-metadata", "~> 2.15"
-  gem "jekyll-relative-links", "~> 0.6"
-  gem "jekyll-seo-tag", "~> 2.8"
-  gem "jekyll-remote-theme"
+  gem 'jekyll-redirect-from', '~> 0.16.0'
+  gem 'jekyll-sitemap', '~> 1.4'
+  gem 'jekyll-github-metadata', '~> 2.15'
+  gem 'jekyll-relative-links', '~> 0.6'
+  gem 'jekyll-seo-tag', '~> 2.8'
+  gem 'jekyll-remote-theme'
 end
 

README.md

@@ -29,7 +29,7 @@ Do you which to contact the editors of this project? Use [rdm-editors@elixir-eur
 If you want to build the website locally, please have a look at our [tutorial](working_with_git#the-advantage-of-working-locally-previewing-your-changes-through-your-web-browser).
 
 
-## RDMkit is an ELIXIR Converge project
+## RDMkit is an ELIXIR product
 
 ELIXIR is an intergovernmental organisation that brings together life science resources from across Europe. These resources include databases, software tools, training materials, cloud storage and supercomputers. All the ELIXIR National nodes and the special EMBL-EBI node have come to support data management within the Nodes and for data stewards, researchers and institutional data managers. The idea is to support data management at the point of creation and enable data to be "FAIR by Design". The development of a Research Data Management Kit will provide researchers with a strategy to manage their data to international standards. 
 
@@ -40,10 +40,8 @@ The process documents and data are made available under a CC-BY license. Softwar
 
 ## Acknowledgements
 
-The RDMkit is supported by:
-- ELIXIR-CONVERGE https://elixir-europe.org/about-us/how-funded/eu-projects/converge
-- Contributions from the 23 ELIXIR Nodes
+The RDMkit was supported by [ELIXIR-CONVERGE](https://elixir-europe.org/about-us/how-funded/eu-projects/converge) and it is coordinated by [ELIXIR Europe](https://elixir-europe.org/) and [NIH](https://www.nih.gov/).
 
 <br>
 <br>
-<a href="https://elixir-europe.org/about-us/how-funded/eu-projects/converge"><img src="https://raw.githubusercontent.com/elixir-europe/rdmkit/master/assets/img/converge_logo.svg" width="15%"></a>
+<a href="https://elixir-europe.org/about-us/how-funded/eu-projects/converge"><img src="https://raw.githubusercontent.com/elixir-europe/rdmkit/master/assets/img/elixir_logo_inverted.svg" width="15%"></a>

_config.yml

@@ -4,7 +4,7 @@ title: RDMkit
 description: "Best practices and guidelines you can use for FAIR management of your research data."
 # Metadata description of the website
 
-remote_theme: ELIXIR-Belgium/elixir-toolkit-theme@2.2.2
+remote_theme: ELIXIR-Belgium/elixir-toolkit-theme@2.4.0
 
 sass:
   style: compressed
@@ -141,3 +141,4 @@ plugins:
   - jekyll-redirect-from
   - jekyll-sitemap
   - jekyll-github-metadata
+  - jekyll-octicons

_data/CONTRIBUTORS.yaml

@@ -103,7 +103,6 @@ Niclas Jareborg:
     git: nicjar
     email: [email protected]
     orcid: 0000-0002-4520-044X
-    role: editor
     affiliation: NBIS / ELIXIR-SE
 Elin Kronander:
     git: elinkronander
@@ -173,6 +172,7 @@ Federico Bianchini:
     email: [email protected]
     orcid: 0000-0002-9016-4820
     role: editor
+    affiliation: University of Oslo / ELIXIR-NO
 Celia van Gelder:
     git: celiavg
     email: [email protected]
@@ -219,7 +219,9 @@ Anne-Françoise Adam-Blondon:
     affiliation: INRAE / ELIXIR-FR
 Nazeefa Fatima:
     git: Nazeeefa
+    orcid: 0000-0001-7791-4984
     role: editor
+    affiliation: Centre for Bioinformatics, University of Oslo / ELIXIR-NO
 Ernesto Picardi:
     email: [email protected]
     orcid: 0000-0002-6549-0114
@@ -495,9 +497,11 @@ Teresa D'Altri:
     orcid: 0000-0002-8146-5365
     affiliation: Center for Genomic Regulation
 Marina Popleteeva:
+    git: marikapop
     orcid: 0000-0002-8409-6147
     email: [email protected]
     affiliation: Luxembourg Centre for Systems Biomedicine, University of Luxembourg
+    role: editor
 Vilem Ded:
     git: vildead
     orcid: 0000-0001-9235-8496
@@ -573,9 +577,15 @@ Styliani-Christina Fragkouli:
     git: sfragkoul
     orcid: 0000-0003-4067-7123
     email: [email protected]
-    affiliation: Institute of Applied Biosciences(INAB|CERTH) / University of Athens / ELIXIR-GR  
+    affiliation: Institute of Applied Biosciences(INAB|CERTH) / University of Athens / ELIXIR-GR
 Sveinung Gundersen:
     git: sveinugu
     orcid: 0000-0001-9888-7954
     email: [email protected]
     affiliation: ELIXIR Norway  
+Diana Pilvar:
+    git: diana-pilvar
+    email: [email protected]
+    orcid: 0000-0002-5788-2687
+    affiliation: University of Tartu / ELIXIR-Estonia
+    role: editor