Merge pull request #109 from ELIXIR-Belgium/new-layout

Move to latest version

.github/workflows/jekyll.yml

@@ -2,17 +2,52 @@ name: Jekyll site CI
 
 on:
   pull_request:
-    branches: [ master ]
+    branches: [ master, main ]
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  pages: write
+  id-token: write
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
-
     steps:
-    - uses: actions/checkout@v2
-    - name: Build the site in the jekyll/builder container
-      run: |
-        docker run \
-        -v ${{ github.workspace }}:/srv/jekyll --env PAGES_REPO_NWO=${{github.repository}} -v ${{ github.workspace }}/_site:/srv/jekyll/_site \
-        jekyll/builder:3.8.6 /bin/bash -c "gem install github-pages --no-document && chmod 777 /srv/jekyll && jekyll build"
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.inputs.branch }}
+
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.1'
+          bundler-cache: true
+          cache-version: 0
+
+      - name: Setup Pages
+        id: pages
+        uses: actions/configure-pages@v2
+
+      - name: Set Jekyll environment
+        id: name
+        run: |
+            echo "jekyll_env=production" >> $GITHUB_OUTPUT
+
+      - name: Install dependencies
+        run: |
+          bundle install
+
+      - name: Build with Jekyll
+        # Outputs to the './_site' directory by default
+        run: |
+          bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path }}"
+        env:
+          PAGES_REPO_NWO: ${{ github.repository }}
+          JEKYLL_BUILD_BRANCH: ${{ github.ref_name }}
+          JEKYLL_ENV: ${{ steps.name.outputs.jekyll_env }}
+          JEKYLL_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v1

Gemfile

@@ -1,5 +1,9 @@
 source "https://rubygems.org"
 
-group :jekyll_plugins do
-    gem "github-pages"
-  end
+
+# GitHub pages dependencies
+gem 'github-pages', group: :jekyll_plugins
+
+# Webrick needed for Ruby v3.0+ compatibility
+gem "webrick"
+

_config.yml

@@ -12,14 +12,19 @@ plausible: rdm.elixir-belgium.org
 plausible_src:  https://plausible.psb.ugent.be/js/plausible.js
 # default: 'https://plausible.io/js/plausible.js
 
-remote_theme: ELIXIR-Belgium/elixir-toolkit-theme@1.26.0
+remote_theme: ELIXIR-Belgium/elixir-toolkit-theme@2.0.0
 
 sass:
   style: compressed
   sourcemap: never
 
 exclude:
   - README.md
+  - .gitignore
+  - var/
+  - vendor
+  - Gemfile*
+  - LICENSE
 
 theme_variables:
   theme_color: de4d00

_sass/_custom_classes.scss

@@ -12,9 +12,20 @@ main {
     }
 }
 
+
+/*-----Spacing layout-----*/
+
+#content {
+    margin-bottom: 0!important;
+}
+
+#main {
+    margin-bottom: $spacer * 3;
+}
+
 /*-----Extra borders-----*/
 
-.btn-group .btn, #toc {
+.btn-group .btn, .contributor-cards .card {
     border: 1px solid $border-light;
 }
 
@@ -38,12 +49,6 @@ nav.navbar {
     color: $primary;
 }
 
-@media (max-width: 576px) {
-    .navbar-brand img {
-        height: 47px !important;
-    }
-}
-
 /*-----Size components-----*/
 
 .mw-600 {

pages/costs_sharing_reuse.md

@@ -1,7 +1,6 @@
 ---
 title: Costs for datasets sharing and reuse
 summary: Estimate the costs for sharing your data.
-toc: true
 ---
 
 ## 1. What are the estimated costs for making data more FAIR (Findable, Accessible, Interoperable, Reusable)?

pages/covid-19/covid-19-galaxy-upload.md

@@ -1,6 +1,5 @@
 ---
 permalink: covid-19/covid-19-galaxy-upload
-toc: false
 hide_sidebar: true
 search_exclude: true
 ---

pages/covid-19/ena-upload-container.md

@@ -1,6 +1,5 @@
 ---
 permalink: covid-19/ena-upload-container
-toc: false
 hide_sidebar: true
 search_exclude: true
 ---

pages/datasets_info.md

@@ -1,6 +1,5 @@
 ---
 title: Datasets information
-toc: true
 ---
 
 Give information about sets of numbers, words, images, video/audio, scripts, algorithms and software used or generated in the project to describe or analyse research subjects and materials (sample, specimen, biomolecules and other materials).

pages/dmp_q_explained.md

@@ -1,6 +1,5 @@
 ---
 title: DMP questions explained
-toc: true
 ---
 
 ## Introduction

pages/dmp_version_info.md

@@ -1,6 +1,5 @@
 ---
 title: DMP versioning information
-toc: true
 ---
 
 ## 1. Version number.

pages/doc_metadata.md

@@ -1,6 +1,5 @@
 ---
 title: Documentation and metadata
-toc: true
 ---
 
 Documentation and metadata: information about the data that is needed to enable finding, understanding and reuse of datasets by anyone.

pages/ethical_legal_issues.md

@@ -1,7 +1,6 @@
 ---
 title: Ethical and legal issues
 summary: Consult the Legal Team of the TechTransfer Office and the Data Protection Officer in your Institute or department to answer the following questions.
-toc: true
 ---
 
 ## 1. Will you use personal/sensitive data? If so, shortly describe the kind of personal data you will use AND add the reference to your file in your host institution's privacy register.

pages/long_term.md

@@ -1,7 +1,6 @@
 ---
 title: (Meta)Data long term preservation or archiving
 summary: Here, the terms "long term storage", "archiving" and "preservation" are used as synonyms.
-toc: true
 ---
 
 ## 1. List which datasets will be preserved or not for some years after the end of the project and explain why (legal, contractual restrictions etc..).

pages/other.md

@@ -1,6 +1,5 @@
 ---
 title: Other
-toc: true
 ---
 
 ## 1. Indicate whether other national/funder/sectorial/departmental procedures for data management are used.

pages/privacy.md

@@ -1,6 +1,5 @@
 ---
 title: Privacy
-toc: false
 ---
 
 This Privacy Policy explains what personal data is collected by the Research Data Management (RDM) Guide website.

pages/project_admin_info.md

@@ -1,6 +1,5 @@
 ---
 title: Project administrative information
-toc: true
 ---
 
 ## 1. Name applicant.

pages/responsibilities.md

@@ -1,6 +1,5 @@
 ---
 title: Responsibilities
-toc: true
 ---
 
 ## 1. Describe data quality assurance processes and who will be responsible for it.

pages/sharing_reuse.md

@@ -1,6 +1,5 @@
 ---
 title: Datasets sharing and reuse
-toc: true
 ---
 
 Datasets sharing

pages/storage_during.md

@@ -1,6 +1,5 @@
 ---
 title: (Meta)Data storage during the project
-toc: true
 ---
 
 ## 1. Where will the data be stored during the project?