merge main updates with dev branch

.github/workflows/deploy-book.yml

@@ -1,42 +1,53 @@
 name: deploy-book
 
-# Only run this when the master branch changes
 on:
   push:
     branches:
-    - main
-    # If your git repository has the Jupyter Book within some-subfolder next to
-    # unrelated files, you can make this run only if a file within that specific
-    # folder has been modified.
-    #
-    # paths:
-    # - some-subfolder/**
-
-# This job installs dependencies, builds the book, and pushes it to `gh-pages`
+      - main
+
 jobs:
   deploy-book:
     runs-on: ubuntu-latest
+
     steps:
     - uses: actions/checkout@v2
 
-    # Install dependencies
-    - name: Set up Python 3.8
+    # Set up Python environment
+    - name: Set up Python 3.13
       uses: actions/setup-python@v2
       with:
-        python-version: 3.8
+        python-version: 3.13
 
+    # Install dependencies
     - name: Install dependencies
       run: |
         pip install -r requirements.txt
 
-    # Build the book
-    - name: Build the book
+    # Build English Book
+    - name: Build English Book
+      run: |
+        jupyter-book build . --config _config.yml --toc _toc.yml --path-output english
+        echo "English book built successfully."
+
+    # Build Spanish Book
+    - name: Build Spanish Book
+      run: |
+        jupyter-book build . --config _config.yml --toc es_toc.yml --path-output spanish
+        echo "Spanish book built successfully."
+
+    # Combine both builds into a single deployable folder
+    - name: Combine English and Spanish builds
       run: |
-        jupyter-book build .
+        mkdir -p _site/content _site/spanish
+        cp -r english/_build/html/* _site/
+        cp -r spanish/_build/html/* _site/spanish/
+        echo "Created _site with English in /content and Spanish in /spanish"
+        ls -R _site
 
-    # Push the book's HTML to github-pages
-    - name: GitHub Pages action
+    # Deploy combined site to GitHub Pages
+    - name: Deploy to GitHub Pages
       uses: peaceiris/[email protected]
       with:
         github_token: ${{ secrets.GITHUB_TOKEN }}
-        publish_dir: ./_build/html
+        publish_dir: ./_site
+        publish_branch: gh-pages

.vscode/settings.json

@@ -1,5 +1,6 @@
 {
     "cSpell.words": [
         "geodataprocessing"
-    ]
+    ],
+    "cSpell.language": "en,es-ES"
 }

_config.yml

@@ -23,9 +23,9 @@ bibtex_bibfiles:
 
 # Information about where the book exists on the web
 repository:
-  url: https://github.com/GIScience/gis-training-resource-center  # Online location of your book
-  path_to_book: docs  # Optional path to your book, relative to the repository root
-  branch: main  # Which branch of the repository should be used when creating links (optional)
+  url: https://github.com/GIScience/gis-training-resource-center
+  path_to_book: content
+  branch: main
 
 # Add GitHub buttons to your book
 # See https://jupyterbook.org/customize/config.html#add-a-link-to-your-repository
@@ -39,4 +39,8 @@ html:
       This project is released under a <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/deed.en">Creative Commons BY-NC-SA 4.0 license</a>.
       </p>
   announcement: "Looking to contribute? Take a look at the contribution guidelines and contact us!"
-exclude_patterns: [.venv/*]
+exclude_patterns: [.venv/*, venv/*]
+
+sphinx:
+  extra_extensions:
+    - custom-launch-buttons

_launch_buttons.yml

@@ -0,0 +1,11 @@
+buttons:
+  - type: dropdown
+    icon: <span style="font-weight:500; margin-right:4px;">Language</span> 
+          <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-globe" viewBox="0 0 16 16">
+            <path d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8m7.5-6.923c-.67.204-1.335.82-1.887 1.855A8 8 0 0 0 5.145 4H7.5zM4.09 4a9.3 9.3 0 0 1 .64-1.539 7 7 0 0 1 .597-.933A7.03 7.03 0 0 0 2.255 4zm-.582 3.5c.03-.877.138-1.718.312-2.5H1.674a7 7 0 0 0-.656 2.5zM4.847 5a12.5 12.5 0 0 0-.338 2.5H7.5V5zM8.5 5v2.5h2.99a12.5 12.5 0 0 0-.337-2.5zM4.51 8.5a12.5 12.5 0 0 0 .337 2.5H7.5V8.5zm3.99 0V11h2.653c.187-.765.306-1.608.338-2.5zM5.145 12q.208.58.468 1.068c.552 1.035 1.218 1.65 1.887 1.855V12zm.182 2.472a7 7 0 0 1-.597-.933A9.3 9.3 0 0 1 4.09 12H2.255a7 7 0 0 0 3.072 2.472M3.82 11a13.7 13.7 0 0 1-.312-2.5h-2.49c.062.89.291 1.733.656 2.5zm6.853 3.472A7 7 0 0 0 13.745 12H11.91a9.3 9.3 0 0 1-.64 1.539 7 7 0 0 1-.597.933M8.5 12v2.923c.67-.204 1.335-.82 1.887-1.855q.26-.487.468-1.068zm3.68-1h2.146c.365-.767.594-1.61.656-2.5h-2.49a13.7 13.7 0 0 1-.312 2.5m2.802-3.5a7 7 0 0 0-.656-2.5H12.18c.174.782.282 1.623.312 2.5zM11.27 2.461c.247.464.462.98.64 1.539h1.835a7 7 0 0 0-3.072-2.472c.218.284.418.598.597.933M10.855 4a8 8 0 0 0-.468-1.068C9.835 1.897 9.17 1.282 8.5 1.077V4z"/>
+          </svg>
+    items:
+      - label: English
+        url: https://giscience.github.io/gis-training-resource-center/content/intro.html
+      - label: Español
+        url: https://giscience.github.io/gis-training-resource-center/spanish/content/es/es_intro.html

_toc.yml

@@ -2,7 +2,7 @@
 # Learn more at https://jupyterbook.org/customize/toc.html
 
 format: jb-book
-root: content/intro
+root: content/intro.md
 options:  # The options key will be applied to all chapters, but not sub-sections
 parts:
   - caption: Modules
@@ -25,7 +25,7 @@ parts:
           - file: content/Module_2/en_qgis_module_2_exercises.md
       - file: content/Module_3/en_module_3_overview.md
         sections:
-          - file: content/Module_3/en_qgis_digitalisation.md
+          - file: content/Module_3/en_qgis_digitisation.md
           - file: content/Module_3/en_qgis_data_queries.md
           - file: content/Module_3/en_qgis_data_classification.md
           - file: content/Module_3/en_qgis_georeferencing.md
@@ -40,6 +40,7 @@ parts:
           - file: content/Module_4/en_qgis_map_design_2.md
           - file: content/Module_4/en_qgis_understanding_print_layout.md
           - file: content/Module_4/en_qgis_map_examples.md
+          - file: content/Module_4/en_module_4_operation_maps.md
           - file: content/Module_4/en_qgis_module_4_exercises.md
       - file: content/Module_5/en_module_5_overview.md
         sections:
@@ -56,10 +57,11 @@ parts:
       - file: content/Module_7/en_module_7_overview.md
         sections: 
           - file: content/Module_7/en_qgis_automation_theory.md
-          - file: content/Module_7/en_qgis_module_7_ex1.md
+          - file: content/Module_7/en_qgis_module_7_exercises.md
       - file: content/Module_8/en_module_8_overview.md
         sections: 
           - file: content/Module_8/en_qgis_remote_sensing_raster_theory.md
+          - file: content/Module_8/en_qgis_raster_operations.md
           - file: content/Module_8/en_qgis_remote_sensing_theory.md  
           - file: content/Module_8/en_qgis_module_8_ex1.md
       - file: content/Module_9/en_module_9_overview.md
@@ -73,8 +75,12 @@ parts:
       - file: content/Exercise_tracks/en_exercise_tracks_overview.md
         sections:
           - file: content/Exercise_tracks/en_larkana_flood_response.md
+          - file: content/Exercise_tracks/en_mdg_aa_cyclones.md
+          - file: content/Exercise_tracks/fr_mdg_aa_cyclones.md
+          - file: content/Exercise_tracks/en_public_health_outbreak_and_preparedness.md
   - caption: Wiki
     chapters:
+      - file: content/Wiki/en_wiki_homepage.md
       - file: content/Wiki/en_qgis_qgis_basics_wiki.md
         sections:
           - file: content/Wiki/en_qgis_installation_wiki.md
@@ -92,11 +98,11 @@ parts:
           - file: content/Wiki/en_qgis_OpenStreetMap_wiki.md
           - file: content/Wiki/en_qgis_layer_concept_wiki.md
           - file: content/Wiki/en_qgis_attribute_table_wiki.md
-          - file: content/Wiki/en_qgis_digitalization_wiki.md   
+          - file: content/Wiki/en_qgis_digitisation_wiki.md   
       - file: content/Wiki/en_qgis_data_classification_wiki.md
         sections:
           - file: content/Wiki/en_qgis_single_symbol_wiki.md
-          - file: content/Wiki/en_qgis_categorized_wiki.md
+          - file: content/Wiki/en_qgis_categorised_wiki.md
           - file: content/Wiki/en_qgis_graduated_wiki.md
       - file: content/Wiki/en_qgis_geoprocessing_wiki.md
       - file: content/Wiki/en_qgis_queries_wiki.md
@@ -111,21 +117,34 @@ parts:
       - file: content/Wiki/en_qgis_raster_wiki.md
         sections:
           - file: content/Wiki/en_qgis_raster_basic_wiki.md
-      - file: content/Wiki/en_qgis_automatisation_wiki.md
-        sections:
-          - file: content/Wiki/en_qgis_model_builder_wiki.md
+      - file: content/Wiki/en_qgis_automation_wiki.md
       - file: content/Wiki/en_qgis_representation_wiki.md
         sections:
           - file: content/Wiki/en_qgis_visualisation_wiki.md
           - file: content/Wiki/en_qgis_map_making_wiki.md
       - file: content/Wiki/en_qgis_common_errors_and_Issues.md   
       - file: content/Wiki/en_web_and_mobile_apps_wiki.md
+      - file: content/Wiki/en_geodata_management_sharepoint.md
   - caption: GIS in Anticipatory Action
     chapters:
+      - file: content/GIS_AA/en_qgis_cyclone_trigger_madagascar.md
+        sections:
+          - file: content/GIS_AA/fr_qgis_cyclone_trigger_madagascar.md
       - file: content/GIS_AA/en_qgis_drought_trigger_somalia.md
         sections:
           - file: content/GIS_AA/en_qgis_srcs_basic_ex.md
+      - file: content/GIS_AA/en_AILAS_madagascar.md
+        sections:
+          - file: content/GIS_AA/en_AILAS_madagascar_camera_usage_guide.md
+          - file: content/GIS_AA/en_AILAS_madagascar_picture_upload_and_management.md
+      - file: content/GIS_AA/fr_AILAS_madagascar.md
+        sections:
+          - file: content/GIS_AA/fr_AILAS_madagascar_camera_usage_guide.md
+          - file: content/GIS_AA/fr_AILAS_madagascar_picture_upload_and_management.md
       - file: content/GIS_AA/en_qgis_risk_assessment_plugin.md
+        sections:
+          - file: content/GIS_AA/en_qgis_generate_indicators_for_plugin.md
+          - file: content/GIS_AA/en_gaia_indicators_processing.md
       - file: content/GIS_AA/en_qgis_historical_impact_assessment_sudan.md
         sections:
           - file: content/GIS_AA/en_qgis_historical_impact_assessment_sudan_ex1.md

content/About/about_1.md

@@ -3,15 +3,15 @@
 Whether being a beginner or already having some experiences, working with QGIS can be difficult.  
 Our goal is to provide a comprehensive platform containing the essential skills and resources for the use in humanitarian aid without having to google for hours. 🔎
 In addition to the modules, we offer exercises and a wiki to enable individuals to work through the material and learn independently.  
-This QGIS training is made by people who believe GIS can help humanitarians to serve people in need better. ❤️
+This QGIS training is made by people who believe GIS can help humanitarians to serve people in need better. 
 
 ### Our Mission:
 We share the commitment to humanitarian aid. Through this website, our goal is to offer a unified, accessible and comprehensive resource, equipping individuals and organizations with the knowledge and tools necessary for working with QGIS. 
 This Resource Center is also the resource for guided training modules.
 
 ## About Us:
 
-The idea for this training platform originated from a group of people from the German Red Cross, British Red Cross and Netherlands Red Cross. 💡📣 
+The idea for this training platform originated from a group of people from the German Red Cross, British Red Cross and Netherlands Red Cross.
 
 A group of dedicated student assistants and employees of the Heidelberg Institute for Geoinformation Technology (HeiGIT) are working to put together the materials on this platform. 🔨
 
@@ -103,7 +103,7 @@ German Red Cross:
   </div>
 
   <div class="logo">
-    <img src="/HeiGIT_Logo_compact.svg" alt="HeiGIT Logo">
+    <img src="https://heigit.org/wp-content/uploads/2024/07/HeiGIT_Logo_base.png" alt="HeiGIT Logo">
   </div>
 </div>
 

content/Exercise_tracks/en_exercise_tracks_overview.md

@@ -1,11 +1,8 @@
 # Exercise Overview
 
-This platform offers various exercises per module, each covering the competences and tools covered in the module 
-chapter. The exercise vary in their complexity and their length. When planning a workshop, pay attention to the 
-competences covered in the exercises you choose. Ideally, you should cover the core competences of each module. 
+This platform offers various exercises per module, each covering the competences and tools covered in the module chapter. The exercise vary in their complexity and their length. When planning a workshop, pay attention to the competences covered in the exercises you choose. Ideally, you should cover the core competences of each module. 
 
-We have also prepared exercise tracks, which cover the competences from module 1 to module 5 in exercises, that build 
-upon each other. These exercises are generally a bit larger and require more time. 
+We have also prepared exercise tracks, which cover the competences from module 1 to module 5 in exercises, that build upon each other. These exercises are generally a bit larger and require more time. 
 
 :::{figure} /fig/en_exercise_tracks.png
 ---
@@ -18,8 +15,7 @@ Overview of the exercises available on the platform
 :::{admonition} Exercises for module 4
 :class: note
 
-You can adapt most of the exercise of module 3 for a consecutive map making exercise for module 4. Think about a 
-sensible symbolisation and follow the map making steps outlined in chapter [4.6. The Print Layout](https://giscience.github.io/gis-training-resource-center/content/Module_4/en_qgis_map_design_2.html) and [4.7. Understanding the Print Layout](https://giscience.github.io/gis-training-resource-center/content/Module_4/en_qgis_understanding_print_layout.html).
+You can adapt most of the exercise of module 3 for a consecutive map making exercise for module 4. Think about a sensible symbolisation and follow the map making steps outlined in chapter [4.6. The Print Layout](https://giscience.github.io/gis-training-resource-center/spanish/content/Module_4/en_qgis_map_design_2.html) and [4.7. Understanding the Print Layout](https://giscience.github.io/gis-training-resource-center/spanish/content/Module_4/en_qgis_understanding_print_layout.html).
 
 :::
 
@@ -34,4 +30,5 @@ sensible symbolisation and follow the map making steps outlined in chapter [4.6.
 ## Available exercise tracks:
 
 - [Larkana Flood Response](/content/Exercise_tracks/en_larkana_flood_response.md)
-
+- [Anticipatory Action Analysis for Cyclones in Madagascar](/content/Exercise_tracks/en_mdg_aa_cyclones.md)
+- [Public Health: Outbreak and Preparedness](/content/Exercise_tracks/en_public_health_outbreak_and_preparedness.md)