GUI: conflicts resolved, ready for review

.github/workflows/continuous-integration.yml

@@ -1,7 +1,7 @@
 # This workflow will install Python dependencies, run tests and lint on several OS with a several versions of Python
 # See: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
 
-name: Build on Win-MacOS-Ubuntu with Python 3.10-3.11
+name: Build on Win-MacOS-Ubuntu with Python 3.10-3.12
 
 on:
   push:
@@ -23,17 +23,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest, macos-13] # Mac ARM M1 vs Intel processors
-        python-version: ["3.10", "3.11"]
+        os: [ubuntu-latest, windows-latest, macos-latest] #, macos-13] # opensim not supported on macos Intel AMD x64 beyond python 3.11
+        python-version: ["3.10", "3.11", "3.12"]
         include:
           - os: ubuntu-latest
             cache-path: ~/.cache/pip
           - os: windows-latest
             cache-path: C:\Users\runneradmin\AppData\Local\pip\Cache
-          - os: macos-latest
+          - os: macos-latest #arm64
             cache-path: /Library/Caches/pip
-          - os: macos-13
-            cache-path: ~/Library/Caches/pip
+          # - os: macos-13 
+          #   cache-path: ~/Library/Caches/pip
 
     steps:
       - name: Checkout code
@@ -91,4 +91,4 @@ jobs:
           KMP_DUPLICATE_LIB_OK: TRUE
         run: |
           conda activate pose2sim
-          pytest -v Pose2Sim/Utilities/tests.py --capture=sys
+          pytest -v Pose2Sim/Utilities/tests.py --capture=sys

Content/website/script.js

@@ -0,0 +1,164 @@
+// Global variables
+let currentStep = 0;
+const totalSteps = 16; // FIXED: Changed from 11 to 16 (steps 0-15)
+let currentLanguage = 'en';
+let viewAllMode = false;
+
+// Initialize on page load
+document.addEventListener('DOMContentLoaded', function() {
+    initializeNavigation();
+    updateNavButtons();
+    updateActiveNavItem();
+});
+
+// Navigation functions
+function goToStep(stepNumber) {
+    if (viewAllMode) {
+        toggleViewAll(); // Exit view all mode
+    }
+
+    currentStep = stepNumber;
+    showStep(currentStep);
+    updateNavButtons();
+    updateActiveNavItem();
+    scrollToTop();
+}
+
+function nextStep() {
+    if (viewAllMode) {
+        toggleViewAll();
+        return;
+    }
+
+    if (currentStep < totalSteps - 1) {
+        currentStep++;
+        showStep(currentStep);
+        updateNavButtons();
+        updateActiveNavItem();
+        scrollToTop();
+    }
+}
+
+function previousStep() {
+    if (viewAllMode) {
+        toggleViewAll();
+        return;
+    }
+
+    if (currentStep > 0) {
+        currentStep--;
+        showStep(currentStep);
+        updateNavButtons();
+        updateActiveNavItem();
+        scrollToTop();
+    }
+}
+
+function showStep(stepNumber) {
+    // Hide all steps
+    document.querySelectorAll('.step').forEach(step => {
+        step.classList.remove('active');
+    });
+
+    // Show current step
+    const currentStepElement = document.getElementById(`step-${stepNumber}`);
+    if (currentStepElement) {
+        currentStepElement.classList.add('active');
+    }
+}
+
+function updateNavButtons() {
+    const prevBtn = document.getElementById('prevBtn');
+    const nextBtn = document.getElementById('nextBtn');
+
+    if (viewAllMode) {
+        prevBtn.style.display = 'none';
+        nextBtn.querySelector('span').textContent = 'Exit View All';
+        return;
+    }
+
+    // Show/hide previous button
+    prevBtn.style.display = currentStep === 0 ? 'none' : 'inline-flex';
+
+    // Update next button text
+    if (currentStep === totalSteps - 1) {
+        nextBtn.querySelector('span').textContent = 'Finish ✓';
+    } else {
+        nextBtn.querySelector('span').textContent = 'Next →';
+    }
+}
+
+function updateActiveNavItem() {
+    document.querySelectorAll('.nav-item').forEach(item => {
+        item.classList.remove('active');
+    });
+
+    const activeItem = document.querySelector(`a[href="#step-${currentStep}"]`);
+    if (activeItem) {
+        activeItem.classList.add('active');
+    }
+}
+
+function toggleViewAll() {
+    viewAllMode = !viewAllMode;
+
+    const steps = document.querySelectorAll('.step');
+    const viewAllBtn = document.querySelector('.view-all-btn');
+
+    if (viewAllMode) {
+        // Show all steps
+        steps.forEach(step => {
+            step.classList.add('view-all-mode');
+            step.classList.add('active');
+        });
+
+        viewAllBtn.querySelector('span').textContent = 'Back to Step View';
+
+        document.querySelector('.nav-buttons').style.display = 'flex';
+    } else {
+        // Return to single step view
+        steps.forEach(step => {
+            step.classList.remove('view-all-mode');
+            step.classList.remove('active');
+        });
+
+        showStep(currentStep);
+
+        viewAllBtn.querySelector('span').textContent = 'View All Steps';
+    }
+
+    updateNavButtons();
+    scrollToTop();
+}
+
+function initializeNavigation() {
+    // Add click handlers to nav items
+    document.querySelectorAll('.nav-item').forEach((item, index) => {
+        item.addEventListener('click', (e) => {
+            e.preventDefault();
+            goToStep(index);
+        });
+    });
+}
+
+function scrollToTop() {
+    window.scrollTo({
+        top: 0,
+        behavior: 'smooth'
+    });
+}
+
+// Keyboard navigation
+document.addEventListener('keydown', function(e) {
+    if (viewAllMode) return;
+
+    if (e.key === 'ArrowLeft' || e.key === 'ArrowUp') {
+        if (currentStep > 0) {
+            previousStep();
+        }
+    } else if (e.key === 'ArrowRight' || e.key === 'ArrowDown') {
+        if (currentStep < totalSteps - 1) {
+            nextStep();
+        }
+    }
+});