Fix workshop sorting and JavaScript paths for GitHub Pages

tomvannuenen · tomvannuenen · commit 4e99d0ec27a1 · 2025-07-31T16:06:45.000-07:00
- Add case-insensitive title matching for workshop sorting
- Fix relative URLs for JavaScript and CSS files
- Update workshop-status.js to detect base URL dynamically
- Improve title normalization to handle different formats
diff --git a/_includes/workshop-list-sorted.html b/_includes/workshop-list-sorted.html
@@ -11,10 +11,18 @@
 {% comment %} Separate workshops into active and inactive {% endcomment %}
 {% for workshop in workshops %}
   {% assign is_active = false %}
+  {% assign workshop_title_lower = workshop.title | downcase %}
   
   {% comment %} Check if workshop is in upcoming workshops {% endcomment %}
   {% for upcoming in site.data.upcoming_workshops.workshops %}
-    {% if upcoming.title == workshop.title %}
+    {% assign upcoming_title_lower = upcoming.title | downcase %}
+    {% if upcoming_title_lower == workshop_title_lower %}
+      {% assign is_active = true %}
+      {% break %}
+    {% elsif upcoming_title_lower contains workshop_title_lower %}
+      {% assign is_active = true %}
+      {% break %}
+    {% elsif workshop_title_lower contains upcoming_title_lower %}
       {% assign is_active = true %}
       {% break %}
     {% endif %}
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -5,16 +5,16 @@
 	<meta charset="utf-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>{{ page.title | default: "D-Lab Workshops" }}</title>
-	<link rel="icon" type="image/png" sizes="32x32" href="static/images/favicon-32x32.png">
-	<link rel="icon" type="image/png" sizes="16x16" href="static/images/favicon-16x16.png">
+	<link rel="icon" type="image/png" sizes="32x32" href="{{ '/static/images/favicon-32x32.png' | relative_url }}">
+	<link rel="icon" type="image/png" sizes="16x16" href="{{ '/static/images/favicon-16x16.png' | relative_url }}">
 	<!-- Bootstrap CSS -->
 	<link rel="stylesheet" href="https://bootswatch.com/4/litera/bootstrap.min.css">
 	<!-- Fontawesome JS -->
 	<script defer src="https://use.fontawesome.com/releases/v5.0.10/js/all.js" integrity="sha384-slN8GvtUJGnv6ca26v8EzVaR9DC58QEwsIk9q1QXdCU8Yu8ck/tL/5szYlBbqmS+" crossorigin="anonymous"></script>
 	
 	<!-- Custom CSS -->
-	<link rel="stylesheet" href="static/stylesheets/style.css">
-	<link rel="stylesheet" href="static/stylesheets/custom-home.css">
+	<link rel="stylesheet" href="{{ '/static/stylesheets/style.css' | relative_url }}">
+	<link rel="stylesheet" href="{{ '/static/stylesheets/custom-home.css' | relative_url }}">
 </head>
 
 <body class="w-100 h-100">
@@ -73,7 +73,7 @@ <h1>
 	<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
 	
 	<!-- Workshop Status JS -->
-	<script src="static/javascripts/workshop-status.js"></script>
+	<script src="{{ '/static/javascripts/workshop-status.js' | relative_url }}"></script>
 
 </body>
 </html>
diff --git a/static/javascripts/workshop-status.js b/static/javascripts/workshop-status.js
@@ -4,9 +4,10 @@
 (function() {
   'use strict';
 
-  // Configuration
-  const UPCOMING_WORKSHOPS_URL = 'data/upcoming_workshops.json';
-  const WORKSHOP_MAPPINGS_URL = 'data/workshop_mappings.yml';
+  // Configuration - detect base URL
+  const baseUrl = window.location.pathname.includes('/dlab-workshops/') ? '/dlab-workshops' : '';
+  const UPCOMING_WORKSHOPS_URL = baseUrl + '/data/upcoming_workshops.json';
+  const WORKSHOP_MAPPINGS_URL = baseUrl + '/data/workshop_mappings.yml';
 
   // Cache for performance
   let workshopData = null;
@@ -88,6 +89,7 @@
     return title.toLowerCase()
       .replace(/[^a-z0-9\s]/g, '')
       .replace(/\s+/g, ' ')
+      .replace(/parts\s+\d+[-–]\d+/g, 'parts')  // Normalize "Parts 1-3" to just "parts"
       .trim();
   }
 
