domma-cms 1.14.0 → 1.16.0

package/server/routes/api/settings.js

@@ -20,6 +20,7 @@ import {fileURLToPath} from 'url';
 import * as cache from '../../services/cache/index.js';
 import {normaliseAdminPath} from '../../services/roles.js';
 import {cssClassProblems} from '../../../public/js/css-classes.mjs';
+import {motionFooterMirror, normaliseMotionSettings} from '../../services/motionSettings.js';
 import {invalidateMeasurementId, measurementIdOf, normaliseMeasurementId} from '../../services/googleAnalytics.js';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
@@ -124,7 +125,9 @@ export async function settingsRoutes(fastify) {
             // Designer classes on <body>, every page (Site Settings > Appearance).
             'bodyClass',
             // Google Analytics (Site Settings > Analytics) - services/googleAnalytics.js.
-            'googleAnalytics'
+            'googleAnalytics',
+            // The "Reduce motion" control (Site Settings > Reduce motion) - services/motionSettings.js.
+            'motion'
         ]);
         const unknownKeys = Object.keys(data).filter(k => !ALLOWED_KEYS.has(k));
         if (unknownKeys.length > 0) {
@@ -141,7 +144,7 @@ export async function settingsRoutes(fastify) {
         }
         // Designer classes - the same rules as menus and forms (css-classes.mjs).
         for (const [label, value] of [['Body CSS classes', data.bodyClass], ['Footer CSS classes', data.footer?.class],
-            ['Social link CSS classes', data.footer?.socialClass]]) {
+            ['Social link CSS classes', data.footer?.socialClass], ['Reduce motion CSS classes', data.motion?.class]]) {
             const problems = cssClassProblems(value);
             if (problems.length) return reply.status(400).send({error: `${label}: ${problems[0]}.`});
         }
@@ -184,6 +187,24 @@ export async function settingsRoutes(fastify) {
                 merged[k] = v;
             }
         }
+        // The Reduce motion control: stored whitelisted, with the footer keys it used to live
+        // under kept in step for older readers. A client that still writes only those footer
+        // keys (fleet tooling) moves the block with them, so its change is not overruled.
+        if ('motion' in data) {
+            if (data.motion !== null && (typeof data.motion !== 'object' || Array.isArray(data.motion))) {
+                return reply.status(400).send({error: 'Reduce motion: send an object.'});
+            }
+            merged.motion = normaliseMotionSettings(merged.motion, merged.footer);
+            merged.footer = {...merged.footer, ...motionFooterMirror(merged.motion)};
+        } else if (merged.motion && data.footer && typeof data.footer === 'object') {
+            const legacy = {showMotionToggle: 'enabled', motionDefault: 'default', motionControl: 'control'};
+            const moved = Object.entries(legacy).filter(([k]) => k in data.footer);
+            if (moved.length) {
+                const next = {...merged.motion};
+                for (const [k, key] of moved) next[key] = k === 'showMotionToggle' ? data.footer[k] !== false : data.footer[k];
+                merged.motion = normaliseMotionSettings(next, merged.footer);
+            }
+        }
         // Never erase smtp.pass with the empty string that the GET endpoint injects for safety
         if (merged.smtp && merged.smtp.pass === '' && existing.smtp?.pass) {
             merged.smtp = {...merged.smtp, pass: existing.smtp.pass};

package/server/services/adminBrand.js

@@ -24,6 +24,7 @@ export function adminBrandFor(site = {}) {
     const str = (v) => (typeof v === 'string' ? v.replace(/[ \t\n\f\r]+/g, ' ').trim() : '');
     const logo = str(own.logo);
     return {
+        enabled: own.enabled !== false,
         title: (str(own.title) || str(site?.title) || DEFAULT_ADMIN_TITLE).slice(0, 120),
         // Same rule as the sidebar header: a site path or an http(s) address, nothing else.
         logo: /^(?:\/(?!\/)|https?:\/\/)/i.test(logo) ? logo : '',

package/server/services/googleBusiness.js

@@ -0,0 +1,225 @@
+/** Google Business Profile: one site connection, encrypted outside authored content.
+ * Remote business data is fetched on demand. Applying a preview is an explicit SEO form edit.
+ */
+import fs from 'node:fs';
+import path from 'node:path';
+import {createCipheriv, createDecipheriv, createHash, randomBytes, timingSafeEqual} from 'node:crypto';
+
+export const BUSINESS_SCOPE = 'https://www.googleapis.com/auth/business.manage';
+const TOKEN_URL = 'https://oauth2.googleapis.com/token';
+const ACCOUNT_URL = 'https://mybusinessaccountmanagement.googleapis.com/v1/accounts';
+const LOCATION_URL = 'https://mybusinessbusinessinformation.googleapis.com/v1/';
+const READ_MASK = 'name,title,storefrontAddress,phoneNumbers,websiteUri,metadata';
+const TTL = 600_000;
+const hash = value => createHash('sha256').update(String(value)).digest();
+const text = (v, max = 300) => String(v ?? '').trim().slice(0, max);
+const webAddress = v => /^https?:\/\/[^\s\\]+$/i.test(text(v, 500)) ? text(v, 500) : '';
+
+export class GoogleBusinessError extends Error {
+    constructor(message, statusCode = 400) { super(message); this.statusCode = statusCode; }
+}
+
+/** Only fields supported by the SEO organisation form; absent Google fields never clear site data. */
+export function businessPreview(location = {}) {
+    const a = location.storefrontAddress || {};
+    return {name: text(location.name), title: text(location.title),
+        organisation: {type: 'LocalBusiness', name: text(location.title), url: webAddress(location.websiteUri),
+            phone: text(location.phoneNumbers?.primaryPhone, 80),
+            sameAs: [webAddress(location.metadata?.mapsUri)].filter(Boolean),
+            address: {street: (Array.isArray(a.addressLines) ? a.addressLines : []).map(v => text(v, 200)).filter(Boolean).join(', ').slice(0, 200),
+                locality: text(a.locality, 200), region: text(a.administrativeArea, 200), postcode: text(a.postalCode, 200), country: text(a.regionCode, 200)}}};
+}
+
+export function createGoogleBusiness({directory = path.resolve('content/sessions/google-business'), fetch: fetcher = globalThis.fetch, now = Date.now} = {}) {
+    const file = path.join(directory, 'connection.json');
+    const keyFile = path.join(directory, '.key');
+    const pending = new Map();
+    let generation = 0;
+    let refreshing = null;
+
+    function key() {
+        fs.mkdirSync(directory, {recursive: true, mode: 0o700});
+        try { return fs.readFileSync(keyFile); }
+        catch (e) {
+            if (e.code !== 'ENOENT') throw e;
+            const value = randomBytes(32);
+            try { fs.writeFileSync(keyFile, value, {mode: 0o600, flag: 'wx'}); return value; }
+            catch (err) { if (err.code !== 'EEXIST') throw err; return fs.readFileSync(keyFile); }
+        }
+    }
+    function seal(value) {
+        const iv = randomBytes(12);
+        const cipher = createCipheriv('aes-256-gcm', key(), iv);
+        const bytes = Buffer.concat([cipher.update(JSON.stringify(value), 'utf8'), cipher.final()]);
+        return [iv, cipher.getAuthTag(), bytes].map(b => b.toString('base64url')).join('.');
+    }
+    function open(value) {
+        const [iv, tag, bytes] = value.split('.').map(b => Buffer.from(b, 'base64url'));
+        const cipher = createDecipheriv('aes-256-gcm', key(), iv);
+        cipher.setAuthTag(tag);
+        return JSON.parse(Buffer.concat([cipher.update(bytes), cipher.final()]).toString('utf8'));
+    }
+    function read() {
+        try { return open(JSON.parse(fs.readFileSync(file, 'utf8')).sealed); }
+        catch (e) {
+            if (e.code === 'ENOENT') return null;
+            throw new GoogleBusinessError('The saved Google connection could not be opened. Disconnect it and connect again.', 409);
+        }
+    }
+    function write(value) {
+        const temporary = `${file}.${randomBytes(6).toString('hex')}.tmp`;
+        try {
+            fs.writeFileSync(temporary, JSON.stringify({version: 1, sealed: seal(value)}) + '\n', {mode: 0o600});
+            fs.renameSync(temporary, file);
+        } finally { fs.rmSync(temporary, {force: true}); }
+    }
+    function status() {
+        let c;
+        try { c = read(); }
+        catch {
+            return {connected: false, needsReconnect: true, clientId: '', hasClientSecret: false, location: null};
+        }
+        return {connected: Boolean(c?.refreshToken), needsReconnect: c?.needsReconnect === true,
+            clientId: c?.clientId || '', hasClientSecret: Boolean(c?.clientSecret), location: c?.location || null};
+    }
+    function assertGeneration(expected) {
+        if (generation !== expected) throw new GoogleBusinessError('The Google connection changed. Open its settings again.', 409);
+    }
+    async function remote(url, options = {}) {
+        let response;
+        try { response = await fetcher(url, {...options, redirect: 'error', signal: AbortSignal.timeout(15_000)}); }
+        catch { throw new GoogleBusinessError('Google could not be reached. Try again.', 502); }
+        const body = await response.json().catch(() => ({}));
+        if (!response.ok) {
+            if (body.error === 'invalid_grant' || response.status === 401) throw new GoogleBusinessError('Google access has expired or was revoked. Connect again.', 401);
+            if (body.error === 'invalid_client') throw new GoogleBusinessError('Google rejected the client ID or secret. Check the app credentials.');
+            if (response.status === 403) throw new GoogleBusinessError('Google refused access. Check Business Profile API approval, enabled APIs and permission to manage this business.', 403);
+            if (response.status === 429) throw new GoogleBusinessError('Google Business Profile has reached its request limit. Try again later.', 429);
+            throw new GoogleBusinessError('Google could not complete the request. Check the selected business and app setup.', 502);
+        }
+        return body;
+    }
+    const tokenRequest = params => remote(TOKEN_URL, {method: 'POST', headers: {'Content-Type': 'application/x-www-form-urlencoded'}, body: new URLSearchParams(params).toString()});
+    function begin({clientId, clientSecret, redirectUri, userId}) {
+        let previous = null;
+        try { previous = read(); } catch { /* new credentials can repair an unreadable connection */ }
+        clientId = text(clientId, 300);
+        clientSecret = text(clientSecret, 2000) || (previous?.clientId === clientId ? previous.clientSecret : '');
+        if (!clientId || !clientSecret) throw new GoogleBusinessError('Enter the Google app client ID and client secret first.');
+        const uri = new URL(redirectUri);
+        if (uri.protocol !== 'https:' && !(uri.protocol === 'http:' && ['localhost', '127.0.0.1', '[::1]'].includes(uri.hostname))) {
+            throw new GoogleBusinessError('Google sign-in needs an HTTPS site address, or localhost for development.');
+        }
+        for (const [k, t] of pending) if (t.expires <= now() || t.userId === userId) pending.delete(k);
+        if (pending.size >= 200) throw new GoogleBusinessError('Too many sign-ins are pending. Try again in a few minutes.', 429);
+        const state = randomBytes(32).toString('base64url');
+        const binding = randomBytes(32).toString('base64url');
+        const verifier = randomBytes(32).toString('base64url');
+        pending.set(state, {userId, redirectUri, credentials: seal({clientId, clientSecret}), verifier, bindingHash: hash(binding), expires: now() + TTL, generation});
+        const url = new URL('https://accounts.google.com/o/oauth2/v2/auth');
+        url.search = new URLSearchParams({client_id: clientId, redirect_uri: redirectUri, response_type: 'code', scope: BUSINESS_SCOPE,
+            state, access_type: 'offline', prompt: 'consent', code_challenge: hash(verifier).toString('base64url'), code_challenge_method: 'S256'}).toString();
+        return {url: url.href, state, binding};
+    }
+    function take(state, binding) {
+        const t = pending.get(state);
+        pending.delete(state);
+        if (!t || t.expires <= now()) throw new GoogleBusinessError('This sign-in expired or was already used. Press Connect again.');
+        if (!binding || !timingSafeEqual(hash(binding), t.bindingHash)) throw new GoogleBusinessError('Finish sign-in in the browser that pressed Connect.');
+        assertGeneration(t.generation);
+        return t;
+    }
+    async function complete(ticket, code) {
+        if (!text(code, 4000)) throw new GoogleBusinessError('Google did not return a sign-in code. Connect again.');
+        const credentials = open(ticket.credentials);
+        const t = await tokenRequest({client_id: credentials.clientId, client_secret: credentials.clientSecret,
+            grant_type: 'authorization_code', code: text(code, 4000), redirect_uri: ticket.redirectUri, code_verifier: ticket.verifier});
+        if (!t.access_token || !t.refresh_token || !String(t.scope || '').split(' ').includes(BUSINESS_SCOPE)) {
+            throw new GoogleBusinessError('Google did not grant Business Profile access for this connection. Connect again and allow access.');
+        }
+        assertGeneration(ticket.generation);
+        write({...credentials, accessToken: t.access_token, refreshToken: t.refresh_token,
+            expiresAt: now() + (Number(t.expires_in) || 3600) * 1000, needsReconnect: false, location: null});
+        generation++;
+        pending.clear();
+        refreshing = null;
+        return status();
+    }
+    async function accessToken() {
+        const c = read();
+        if (!c?.refreshToken || c.needsReconnect) throw new GoogleBusinessError('Connect Google Business Profile first.', 409);
+        if (c.expiresAt > now() + 60_000) return c.accessToken;
+        if (refreshing) return refreshing;
+        const expected = generation;
+        const task = (async () => {
+            try {
+                const t = await tokenRequest({client_id: c.clientId, client_secret: c.clientSecret, refresh_token: c.refreshToken, grant_type: 'refresh_token'});
+                assertGeneration(expected);
+                if (!t.access_token) throw new GoogleBusinessError('Google did not renew access. Connect again.', 502);
+                write({...read(), accessToken: t.access_token, refreshToken: t.refresh_token || c.refreshToken,
+                    expiresAt: now() + (Number(t.expires_in) || 3600) * 1000});
+                return t.access_token;
+            } catch (e) {
+                if (e.statusCode === 401 && generation === expected) write({...read(), needsReconnect: true});
+                throw e;
+            }
+        })();
+        refreshing = task;
+        try { return await task; } finally { if (refreshing === task) refreshing = null; }
+    }
+    async function api(url) {
+        const expected = generation;
+        const token = await accessToken();
+        assertGeneration(expected);
+        try {
+            const result = await remote(url, {headers: {Authorization: `Bearer ${token}`}});
+            assertGeneration(expected);
+            return result;
+        } catch (e) {
+            if (e.statusCode === 401 && generation === expected) write({...read(), needsReconnect: true});
+            throw e;
+        }
+    }
+    function listUrl(base, pageToken, extra = {}) {
+        const url = new URL(base);
+        url.search = new URLSearchParams({...extra, ...(pageToken ? {pageToken: text(pageToken, 2000)} : {})}).toString();
+        return url.href;
+    }
+    async function accounts(pageToken) {
+        const r = await api(listUrl(ACCOUNT_URL, pageToken, {pageSize: '20'}));
+        return {accounts: (r.accounts || []).filter(a => /^accounts\/[A-Za-z0-9_-]+$/.test(a.name)).map(a => ({name: a.name, title: text(a.accountName) || a.name})), nextPageToken: r.nextPageToken || ''};
+    }
+    async function locations(account, pageToken) {
+        if (!/^accounts\/[A-Za-z0-9_-]+$/.test(account || '')) throw new GoogleBusinessError('Choose a business account.');
+        const r = await api(listUrl(`${LOCATION_URL}${account}/locations`, pageToken, {pageSize: '100', readMask: READ_MASK}));
+        return {locations: (r.locations || []).filter(l => /^locations\/[A-Za-z0-9_-]+$/.test(l.name)).map(businessPreview), nextPageToken: r.nextPageToken || ''};
+    }
+    async function select(name) {
+        if (!/^locations\/[A-Za-z0-9_-]+$/.test(name || '')) throw new GoogleBusinessError('Choose a business location.');
+        const expected = generation;
+        const location = await api(listUrl(`${LOCATION_URL}${name}`, '', {readMask: READ_MASK}));
+        if (location.name !== name) throw new GoogleBusinessError('Google returned a different business location.', 502);
+        assertGeneration(expected);
+        const preview = businessPreview(location);
+        write({...read(), location: {name: preview.name, title: preview.title}});
+        return preview;
+    }
+    async function disconnect() {
+        generation++;
+        pending.clear();
+        refreshing = null;
+        let c;
+        try { c = read(); } catch { /* forgetting an unreadable connection still works */ }
+        fs.rmSync(file, {force: true});
+        let revoked = false;
+        if (c?.refreshToken) {
+            try {
+                const r = await fetcher('https://oauth2.googleapis.com/revoke', {method: 'POST', redirect: 'error', signal: AbortSignal.timeout(15_000),
+                    headers: {'Content-Type': 'application/x-www-form-urlencoded'}, body: new URLSearchParams({token: c.refreshToken}).toString()});
+                revoked = r.ok;
+            } catch { /* the site's credential is already removed */ }
+        }
+        return {connected: false, revoked};
+    }
+    return {status, begin, take, complete, accounts, locations, select, disconnect};
+}

package/server/services/motionSettings.js

@@ -0,0 +1,107 @@
+/**
+ * The "Reduce motion" control - `site.json` `motion` (Site Settings > Reduce motion).
+ *
+ * One pure normaliser, shared by the renderer (both render paths: the page's
+ * bootstrap default and the object site.js draws the control from) and the
+ * settings route (what is stored). Whitelisted and clamped rather than merged,
+ * because the result is written into the source of every public page.
+ *
+ * Until it had a tab of its own the control lived in the footer settings: `footer.showMotionToggle`,
+ * `footer.motionDefault` and `footer.motionControl`. A site with no `motion`
+ * block - or one missing a key - falls back to those, key by key, so every
+ * existing site renders exactly as before with no migration. The admin keeps
+ * writing them as a mirror for older readers and fleet tooling.
+ *
+ * No I/O here; tested in tests/services/motion-settings.test.js.
+ */
+import {cssClasses} from '../../public/js/css-classes.mjs';
+
+/** Today's behaviour: shown, in the footer, as a switch, following the device. */
+export const MOTION_DEFAULTS = Object.freeze({
+    enabled: true,
+    default: 'system',
+    placement: 'footer',
+    control: 'switch',
+    triggerStyle: 'icon',
+    label: 'Reduce motion',
+    // Bottom left: clear of Search (right-centre) and Back to top (bottom right)
+    // at their defaults. public/js/motion-control.mjs stacks it clear of them
+    // anyway when a site moves one into the same corner.
+    position: 'BL',
+    offsetX: 32,
+    offsetY: 32,
+    iconSize: 52,
+    iconRadius: 26,
+    class: ''
+});
+
+export const MOTION_DEFAULT_CHOICES = ['system', 'off', 'on'];
+export const MOTION_PLACEMENTS = ['footer', 'floating', 'navbar'];
+export const MOTION_CONTROLS = ['switch', 'checkbox'];
+export const MOTION_TRIGGER_STYLES = ['icon', 'icon-text'];
+/** The breadcrumb corners - the Placement card's corner picker. */
+export const MOTION_POSITIONS = ['TL', 'TR', 'BL', 'BR'];
+export const MOTION_LABEL_MAX = 40;
+/** The same limits as Search's floating disc (services/search.js). */
+export const MOTION_ICON_SIZE_MIN = 32;
+export const MOTION_ICON_SIZE_MAX = 96;
+export const MOTION_OFFSET_MAX = 500;
+
+const pick = (value, list, fallback) => (list.includes(value) ? value : fallback);
+
+function num(value, fallback, min, max) {
+    const n = typeof value === 'number' ? value : (typeof value === 'string' && value.trim() ? Number(value) : NaN);
+    if (!Number.isFinite(n)) return fallback;
+    return Math.min(max, Math.max(min, Math.round(n)));
+}
+
+/**
+ * The settings a page and the admin act on.
+ *
+ * @param {object} [raw] - site.json `motion` (absent or partial is fine)
+ * @param {object} [footer] - site.json `footer`, for the keys the control used to live under
+ * @returns {object} every key of MOTION_DEFAULTS, nothing else
+ */
+export function normaliseMotionSettings(raw, footer) {
+    const m = raw && typeof raw === 'object' && !Array.isArray(raw) ? raw : {};
+    const f = footer && typeof footer === 'object' ? footer : {};
+    const has = (k) => m[k] !== undefined && m[k] !== null;
+
+    const enabledRaw = has('enabled') ? m.enabled : f.showMotionToggle;
+    const defaultRaw = has('default') ? m.default : f.motionDefault;
+    const controlRaw = has('control') ? m.control : f.motionControl;
+
+    const label = typeof m.label === 'string' && m.label.trim()
+        ? m.label.trim().replace(/\s+/g, ' ').slice(0, MOTION_LABEL_MAX)
+        : MOTION_DEFAULTS.label;
+
+    // The radius is clamped against the size (half of it is already a circle) - Search's rule.
+    const iconSize = num(m.iconSize, MOTION_DEFAULTS.iconSize, MOTION_ICON_SIZE_MIN, MOTION_ICON_SIZE_MAX);
+    const maxRadius = Math.floor(iconSize / 2);
+
+    return {
+        // Absent means shown, as footer.showMotionToggle always did.
+        enabled: enabledRaw !== false,
+        default: pick(defaultRaw, MOTION_DEFAULT_CHOICES, MOTION_DEFAULTS.default),
+        placement: pick(m.placement, MOTION_PLACEMENTS, MOTION_DEFAULTS.placement),
+        control: pick(controlRaw, MOTION_CONTROLS, MOTION_DEFAULTS.control),
+        triggerStyle: pick(m.triggerStyle, MOTION_TRIGGER_STYLES, MOTION_DEFAULTS.triggerStyle),
+        label,
+        position: pick(m.position, MOTION_POSITIONS, MOTION_DEFAULTS.position),
+        offsetX: num(m.offsetX, MOTION_DEFAULTS.offsetX, 0, MOTION_OFFSET_MAX),
+        offsetY: num(m.offsetY, MOTION_DEFAULTS.offsetY, 0, MOTION_OFFSET_MAX),
+        iconSize,
+        iconRadius: Math.min(maxRadius, num(m.iconRadius, MOTION_DEFAULTS.iconRadius, 0, maxRadius)),
+        class: cssClasses(typeof m.class === 'string' ? m.class : '').join(' ')
+    };
+}
+
+/** The settings for a site.json. */
+export function motionSettingsOf(site) {
+    return normaliseMotionSettings(site?.motion, site?.footer);
+}
+
+/** The footer keys older readers look at, kept in step with a `motion` block. */
+export function motionFooterMirror(settings) {
+    return {showMotionToggle: settings.enabled, motionDefault: settings.default, motionControl: settings.control};
+}

package/server/services/renderer.js

@@ -16,6 +16,7 @@ import {getProjectForPage} from './projects.js';
 import {resolveContextMenusForPage} from './contextMenus.js';
 import {buildCustomThemeStyleTag, buildOverrideStyleTag, getThemeTokenMap, listThemeIds, loadThemeConfig, resolveThemeClasses} from './themeSettings.js';
 import {getSearchSettings} from './search.js';
+import {motionSettingsOf} from './motionSettings.js';
 import {isToolEnabled} from './tools.js';
 import {consentSettingsFor, measurementIdOf} from './googleAnalytics.js';
 import {fmtDateTime} from './dates.js';
@@ -209,10 +210,30 @@ export async function buildFooterBlocks(site, ctx = {}) {
     return cols.length ? `<div class="cms-footer-blocks">${cols.join('')}</div>` : '';
 }
 
+const MOTION_ASSET_V = '20261029-motion-under-switcher';
+
 /** The site's reduced-motion default for visitors who have not chosen: 'system', 'off' or 'on'. */
 function motionDefaultOf(site) {
-    const d = site?.footer?.motionDefault;
-    return d === 'off' || d === 'on' ? d : 'system';
+    return motionSettingsOf(site).default;
+}
+
+/**
+ * The "Reduce motion" control (site.json `motion`, Site Settings > Reduce motion):
+ * the whitelisted settings for window.__CMS_SITE__.motion - site.js draws the
+ * control from them (public/js/motion-control.mjs) - and its stylesheet. The
+ * old footer keys still count where `motion` says nothing (motionSettings.js).
+ *
+ * Both render paths need this - the standing trap in this file.
+ *
+ * @param {object} site - site.json
+ * @returns {{siteFields: {motion: object}, headTag: string}}
+ */
+export function buildMotionAssets(site) {
+    const motion = motionSettingsOf(site);
+    return {
+        siteFields: {motion},
+        headTag: motion.enabled ? `<link rel="stylesheet" href="/public/css/motion.css?v=${MOTION_ASSET_V}">` : ''
+    };
 }
 
 /** The override a page's [navbar] tag left in its html (the first one), or null. */
@@ -450,6 +471,7 @@ export async function renderPage(page, opts = {}) {
 
     const themeView = await buildThemeView(page);
     const searchAssets = buildSearchAssets();
+    const motionAssets = buildMotionAssets(site);
     const footerBlocksHtml = preset.footer !== false ? await buildFooterBlocks(site, {user: opts.user || null, urlPath: menuCtx.urlPath, project: menuCtx.project, tags: opts.cacheTags}) : '';
     const switcherAssets = buildThemeSwitcherAssets(themeView.cfg, {
         html: `${page.html || ''}${overlayMenus}${footerBlocksHtml}`,
@@ -547,9 +569,12 @@ export async function renderPage(page, opts = {}) {
         footerScript: footerJson ? `window.__CMS_FOOTER__ = ${footerJson};` : '',
         ctxMenusScript: ctxMenusScript,
         ctxMenusModule: ctxMenusModule,
+        // Every `<` escaped, not only `</script>`: a label holding `<!--<script` would
+        // otherwise put the parser in script-data-escaped state and swallow the page.
         siteJson: JSON.stringify(Object.assign(
             {
                 title: site.title,
+                ...(site.brand?.enabled === false ? {brandingEnabled: false} : {}),
                 footer: site.footer
                     ? {
                         ...site.footer,
@@ -561,13 +586,14 @@ export async function renderPage(page, opts = {}) {
             site.backToTop?.enabled    ? { backToTop: site.backToTop }         : {},
             site.goToBottom?.enabled   ? { goToBottom: site.goToBottom }        : {},
             consentAssets.siteFields,
+            motionAssets.siteFields,
             autoTheme ? {autoTheme} : {}
-        )).replace(/<\/script>/gi, '<\\/script>'),
+        )).replace(/</g, '\\u003c'),
         headInject: [injection.head, navbarFontLink].filter(Boolean).join('\n'),
         // Theme overrides land BEFORE content/custom.css: the overrides are
         // generated, custom.css is hand-written, and the hand-written one stays
         // the last word.
-        headInjectLate: [injection.headLate, searchAssets.headTag, switcherAssets.headTag, themeView.customThemeStyleTag, themeView.overrideStyleTag, customCssTag, navbarStyleTag]
+        headInjectLate: [injection.headLate, searchAssets.headTag, motionAssets.headTag, switcherAssets.headTag, themeView.customThemeStyleTag, themeView.overrideStyleTag, customCssTag, navbarStyleTag]
             .filter(Boolean).join('\n'),
         bodyEndInject: [
             // Draft banner - first, so it is the topmost fixed element and a
@@ -1256,6 +1282,7 @@ export async function renderBlogPage(templatePath, data = {}, seoMeta = {}) {
     // other is the standing trap in this file.
     const themeView = await buildThemeView({});
     const searchAssets = buildSearchAssets();
+    const motionAssets = buildMotionAssets(site);
     const footerBlocksHtml = await buildFooterBlocks(site, {user, urlPath: seoMeta.urlPath || '/', project: menuCtx.project ?? null});
     const switcherAssets = buildThemeSwitcherAssets(themeView.cfg, {
         html: `${renderedFragment || ''}${overlayMenus}${footerBlocksHtml}`,
@@ -1340,8 +1367,10 @@ export async function renderBlogPage(templatePath, data = {}, seoMeta = {}) {
         footerScript: footerJson ? `window.__CMS_FOOTER__ = ${footerJson};` : '',
         ctxMenusScript: ctxMenusScript,
         ctxMenusModule: ctxMenusModule,
+        // Every `<` escaped, as on the page path above.
         siteJson: JSON.stringify({
             title: site.title,
+            ...(site.brand?.enabled === false ? {brandingEnabled: false} : {}),
             footer: site.footer
                 ? {
                     ...site.footer,
@@ -1349,13 +1378,14 @@ export async function renderBlogPage(templatePath, data = {}, seoMeta = {}) {
                 }
                 : site.footer,
             social: site.social || null,
+            ...motionAssets.siteFields,
             ...(bare ? {} : consentAssets.siteFields)
-        }).replace(/<\/script>/gi, '<\\/script>'),
+        }).replace(/</g, '\\u003c'),
         headInject: [bare ? '' : injection.head, navbarFontLink].filter(Boolean).join('\n'),
         // Theme overrides land BEFORE content/custom.css: the overrides are
         // generated, custom.css is hand-written, and the hand-written one stays
         // the last word.
-        headInjectLate: [bare ? '' : injection.headLate, searchAssets.headTag, switcherAssets.headTag, themeView.customThemeStyleTag, themeView.overrideStyleTag, customCssTag, navbarStyleTag]
+        headInjectLate: [bare ? '' : injection.headLate, searchAssets.headTag, motionAssets.headTag, switcherAssets.headTag, themeView.customThemeStyleTag, themeView.overrideStyleTag, customCssTag, navbarStyleTag]
             .filter(Boolean).join('\n'),
         bodyEndInject: [
             overlayMenus,

package/server/templates/page.html

@@ -112,7 +112,7 @@
           _stored = JSON.parse(localStorage.getItem('domma:reduced_motion'));
         } catch (e) {
         }
-        // No choice of the visitor's yet: the site's default (Site Settings > Footer) -
+        // No choice of the visitor's yet: the site's default (Site Settings > Reduce motion) -
         // 'on' or 'off' decide it; 'system' (or nothing) leaves it to the device.
         if (_stored === null || _stored === undefined) {
           var _def = '{{motionDefault}}';
@@ -188,7 +188,7 @@
     <script src="/public/js/form-logic-engine.js?v=20261025-dropzone-disable" defer></script>
 
     <!-- Site initialisation -->
-    <script src="/public/js/site.js?v=20261029-glider-layout" type="module"></script>
+    <script src="/public/js/site.js?v=20261029-site-branding" type="module"></script>
     <script src="/public/js/collection-context.js?v=20261010-utf8-payloads" type="module"></script>
     {{ctxMenusModule}}