Major UX changes for workshops website by ozhang22 · Pull Request #604 · NuevoFoundation/workshops

ozhang22 · 2026-04-06T05:41:32Z

No description provided.

Co-authored-by: Oliver Zhang <[email protected]>

* Add videos from Hack 2024. (#574) * Fix Python Turtle workshops (#576) * Fix Python Turtle workshops. (#577) * Revert "Fix Python Turtle workshops (#576)" This reverts commit a19b792. * Add answers to extra exercise in activity 3 in Python Turtle. (#578) * Fix images in HTML workshop (#580) * Fix images again for HTML workshop * Add layout4 shortcode * Update menu formatting

#575) (#584) * UI/UX changes in line with spec: back button from workshop modules to dashboard, right-aligned primary panel, black bar at the end of the body text. * Removed console logs, added localization. * Fixed build error. * forgot to save changes related to removing console logs in script --------- Co-authored-by: Kourosh Arfania <[email protected]> Co-authored-by: Kory Arfania <[email protected]>

Removed home section for Workshop Projects from layout.

…structions and first mission

-</select>
-{{- end }}
+{{if not .IsHome}}
+	{{- if and hugo.IsMultilingual (not .Site.Params.DisableLanguageSwitchingButton)}}


+{{end}}
+
+{{if .IsHome}}
+	{{- if and hugo.IsMultilingual (not .Site.Params.DisableLanguageSwitchingButton)}}


In general, the fix is to avoid directly using this.value from the DOM in a sensitive sink (navigation) without any validation or restriction. Instead, use a small piece of JavaScript that reads the selected value, validates it (e.g., ensures it is an HTTP(S) URL or a same‑origin path), and only then sets window.location. This also removes the inline event handler, reducing XSS surface.

For this specific file, we can keep existing functionality (navigating to the selected language’s permalink) while making it safer by:

Removing the inline onchange="location = this.value;" attributes from both <select> elements.

Adding a small <script> block right after the second <select> that:

Looks up both #select-language-workshop and #select-language-home if present.

Attaches a change event listener to each.

In the handler, reads event.target.value, checks that it begins with / (relative path) or http:// or https:// (or more restrictive, if desired), and only then assigns it to window.location.href. Invalid values are ignored.

This preserves current behavior for valid permalinks but ensures that even if a malicious value reached the DOM, obviously dangerous schemes (like javascript:) would not be used for navigation. All changes occur in themes/docdock/layouts/partials/language-selector.html, within the shown snippet.

beagandica · 2026-04-25T05:44:18Z

Hi @ozhang22! This is a great set of UX improvements. Heads up that this PR has merge conflicts with the current master branch (likely from the changes in your merged PR #605 and our recent content fixes).

Would you like to rebase this against master? If you'd like help, happy to assist. The auto-translation PR #607 was closed since it was based on this conflicted state - a fresh one will generate once this is rebased and ready.

beagandica · 2026-04-25T05:52:39Z

Hi @ozhang22! After reviewing the full PR queue, here is what I found on this PR:

Your UX changes from PR #605 (24 files) are already merged. This PR #604 has 98 additional files that didn't make it into #605:

Chatbot workshop rewrite (20 files) — new art, restructured activities
Spanish translations (69 files) — may overlap with PR Ale translation spanish #585 from @alemcuevas
Other English content updates (9 files)

Since this PR has merge conflicts with current master, here are two options:

Option A (recommended): Close this PR and extract the chatbot rewrite into a fresh, focused PR from current master. The Spanish translations can be reconciled with #585.

Option B: Rebase this against master (will need conflict resolution across 134 files).

Happy to help with either approach! The chatbot content looks great and is worth preserving.

beagandica · 2026-04-25T06:20:51Z

Update: After deeper analysis, all unique content from this PR has been extracted into clean, conflict-free PRs:

Content	Status	PR
UX theme changes (14 files)	Already merged	#605
Chatbot art assets (20 files)	Extracted with a11y fixes	#629
Security art assets (9 files)	Extracted with a11y fixes	#629
Aventura React workshop (34 files)	Extracted	#630
Logic Gates workshop (47 files)	Extracted	#630

This PR can now be safely closed. All content is preserved in focused PRs that merge cleanly against current master. Thank you @ozhang22 for all this work!

@ozhang22

Extract two new Spanish-language workshops from NuevoFoundation#604: Aventura React (34 files): - Costa Rica-themed React tutorial teaching components, props, and styling - 8 activities + answer key with original illustrations and media Logic Gates (47 files): - Costa Rica-themed logic circuit simulator workshop - 8 activities covering AND, OR, NOT gates with interactive simulator - Custom CSS, illustrations, and answer key with solutions Original content created in NuevoFoundation#604 by @ozhang22 and contributors. Extracted into focused PR to avoid conflicts in the larger NuevoFoundation#604. Co-authored-by: Oliver Zhang <[email protected]> Co-authored-by: Copilot <[email protected]>

pizza832 and others added 29 commits April 5, 2026 22:32

C# Basics - Removed misplaced character

83446a3

Styling Workshops

b1597ef

Workshops Styling Update

8315118

Finished styling

9172b96

Reviewed Changes

8cbfec6

Update themes/docdock/layouts/partials/flex/body-beforecontent.html

2604561

Co-authored-by: Oliver Zhang <[email protected]>

Update themes/docdock/layouts/partials/flex/body-beforecontent.html

8589033

Co-authored-by: Oliver Zhang <[email protected]>

Update themes/docdock/layouts/partials/flex/body-beforecontent.html

4ff05c0

Co-authored-by: Oliver Zhang <[email protected]>

Update themes/docdock/static/theme-flex/style.css

f4c4d69

Apply suggestions from code review

8d99c51

visual design changes in workshop page

5543243

Changes for 5/21

568d7fb

fixed arrow functionality

c247510

Apply suggestions from code review

bc76254

Co-authored-by: Oliver Zhang <[email protected]>

Some menu fixes.

ef09201

Small fixes.

5339a82

Fix

e393986

Add translations and small fixes to menu

ddc5d5e

Remove Workshop Projects section from homepage layout

91d3e01

Removed home section for Workshop Projects from layout.

Increase width of theme-flex container to 25rem

3bca192

Increase margin for menu item icons

7e1a16b

Add workshops section to English index

0a6a107

Add Spanish guide for using the logic circuit simulator with basic in…

f32c2b6

…structions and first mission

Workshop creado

cd722f8

Agregar imagenes para las actividades 3, 4 y 5

3ea0805

Added art assets

c8000c2

Apply suggestions from code review

98b26da

github-advanced-security AI found potential problems Apr 6, 2026

View reviewed changes

github-actions Bot mentioned this pull request Apr 6, 2026

[Github Actions] AI Workshop Translations - #604 #607

Closed

This was referenced Apr 25, 2026

UX Changes #546

Closed

UX Changes #547

Closed

This was referenced Apr 25, 2026

PR queue cleanup summary & merge plan (April 2026) #628

Open

Add Spanish workshops: Aventura React and Logic Gates (extracted from #604) #630

Open

ozhang22 closed this Apr 28, 2026

@@ -1,6 +1,6 @@
             {{if not .IsHome}}
             	{{- if and hugo.IsMultilingual (not .Site.Params.DisableLanguageSwitchingButton)}}
-            	<select id="select-language-workshop" onchange="location = this.value;">
+            	<select id="select-language-workshop">
             		{{ $siteLanguages := .Site.Languages}}
             		{{ $pageLang := .Page.Lang}}
             		{{ range .Page.AllTranslations }}
@@ -21,7 +21,7 @@
             {{if .IsHome}}
             	{{- if and hugo.IsMultilingual (not .Site.Params.DisableLanguageSwitchingButton)}}
-            	<select id="select-language-home" onchange="location = this.value;">
+            	<select id="select-language-home">
             		{{ $siteLanguages := .Site.Languages}}
             		{{ $pageLang := .Page.Lang}}
             		{{ range .Page.AllTranslations }}
@@ -37,5 +37,32 @@
             		{{ end }}
             		{{ end }}
             	</select>
+            	<script>
+            	(function () {
+            		function isSafeUrl(url) {
+            			if (!url) return false;
+            			// Allow same-site relative paths or explicit http/https URLs
+            			return url.charAt(0) === '/' ||
+            			       url.indexOf('http://') === 0 ||
+            			       url.indexOf('https://') === 0;
+            		}
+            		function attachLanguageSelectorHandler(selectId) {
+            			var select = document.getElementById(selectId);
+            			if (!select) return;
+            			select.addEventListener('change', function (event) {
+            				var target = event.target || event.srcElement;
+            				if (!target) return;
+            				var value = target.value;
+            				if (isSafeUrl(value)) {
+            					window.location.href = value;
+            				}
+            			});
+            		}
+            		attachLanguageSelectorHandler('select-language-workshop');
+            		attachLanguageSelectorHandler('select-language-home');
+            	})();
+            	</script>
             	{{- end }}
             {{end}}

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Major UX changes for workshops website#604

Major UX changes for workshops website#604
ozhang22 wants to merge 29 commits into
masterfrom
olzhan/UXChangesAndSpanish

ozhang22 commented Apr 6, 2026

Uh oh!

Check failure

Copilot Autofix

Check failure

Copilot Autofix

beagandica commented Apr 25, 2026

Uh oh!

beagandica commented Apr 25, 2026

Uh oh!

beagandica commented Apr 25, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Conversation

ozhang22 commented Apr 6, 2026

Uh oh!

Check failure

Uh oh!

Copilot Autofix

Check failure

Uh oh!

Copilot Autofix

beagandica commented Apr 25, 2026

Uh oh!

beagandica commented Apr 25, 2026

Uh oh!

beagandica commented Apr 25, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants