Release 0.3.25

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01Y42TyF8Zu7NGRR2893vNcZ
Content-shipped stylesheet override (site.yaml stylesheet)
2026-09-01 20:12:06 +02:00 · 2026-09-01 20:12:06 +02:00 · 2026-09-01 20:01:28 +02:00 · 2026-09-01 20:01:28 +02:00 · 2026-09-01 17:23:33 +02:00 · 2026-09-01 17:23:28 +02:00
7 changed files with 200 additions and 26 deletions
@@ -2948,7 +2948,7 @@ dependencies = [

 [[package]]
 name = "portal"
-version = "0.3.21"
+version = "0.3.24"
 dependencies = [
 "anyhow",
 "arc-swap",
@@ -1,6 +1,6 @@
 [package]
 name = "portal"
-version = "0.3.21"
+version = "0.3.25"
 edition = "2021"

 [lib]
@@ -1,5 +1,5 @@
 use leptos::prelude::*;
-use leptos_meta::{provide_meta_context, HashedStylesheet, MetaTags, Title};
+use leptos_meta::{provide_meta_context, HashedStylesheet, Html, MetaTags, Stylesheet, Title};
 use leptos_router::{
    components::{Route, Router, Routes},
    hooks::{use_location, use_navigate, use_query_map},
@@ -10,6 +10,7 @@ use serde::{Deserialize, Serialize};
 use crate::answers::{Answer, SelfTransitionAnswer, TransitionAnswers, TransitionItem};
 use crate::auth::{current_user, User};
 use crate::content::{is_qualified, render_inline_markdown, Alternative, Question, Responsible, SiteConfig, Transition};
+use crate::i18n::t;
 use crate::resource::{get_requirement_binding, get_requirement_options, get_resource};

 /// The visible site name/wordmark - "portal" is just this codebase's
@@ -68,8 +69,30 @@ pub fn App() -> impl IntoView {
    // context instead of fetching their own copy.
    let site = Resource::new(|| (), |_| get_site());
    provide_context(site);
+    // The chrome's language, from site.yaml (default "en"); content
+    // speaks for itself. Components read this via context for t().
+    let lang = Memo::new(move |_| {
+        site.get()
+            .and_then(|r| r.ok())
+            .and_then(|s| s.lang)
+            .unwrap_or_else(|| "en".to_string())
+    });
+    provide_context(Lang(lang));
+
+    // A content-shipped stylesheet (site.yaml `stylesheet:`) layered
+    // after the default one - leptos_meta appends it at the MetaTags
+    // slot, which the shell places after HashedStylesheet, so content
+    // rules win at equal specificity.
+    let custom_css = Memo::new(move |_| {
+        site.get()
+            .and_then(|r| r.ok())
+            .and_then(|s| s.stylesheet)
+            .map(|p| format!("/site/{p}"))
+    });

    view! {
+        <Html attr:lang=move || lang.get()/>
+        {move || custom_css.get().map(|href| view! { <Stylesheet id="site-custom" href=href/> })}
        <Suspense fallback=|| ()>
            {move || {
                site.get()
@@ -88,6 +111,15 @@ pub fn App() -> impl IntoView {
    }
 }

+/// The site's chrome language as a context signal - see App.
+#[derive(Clone, Copy)]
+pub struct Lang(pub Memo<String>);
+
+/// The current chrome language, for `t()` calls inside views.
+fn lang() -> Memo<String> {
+    expect_context::<Lang>().0
+}
+
 /// Every server-fn resource the pages read, created exactly once for
 /// the app's lifetime and handed down via context. Wrapper structs
 /// because a bare `Resource<T>` context is claimed by whoever provides
@@ -241,7 +273,7 @@ fn QuestionView(
            />
            <div class="alternatives">
                <section class="alt-card gate-card">
-                    <p>"This page follows from an answer you don't seem to carry yet."</p>
+                    <p>{move || t(&lang().get(), "follows_answer")}</p>
                    <a class="alt-submit" href=target>
                        {label}
                    </a>
@@ -269,7 +301,7 @@ fn QuestionView(
            <div class="alternatives">
                <section class="alt-card gate-card">
                    {if signed_in {
-                        view! { <p>"This part of the site is for organizational owners — sign in with that account to take a look."</p> }
+                        view! { <p>{move || t(&lang().get(), "owners_only")}</p> }
                            .into_any()
                    } else {
                        view! {
@@ -278,7 +310,7 @@ fn QuestionView(
                                href=format!("/auth/login?redirect={question_id}")
                                rel="external"
                            >
-                                "Sign in"
+                                {move || t(&lang().get(), "sign_in")}
                            </a>
                        }
                            .into_any()
@@ -371,7 +403,7 @@ fn QuestionNav(current_id: String, has_chain: bool) -> impl IntoView {
                        .collect();
                    (!others.is_empty()).then(|| view! {
                        <nav class="question-nav">
-                            <span class="question-nav-lead">"Also worth asking"</span>
+                            <span class="question-nav-lead">{move || t(&lang().get(), "also_worth_asking")}</span>
                            <For
                                each=move || others.clone()
                                key=|(id, _)| id.clone()
@@ -399,7 +431,7 @@ fn Announcements(current_id: String) -> impl IntoView {
                let current_id = current_id.clone();
                announcements.get().and_then(|res| res.ok()).map(|items| {
                    (!items.is_empty()).then(|| view! {
-                        <nav class="announce" aria-label="Announcements">
+                        <nav class="announce" aria-label=move || t(&lang().get(), "announcements")>
                            <For
                                each=move || items.clone()
                                key=|a| a.id.clone()
@@ -459,11 +491,11 @@ fn ResponsibleNote(responsible: Responsible) -> impl IntoView {

    view! {
        <small class="question-responsible">
-            "Asked by " {responsible.name.clone()} " — "
+            {move || t(&lang().get(), "asked_by")} {responsible.name.clone()} " — "
            <a data-user=user data-domain=domain on:mouseover=assemble on:click=assemble>
-                "contact them"
+                {move || t(&lang().get(), "contact_them")}
            </a>
-            " if you get stuck."
+            {move || t(&lang().get(), "if_stuck")}
        </small>
    }
 }
@@ -555,7 +587,21 @@ fn Hero(title: String, description: String, landing: bool, site: SiteConfig, cur
        None
    };
    let has_module = module.is_some();
+    // Light theme inverts white-stroke wordmarks to ink. The house
+    // mark and the sibling-site marks are all white-stroke SVGs; a
+    // raster logo is a client brand and keeps its colors.
+    let house_wordmark = site
+        .wordmark
+        .as_deref()
+        .map(|w| w.ends_with(".svg"))
+        .unwrap_or(true);
    let wordmark = site.wordmark.clone().unwrap_or_else(|| "/wordmark.svg".to_string());
+    // Clamped server-side too, but belt and braces for the inline style.
+    let wordmark_style = site
+        .wordmark_height
+        .filter(|h| (0.5..=6.0).contains(h))
+        .map(|h| format!("height: {h}rem"))
+        .unwrap_or_default();
    let site_title = site.title.clone().unwrap_or_else(|| SITE_NAME.to_string());

    let piece_ref: NodeRef<leptos::html::Div> = NodeRef::new();
@@ -641,8 +687,8 @@ fn Hero(title: String, description: String, landing: bool, site: SiteConfig, cur
                    }
                })}
            <div class="hero-copy">
-                <a class="wordmark" href="/">
-                    <img src=wordmark alt=site_title/>
+                <a class="wordmark" class:wordmark-house=house_wordmark href="/">
+                    <img src=wordmark alt=site_title style=wordmark_style/>
                </a>
                <h1>{title}</h1>
                <p>{description}</p>
@@ -727,7 +773,7 @@ fn AlternativeCard(
                            </button>
                        }
                            .into_any(),
-                        Some(Ok(())) => view! { <p>"Done."</p> }.into_any(),
+                        Some(Ok(())) => view! { <p>{move || t(&lang().get(), "done")}</p> }.into_any(),
                        Some(Err(e)) => view! { <p class="resource-error">{e.to_string()}</p> }.into_any(),
                    }
                }}
@@ -922,7 +968,7 @@ fn AlternativeCard(
        .consequence
        .first()
        .cloned()
-        .unwrap_or_else(|| "Send".to_string());
+        .unwrap_or_else(|| t(&lang().get(), "send").to_string());

    view! {
        <section class="alt-card">
@@ -1412,7 +1458,7 @@ fn ResourceFeature(
                {move || {
                    let feature_name = feature_name.clone();
                    let transitions = transitions.clone();
-                    let empty = empty.clone().unwrap_or_else(|| "Nothing here yet.".to_string());
+                    let empty = empty.clone().unwrap_or_else(|| t(&lang().get(), "nothing_here_yet").to_string());
                    data.get()
                        .map(|res| match res {
                            Ok(value) => {
@@ -1881,8 +1927,8 @@ fn format_ms(ms: i64) -> String {
 fn NotFound() -> impl IntoView {
    view! {
        <main class="not-found">
-            <h1>"Nothing here"</h1>
-            <a href="/">"back to the start"</a>
+            <h1>{move || t(&lang().get(), "nothing_here")}</h1>
+            <a href="/">{move || t(&lang().get(), "back_to_start")}</a>
        </main>
    }
 }
@@ -183,6 +183,7 @@ pub fn render_inline_markdown(text: &str) -> String {
    use pulldown_cmark::{html, Event, Options, Parser, Tag, TagEnd};
    let parser = Parser::new_ext(text, Options::empty());
    let mut in_link = 0usize;
+    let mut in_dropped_image = 0usize;
    let filtered = parser.filter_map(|event| match event {
        Event::Html(_) | Event::InlineHtml(_) => None,
        Event::Start(Tag::Paragraph) | Event::End(TagEnd::Paragraph) => None,
@@ -200,17 +201,20 @@ pub fn render_inline_markdown(text: &str) -> String {
            None
        }
        // Images take the same gate as links: https or same-origin
-        // only - no data:, no plain http.
+        // only - no data:, no plain http. Unlike a dropped link (whose
+        // label is real text worth keeping), a dropped image's alt
+        // text is a caption for something that isn't there - swallow it.
        Event::Start(Tag::Image { dest_url, .. })
            if !(dest_url.starts_with("https://") || dest_url.starts_with('/')) =>
        {
-            in_link += 1;
+            in_dropped_image += 1;
            None
        }
-        Event::End(TagEnd::Image) if in_link > 0 => {
-            in_link -= 1;
+        Event::End(TagEnd::Image) if in_dropped_image > 0 => {
+            in_dropped_image -= 1;
            None
        }
+        Event::Text(_) if in_dropped_image > 0 => None,
        other => Some(other),
    });
    let mut out = String::new();
@@ -513,6 +517,21 @@ pub struct SiteConfig {
    /// `None` falls back to `/wordmark.svg`.
    #[serde(default)]
    pub wordmark: Option<String>,
+    /// Wordmark display height in rem (0.5–6.0). `None` keeps the
+    /// stylesheet's default. Raster logos look best at or below their
+    /// intrinsic pixel height.
+    #[serde(default)]
+    pub wordmark_height: Option<f32>,
+    /// BCP 47-ish language code for the portal's own chrome strings
+    /// ("Asked by", the nav lead...) and the html lang attribute.
+    /// `None` means "en"; unknown codes fall back to English per key.
+    #[serde(default)]
+    pub lang: Option<String>,
+    /// A content-repo-relative CSS file (e.g. "custom.css") layered
+    /// *after* the default stylesheet, so it overrides. Served
+    /// same-origin at `/site/<path>`; plain path only.
+    #[serde(default)]
+    pub stylesheet: Option<String>,
    #[serde(default)]
    pub hero: HeroConfig,
 }
@@ -568,6 +587,13 @@ impl SiteConfig {
            }
            other => anyhow::bail!("site.yaml: hero.kind {other:?} is not one of plain | module"),
        }
+        if let Some(sheet) = &self.stylesheet {
+            if !is_safe_site_path(sheet) || !sheet.ends_with(".css") {
+                anyhow::bail!(
+                    "site.yaml: stylesheet {sheet:?} must be a plain repo-relative .css path"
+                );
+            }
+        }
        Ok(())
    }
 }
@@ -0,0 +1,97 @@
+//! Chrome-string translations, selected by `site.yaml`'s `lang`.
+//!
+//! Content carries its own language; this covers only the strings the
+//! portal itself speaks around it ("Asked by", the nav lead, the
+//! not-found page...). Unknown languages and unknown keys fall back
+//! to English, so a typo degrades to the default instead of a blank.
+
+/// Translate `key` for `lang`. `en` is the reference table; every
+/// other language falls through to it for keys it doesn't carry.
+pub fn t(lang: &str, key: &str) -> &'static str {
+    if let Some(s) = lookup(lang, key) {
+        return s;
+    }
+    lookup("en", key).unwrap_or(key_missing(key))
+}
+
+fn lookup(lang: &str, key: &str) -> Option<&'static str> {
+    Some(match (lang, key) {
+        ("en", "also_worth_asking") => "Also worth asking",
+        ("en", "asked_by") => "Asked by ",
+        ("en", "contact_them") => "contact them",
+        ("en", "if_stuck") => " if you get stuck.",
+        ("en", "send") => "Send",
+        ("en", "sign_in") => "Sign in",
+        ("en", "nothing_here_yet") => "Nothing here yet.",
+        ("en", "nothing_here") => "Nothing here",
+        ("en", "back_to_start") => "back to the start",
+        ("en", "done") => "Done.",
+        ("en", "follows_answer") => {
+            "This page follows from an answer you don't seem to carry yet."
+        }
+        ("en", "owners_only") => {
+            "This part of the site is for organizational owners — sign in with that account to take a look."
+        }
+        ("en", "announcements") => "Announcements",
+
+        ("no", "also_worth_asking") => "Også verdt å spørre",
+        ("no", "asked_by") => "Stilt av ",
+        ("no", "contact_them") => "ta kontakt",
+        ("no", "if_stuck") => " om du står fast.",
+        ("no", "send") => "Send",
+        ("no", "sign_in") => "Logg inn",
+        ("no", "nothing_here_yet") => "Ingenting her ennå.",
+        ("no", "nothing_here") => "Ingenting her",
+        ("no", "back_to_start") => "tilbake til start",
+        ("no", "done") => "Ferdig.",
+        ("no", "follows_answer") => {
+            "Denne siden følger av et svar du ikke ser ut til å bære ennå."
+        }
+        ("no", "owners_only") => {
+            "Denne delen av siden er for organisasjonens eiere — logg inn med den kontoen for å ta en titt."
+        }
+        ("no", "announcements") => "Kunngjøringer",
+
+        _ => return None,
+    })
+}
+
+/// A missing key is a programmer error; render the key itself so it
+/// is findable, never a panic in a view.
+fn key_missing(key: &str) -> &'static str {
+    // Leak is bounded: keys are a small fixed set of literals.
+    Box::leak(key.to_string().into_boxed_str())
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn norwegian_covers_the_english_table() {
+        for key in [
+            "also_worth_asking",
+            "asked_by",
+            "contact_them",
+            "if_stuck",
+            "send",
+            "sign_in",
+            "nothing_here_yet",
+            "nothing_here",
+            "back_to_start",
+            "done",
+            "follows_answer",
+            "owners_only",
+            "announcements",
+        ] {
+            assert!(lookup("en", key).is_some(), "en missing {key}");
+            assert!(lookup("no", key).is_some(), "no missing {key}");
+        }
+    }
+
+    #[test]
+    fn unknown_language_falls_back_to_english() {
+        assert_eq!(t("de", "sign_in"), "Sign in");
+        assert_eq!(t("en", "sign_in"), "Sign in");
+    }
+}
@@ -4,6 +4,7 @@ pub mod auth;
 pub mod chain;
 pub mod content;
 pub mod events;
+pub mod i18n;
 pub mod resource;

 #[cfg(feature = "ssr")]
@@ -99,10 +99,10 @@
    --hero-glow: rgba(246, 245, 241, 0.85);
  }

-  /* The wordmark SVG is a hardcoded white stroke (also used raw in
-     dark contexts elsewhere) - flip it to ink here rather than fork
-     the asset. */
-  .wordmark img {
+  /* The house wordmark SVG is a hardcoded white stroke (also used
+     raw in dark contexts elsewhere) - flip it to ink here rather
+     than fork the asset. A content-provided logo keeps its colors. */
+  .wordmark-house img {
    filter: invert(0.92);
  }

@@ -861,6 +861,10 @@ textarea:focus {
  padding: 0.75rem 1.4rem;
  cursor: pointer;
  transition: filter 120ms, transform 120ms;
+  /* A gateway alternative renders this as an <a> (navigation, no POST);
+     kill the link chrome so it reads as the button it looks like. */
+  text-decoration: none;
+  display: inline-block;
 }

 .alt-submit:hover {
Author	SHA1	Message	Date
Bendik Aagaard LynghaugandClaude Fable 5	4fee02ab82	Release 0.3.25 Test / test (push) Successful in 28s Details Publish release / publish (push) Successful in 1m41s Details Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01Y42TyF8Zu7NGRR2893vNcZ	2026-09-01 20:12:06 +02:00
Bendik Aagaard LynghaugandClaude Fable 5	405bb98185	Content-shipped stylesheet override (site.yaml stylesheet) A content repo can now ship a CSS file named in site.yaml's stylesheet field; portal serves it same-origin at /site/<path> and leptos_meta appends it after the default stylesheet so content rules win. Plain repo-relative .css path only, validated on load. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01Y42TyF8Zu7NGRR2893vNcZ	2026-09-01 20:12:06 +02:00
Bendik Aagaard LynghaugandClaude Fable 5	7fd40aaca9	Release 0.3.24 Test / test (push) Successful in 26s Details Publish release / publish (push) Successful in 1m39s Details Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01Y42TyF8Zu7NGRR2893vNcZ	2026-09-01 20:01:28 +02:00
Bendik Aagaard LynghaugandClaude Fable 5	de6a90bbf5	Gateway submit-as-link loses the underline A no-requirements gateway alternative renders .alt-submit as an <a> for plain navigation; strip the link underline so it reads as the button it's styled to be. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01Y42TyF8Zu7NGRR2893vNcZ	2026-09-01 20:01:28 +02:00
Bendik Aagaard LynghaugandClaude Fable 5	88b1b96322	Release 0.3.23 Test / test (push) Successful in 28s Details Publish release / publish (push) Successful in 1m44s Details Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01Y42TyF8Zu7NGRR2893vNcZ	2026-09-01 17:23:33 +02:00
Bendik Aagaard LynghaugandClaude Fable 5	b259bf39bb	Chrome speaks the site's language: site.yaml lang + i18n table The strings the portal itself says - Asked by, Also worth asking, Sign in, the not-found page, defaults - translate via a small en/no table selected by site.yaml's lang, which also sets the html lang attribute. Content keeps speaking for itself; unknown languages fall back to English per key. Also: a scheme-gated markdown image now swallows its alt text instead of leaking it as stray text - this is the fix for the test that has been red since 0.3.19 (publish is tag-triggered and does not gate on the test workflow; caught late). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01Y42TyF8Zu7NGRR2893vNcZ	2026-09-01 17:23:28 +02:00
Bendik Aagaard LynghaugandClaude Fable 5	528e2badaf	Release 0.3.22 Test / test (push) Failing after 25s Details Publish release / publish (push) Successful in 1m39s Details Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01Y42TyF8Zu7NGRR2893vNcZ	2026-09-01 17:17:26 +02:00
Bendik Aagaard LynghaugandClaude Fable 5	f4e9f6d0ba	site.yaml wordmark_height; raster logos keep their colors Custom wordmark sizing per site (0.5-6 rem, clamped at render), and the light-theme invert now applies only to .svg wordmarks - the white-stroke house style - so a client's raster logo is never recolored. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01Y42TyF8Zu7NGRR2893vNcZ	2026-09-01 17:17:11 +02:00