Merge master into develop

.gitignore

@@ -5,3 +5,5 @@ _site/
 .vscode/
 
 **/.ipynb_checkpoints/
+/Gemfile
+/Gemfile.lock

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 Joao Fonseca
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

_config.yml

@@ -12,7 +12,7 @@ kramdown:
   input: GFM
 
 # Want to include files in `_includes/code` (expected way doesn't work).
-include: 
+include:
   - _includes
 exclude:
   - _includes/head.html
@@ -45,7 +45,7 @@ collections:
     nav_list_pages: false
     index_list_pages: true
     permalink: /:collection/:name
-    add_new_name: page  
+    add_new_name: page
   experiments:
     output: true
     nav_order: 2
@@ -57,21 +57,37 @@ collections:
   tutorials:
     output: true
     nav_order: 3
-    nav_name: Tutorials   
+    nav_name: Tutorials
+    index_list_pages: true
+    permalink: /:collection/:name
+    add_new_name: tutorial
+  data_analysis:
+    output: true
+    nav_order: 5
+    nav_name: Data and Analysis
+    nav_list_pages: false
     index_list_pages: true
     permalink: /:collection/:name
-    add_new_name: tutorial    
+    add_new_name: page
   software_and_simulation:
     output: true
-    nav_order: 4
+    nav_order: 6
     nav_name: Software & Simulation
     nav_list_pages: false
     index_list_pages: true
     permalink: /:collection/:name
-    add_new_name: page  
-  miscellaneous: 
+    add_new_name: page
+  blog:
     output: true
-    nav_order: 5
+    nav_order: 7
+    nav_name: Blog
+    nav_list_pages: false
+    index_list_pages: true
+    permalink: /:collection/:name
+    add_new_name: page
+  miscellaneous:
+    output: true
+    nav_order: 8
     nav_name: Miscellaneous
     nav_list_pages: true
     index_list_pages: true
@@ -91,7 +107,7 @@ defaults:
     values:
       show_edit_button: true
       show_history_button: true
-      show_delete_button: false      
+      show_delete_button: false
   - scope:
       path: "tags.*"
     values:
@@ -103,13 +119,13 @@ defaults:
     values:
       show_edit_button: false
       show_history_button: false
-      show_delete_button: false      
+      show_delete_button: false
   - scope:
       path: "add_metadata_file.*"
     values:
       show_edit_button: false
       show_history_button: false
-      show_delete_button: false      
+      show_delete_button: false
   - scope:
       path: "collections/*/index.*"
     values:
@@ -126,44 +142,67 @@ defaults:
       published: true
       show_breadcrumbs: true
       show_meta: true
-      title: ''
+      title: ""
+      subcollection: root
   - scope:
       path: ""
       type: "tutorials"
     values:
       layout: post
       show_breadcrumbs: true
       show_meta: true
-      title: ''    
+      title: ""
+      subcollection: root
   - scope:
       path: ""
       type: "software_and_simulation"
     values:
       layout: post
       show_breadcrumbs: true
       show_meta: true
-      title: ''    
+      title: ""
+      subcollection: root
+  - scope:
+      path: ""
+      type: "blog"
+    values:
+      layout: post
+      show_breadcrumbs: true
+      show_meta: true
+      title: ""
+      subcollection: root
   - scope:
       path: ""
       type: "handbook"
     values:
       layout: post
       show_breadcrumbs: true
       show_meta: true
-      title: ''
+      title: ""
+      subcollection: root
   - scope:
       path: ""
       type: "code_of_conduct"
     values:
       layout: post
       show_breadcrumbs: true
       show_meta: true
-      title: ''        
+      title: ""
+      subcollection: root
   - scope:
       path: ""
       type: "miscellaneous"
     values:
       layout: post
       show_breadcrumbs: true
       show_meta: true
-      title: ''
+      title: ""
+      subcollection: root
+  - scope:
+      path: ""
+      type: "data_analysis"
+    values:
+      layout: post
+      show_breadcrumbs: true
+      show_meta: true
+      title: ""

_data/people.yml

@@ -3,36 +3,16 @@
   url: https://lightform.org.uk/people/dr-adam-plowman
   initials: AP
 
-- name: Natalie Shannon
-  handle: NatalieShannon
-  url: https://lightform.org.uk/people/natalie-shannon
-  initials: NS
-
 - name: Christopher Daniel
   handle: ChristopherDaniel
   url: https://lightform.org.uk/people/dr-christopher-stuart-daniel
   initials: CD
 
-- name: Alex Cassell
-  handle: AlexCassell
-  url: https://lightform.org.uk/people/dr-alex-cassell
-  initials: AC
-
-- name: Paloma Hidalgo-Manrique
-  handle: PalomaHidalgoManrique
-  url: https://lightform.org.uk/people/dr-paloma-hidalgo-manrique
-  initials: PHM
-
 - name: Peter Crowther
   handle: PeterCrowther
   url: https://lightform.org.uk/people/peter-crowther
   initials: PC
 
-- name: Sumeet Mishra
-  handle: SumeetMishra
-  url: https://lightform.org.uk/people/dr-sumeet-mishra
-  initials: SM
-
 - name: João Fonseca
   handle: JoaoFonseca
   url: https://lightform.org.uk/people/joao-fonseca
@@ -154,3 +134,13 @@
   handle: KevinTanswell
   initials: KT
   url: https://lightform.org.uk/people/kevin-tanswell
+
+- name: Sakina Rehman
+  handle: SakinaRehman
+  initials: SR
+  url: https://lightform.org.uk/people/sakina-rehman
+
+- name: Muzamul Nawaz
+  handle: MuzamulNawaz
+  initials: MN
+  url: https://lightform.org.uk/people/muzamul-nawaz