Merge branch 'main' into chore/gitpod

elixir-europe-training · Nov 2, 2023 · 6460ede · 6460ede
2 parents 34ac3c2 + 316f57f
commit 6460ede
Show file tree

Hide file tree

Showing 25 changed files with 405 additions and 377 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -8,5 +8,6 @@ WORKDIR /usr/src/app
 
 COPY Gemfile ./
 RUN gem install bundler:2.4.21 && bundle install
+RUN gem install racc -v 1.7.1
 
 EXPOSE 4000
diff --git a/_config.yml b/_config.yml
@@ -44,6 +44,13 @@ defaults:
     values:
       type: "pages"
       sidebar: lifecycle
+  -
+    scope:
+      path: "pages/resources/resources.md"
+    values:
+      type: "resource_page"
+      layout: "page"
+      sidebar: resources
   -
     scope:
       path: "pages/resources"

diff --git a/_data/CONTRIBUTORS.yml b/_data/CONTRIBUTORS.yml
@@ -28,3 +28,12 @@ Geert van Geest:
     orcid: 0000-0002-1561-078X
     role: author
     affiliation: SIB Swiss Institute of Bioinformatics
+
+Jose Alejandro Romero Herrera:
+    orcid: 0000-0002-4765-2087
+    role: author
+    affiliation: Copenhangen University
+
+Elin Kronander:
+    role : author
+    affiliation: NBIS National Bioinformatics Infrastructure Sweden
diff --git a/_data/index/numbers.yml b/_data/index/numbers.yml
@@ -2,21 +2,21 @@
 # Icon can be any free icon from Font Awesome https://fontawesome.com/search?o=r&m=free
 
 - title: Trainers
-  number: 245
+  number: 267
   color: orange
   icon: fas fa-person-chalkboard
 
 - title: Courses
-  number: 1126
+  number: 1999
   color: blue
   icon: fas fa-book
 
-- title: TMD
-  number: 87
+- title: Trainees
+  number: 41346
   color: red
   icon: fas fa-database
 
-- title: Evaluations
-  number: 654
+- title: Countries
+  number: 62
   color: green
   icon: fas fa-chart-simple
diff --git a/_data/sidebars/resources.yml b/_data/sidebars/resources.yml
@@ -1,8 +1,6 @@
 title: Resources
 title_url: /resources
 subitems:
-  - title: TEMPLATE
-    url: /TEMPLATE_resource_page
   - title: TeSS
     url: /tess
   - title: Tango
@@ -13,3 +11,9 @@ subitems:
     url: /fair-training-handbook
   - title: Learning Paths
     url: /learning-paths
+  - title: ELIXIR lesson template
+    url: /elixir-lesson-template
+  - title: E-learning
+    url: /elearning
+  - title: FAIR Training Focus Group
+    url: /fair-training-focus-group
diff --git a/_includes/index/lifecycle.html b/_includes/index/lifecycle.html
diff --git a/_includes/index/roles-and-resources.html b/_includes/index/roles-and-resources.html
@@ -1,32 +1,30 @@
-<div class="col-12">
-    <h2>Resources</h2>
-</div>
-<div class="container py-3 mb-5 bg-red rounded text-white">
-    <div class="row">
-        <div class="col">
-            <a href="tess" style="color: white;">
-                <div><img src="assets/img/path323.svg" width="20px" style="margin-right: 10px;">TeSS</div>
-            </a> 
-        </div>
-        <div class="col">
-            <a href="train-the-trainer" style="color: white;">
-                <div><img src="assets/img/path323.svg" width="20px" style="margin-right: 10px;">Train-the-Trainer</div>
-            </a>
-        </div>
-        <div class="col">
-            <a href="tango" style="color: white;">
-                <div><img src="assets/img/path323.svg" width="20px" style="margin-right: 10px;">Tango</div>
-            </a>
-        </div>
-        <div class="col">
-            <a href="fair-training-handbook" style="color: white;">
-                <div><img src="assets/img/path323.svg" width="20px" style="margin-right: 10px;">FAIR Training Handbook</div>
-            </a>
-        </div>
-        <div class="col">
-            <a href="learning-paths" style="color: white;">
-                <div><img src="assets/img/path323.svg" width="20px" style="margin-right: 10px;">Learning Paths</div>
-            </a>
-        </div>
+<div class="row mb-5 py-5">
+    <div class="col-12">
+        <div class="text-center display-6 mb-5">Explore our Resources</div>
+    </div>
+    <div class="col">
+        <a class="btn btn-blue d-block py-3 rounded-pill" href="tess">
+            TeSS
+        </a> 
+    </div>
+    <div class="col">
+        <a class="btn btn-blue d-block py-3 rounded-pill" href="train-the-trainer">
+            Train-the-Trainer
+        </a> 
+    </div>
+    <div class="col">
+        <a class="btn btn-blue d-block py-3 rounded-pill" href="tango">
+            Tango
+        </a> 
+    </div>
+    <div class="col">
+        <a class="btn btn-blue d-block py-3 rounded-pill" href="fair-training-handbook">
+            FAIR Training Handbook
+        </a> 
+    </div>
+    <div class="col">
+        <a class="btn btn-blue d-block py-3 rounded-pill" href="learning-paths">
+            Learning Paths
+        </a> 
     </div>
 </div>
diff --git a/_includes/index/splash-in-numbers.html b/_includes/index/splash-in-numbers.html
@@ -1,8 +1,5 @@
 
-<div class="row mb-5">
-    <div class="col-12">
-        <h2>SPLASH in Numbers</h2>
-    </div>
+<div class="row mb-5 py-5">
     {% assign numbers = site.data.index.numbers %}
     {% for number in numbers %}
     <div class="col-12 col-md-6 col-xl-3 mb-4">
@@ -22,25 +19,8 @@ <h2>SPLASH in Numbers</h2>
     /** 
      * Animate numbers when in viewport
      */
-
-    // inViewport jQuery plugin
-    // https://stackoverflow.com/a/26831113/383904
-    $(function ($, win) {
-        $.fn.inViewport = function (cb) {
-            return this.each(function (i, el) {
-                function visPx() {
-                    var H = $(this).height(),
-                        r = el.getBoundingClientRect(), t = r.top, b = r.bottom;
-                    return cb.call(el, Math.max(0, t > 0 ? H - t : (b < H ? b : H)));
-                } visPx();
-                $(win).on("resize scroll", visPx);
-            });
-        };
-    }(jQuery, window));
-
-
     jQuery(function ($) { // DOM ready and $ in scope
-        $(".count-number").inViewport(function (px) { // Make use of the `px` argument!!!
+        $('.count-number').inViewport(function (px) { // Make use of the `px` argument!!!
             if (px > 0 && !this.initNumAnim) {
                 this.initNumAnim = true; // Set flag to true to prevent re-running the same animation
                 $(this).prop('Counter', 0).animate({

diff --git a/_includes/index/welcome.html b/_includes/index/welcome.html
@@ -1,6 +1,17 @@
-<div class="row justify-content-center mb-5">
+<div class="row row-banner justify-content-center mb-5">
     <div class="col-12 text-center">
-        <img src="assets/img/banner.png" alt="banner">
+        <div class="display-4 text-white fw-bold">SPLASH</div>
+        <p class="lead text-white mb-0">
+            Pushing the boundaries of training development
+        </p>
+    </div>
+</div>
+<div class="row mb-5">
+    <div class="col-12">
+        <div class="px-3 py-5 text-center">
+            <p class="lead">
+                Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce scelerisque augue tempus magna suscipit fringilla. Quisque neque nunc, fringilla a elit sed, tempor facilisis velit. Nulla facilisi. Sed ut sapien venenatis, tincidunt orci vitae, tristique magna. Curabitur tincidunt commodo odio vel faucibus.
+            </p>
+        </div>
     </div>
-
 </div>
diff --git a/_includes/scripts.html b/_includes/scripts.html
@@ -0,0 +1,16 @@
+<script>
+    // inViewport jQuery plugin
+    // https://stackoverflow.com/a/26831113/383904
+    $(function ($, win) {
+        $.fn.inViewport = function (cb) {
+            return this.each(function (i, el) {
+                function visPx() {
+                    var H = $(this).height(),
+                        r = el.getBoundingClientRect(), t = r.top, b = r.bottom;
+                    return cb.call(el, Math.max(0, t > 0 ? H - t : (b < H ? b : H)));
+                } visPx();
+                $(win).on('resize scroll', visPx);
+            });
+        };
+    }(jQuery, window));
+</script>
diff --git a/_includes/testimonials.html b/_includes/testimonials.html
@@ -4,7 +4,9 @@
 {%- assign testimonials = site.data.testimonials %}
 {% endif %}
 {% if testimonials.size > 0 %}
+    {% unless include.hideHeading %}
     <h2>Testimonials</h2>
+    {% endunless %}
     <div id="carouselTestimonials" class="carousel carousel-testimonials bg-primary rounded slide">
         <div class="carousel-indicators">
             {% assign maxIndex = testimonials.size | minus: 1 %}

diff --git a/_layouts/resource_page.html b/_layouts/resource_page.html
@@ -48,11 +48,15 @@ <h2>Description</h2>
         <h2>What can you do with {{ page.title }}</h2>
         {{ page.objective | markdownify }}
 
-        <h2>Our mission</h2>
-        {{ page.mission | markdownify }}
+        {%- unless page.mission == nil or page.mission == false %}
+            <h2>Our mission</h2>
+            {{ page.mission | markdownify }}
+        {% endunless %}
 
-        <h2>Benefit</h2>
-        {{ page.benefit | markdownify }}
+        {%- unless page.benefit == nil or page.benefit == false %}
+            <h2>Benefit</h2>
+            {{ page.benefit | markdownify }}
+        {% endunless %}
 
         <!-- BLOCK 2 -->
         {%- unless page.licenses == nil or page.licenses == false %}

diff --git a/_sass/_custom_classes.scss b/_sass/_custom_classes.scss
@@ -22,6 +22,7 @@ header {
         right: 0;
         left: 0;
         z-index: 1030;
+        padding-top: 1rem;
 
         .navbar-brand {
             min-height: 54px;
@@ -86,6 +87,49 @@ footer {
     background: $red;
 }
 
+.btn-blue {
+    @include button-variant($blue, $blue);
+}
+
+.row-banner {
+    padding-top: 4rem;
+    padding-bottom: 4rem;
+    position: relative;
+    text-shadow: 2px 2px 10px rgba(0, 0, 0, 0.6);
+
+    &::after {
+        content: ' ';
+        position: absolute;
+        top: 0;
+        left: 50%;
+        transform: translate(-50%);
+        height: 100%;
+        width: 100vw;
+        background: url('/assets/img/banner.png') center center no-repeat;
+        background-color: $gray-800;
+        background-size: cover;
+        z-index: -1;
+    }
+}
+
+.row-bg-light {
+    padding-top: 4rem;
+    padding-bottom: 4rem;
+    position: relative;
+
+    &::after {
+        content: ' ';
+        position: absolute;
+        top: 0;
+        left: 50%;
+        transform: translate(-50%);
+        height: 100%;
+        width: 100vw;
+        background-color: $gray-100;
+        z-index: -1;
+    }
+}
+
 .count {
     position: relative;
     overflow: hidden;

diff --git a/assets/img/banner.png b/assets/img/banner.png
diff --git a/assets/img/logos/logo_example.png b/assets/img/logos/logo_example.png
diff --git a/assets/img/logos/tess_logo.png b/assets/img/logos/tess_logo.png
diff --git a/...mg/screenshot_fair_training_handbook1.png → ...ts/screenshot_fair_training_handbook1.png b/...mg/screenshot_fair_training_handbook1.png → ...ts/screenshot_fair_training_handbook1.png
diff --git a/...mg/screenshot_fair_training_handbook2.png → ...ts/screenshot_fair_training_handbook2.png b/...mg/screenshot_fair_training_handbook2.png → ...ts/screenshot_fair_training_handbook2.png
diff --git a/assets/img/screenshots/screenshot_lesson_template.png b/assets/img/screenshots/screenshot_lesson_template.png
diff --git a/index.md b/index.md
@@ -5,15 +5,17 @@ layout: default
 sidebar: false
 ---
 
+{% include scripts.html %}
+
 {% include index/welcome.html %}
 
 {% include index/lifecycle.html %}
 
 {% include index/roles-and-resources.html %}
 
-<div class="row mb-5">
+<div class="row mb-5 py-5">
     <div class="col">
-        {% include testimonials.html %}
+        {% include testimonials.html hideHeading=true %}
     </div>
 </div>
 

diff --git a/pages/resources/TeSS.md b/pages/resources/TeSS.md