diff --git a/build-slides.sh b/build-slides.sh index 34d3d6a..dc00aa6 100755 --- a/build-slides.sh +++ b/build-slides.sh @@ -133,6 +133,25 @@ else echo "Warning: python3 not found — skipping post-processing" fi +# Copy deck assets (images) that live next to a source under slides/. Marp keeps +# relative image URLs in the HTML, so the files must exist at the same relative +# path in the output tree. Only slides/ can carry these: docs/presentations/ +# decks are flattened to .html, so a relative path would not survive. +# When OUTPUT_DIR is the in-repo slides/ dir, source and target are the same +# file and there is nothing to copy. +if [ -d "$REPO_ROOT/slides" ]; then + while IFS= read -r -d '' asset; do + rel="${asset#"$REPO_ROOT"/slides/}" + dest="$OUTPUT_DIR/$rel" + [ "$asset" -ef "$dest" ] && continue + mkdir -p "$(dirname "$dest")" + cp "$asset" "$dest" + echo " Copied asset $rel" + done < <(find "$REPO_ROOT/slides" -type f \ + \( -iname "*.jpg" -o -iname "*.jpeg" -o -iname "*.png" \ + -o -iname "*.gif" -o -iname "*.svg" -o -iname "*.webp" \) -print0) +fi + # Regenerate index.html listing every built deck. INDEX="$OUTPUT_DIR/index.html" { diff --git a/docs/services/slides.md b/docs/services/slides.md index 5278ce3..8fd6487 100644 --- a/docs/services/slides.md +++ b/docs/services/slides.md @@ -26,3 +26,9 @@ Use `slides/` when a deck belongs to a named series and the URL should read like example `slides/tappaas/how-to/new-module/index.md` is served at `https://slides.makerfloss.eu/tappaas/how-to/new-module/`. Only the markdown is committed; the generated HTML under `slides/` is git-ignored. + +**Images** belong next to the deck source (`slides//.jpg`) and are referenced with a +plain relative path. Marp keeps relative URLs as-is, so `build-slides.sh` copies image files from +`slides/` into the output tree at the same relative path — unlike the HTML, these *are* committed. +Only path-mirrored `slides/` decks can carry images; `docs/presentations/` decks are flattened to +`.html`, so a relative path would not survive. diff --git a/slides/tappaas/one-year-in/hrossen-rack.jpg b/slides/tappaas/one-year-in/hrossen-rack.jpg new file mode 100644 index 0000000..49d4f59 Binary files /dev/null and b/slides/tappaas/one-year-in/hrossen-rack.jpg differ diff --git a/slides/tappaas/one-year-in/index.md b/slides/tappaas/one-year-in/index.md index 30c57da..3181a19 100644 --- a/slides/tappaas/one-year-in/index.md +++ b/slides/tappaas/one-year-in/index.md @@ -23,6 +23,11 @@ div.mermaid svg { width: 100% !important; height: auto !important; max-height: 4 section.diagram h2 { margin-bottom: 0.1em; } /* Hand-drawn diagrams (inline SVG) get the same full-width treatment. */ section.diagram > svg { display: block; width: 100%; height: auto; max-height: 520px; margin: 0 auto; } +/* Two photographs side by side, with captions under each. */ +section.photos .two-up { display: flex; gap: 1.2em; justify-content: center; align-items: flex-start; } +section.photos figure { margin: 0; flex: 1 1 0; text-align: center; } +section.photos figure img { width: 100%; max-height: 430px; object-fit: contain; border-radius: 6px; } +section.photos figcaption { font-size: 0.72em; opacity: 0.85; margin-top: 0.35em; } /* Section dividers: gaia's `lead` does the centring; this only sets the scale. */ section.chapter h1 { font-size: 2.6em; margin-bottom: 0.1em; } /* Punch lines: the slides that are one sentence, said loudly. */ @@ -158,6 +163,32 @@ NIC on VLAN 100 straight to the modem, which is how OPNsense gets a WAN. --- + + +## The same platform, two very different rooms + +
+
+The MakerFLOSS rack at Orange Makerspace +
makerfloss.eu — Orange Makerspace. Donated enterprise iron, a community lab.
+
+
+The rack in my basement at home +
hrossen.dk — my basement. Three small boxes, a switch, a modem.
+
+
+ +Same modules. Same `install.sh`. Same tests. Same updates. + + + +--- + ## The software: foundation underneath, stacks on top diff --git a/slides/tappaas/one-year-in/makerfloss-rack.jpg b/slides/tappaas/one-year-in/makerfloss-rack.jpg new file mode 100644 index 0000000..3665f9a Binary files /dev/null and b/slides/tappaas/one-year-in/makerfloss-rack.jpg differ