@acms-subir/core 0.3.6 → 0.3.8

package/CHANGELOG.md

@@ -1,5 +1,32 @@
 # @acms-subir/core
 
+## 0.3.8
+
+### Patch Changes
+
+- Read saved email-provider settings on the bookings screen so configured Mailgun and SES connections are recognized. Show actionable Site URL setup warnings separately from provider readiness, report specific booking email preparation errors, and clarify that a successful connection test does not validate email links.
+
+  Allow HTTP email links for explicitly configured localhost and loopback development URLs, preserving the port. Public sites still require HTTPS.
+
+  Offer custom booking lengths with hours and minutes, either as one fixed duration or an editable list of choices. Validate lengths before saving and preserve existing duration settings.
+
+## 0.3.7
+
+### Patch Changes
+
+- Bound analytics and timezone formatter caches so changing keys cannot accumulate indefinitely in long-lived Node servers. Add cache retention regression tests and an isolated production Node/Docker memory test in the framework repository.
+- Event settings now live on the edit page, in one settings column above the event's content: When, Where, Registration, Organize and Status sections, each with its label and help on the left and roomy controls on the right, plus a sticky index showing each section's current value (a jump bar in Split mode and on phones). Rooms and people to hold are a checklist table, repeats read as one sentence, and Cancelled has its own Status section. The settings sidebar for events is just URL & SEO. Button and RSVP merge into one Registration choice (None / Link / RSVP).
+
+  Events get maps and saved places. The Where field searches saved places, reads pasted Google, Apple and OpenStreetMap links or Google embed code, and — with a maps provider you configure (`acms({ maps: { provider } })` plus `MAPS_API_KEY`, or `MAPS_URL` for self-hosted Photon/Nominatim/Pelias) — suggests addresses and adds a static map image to event pages. Nothing runs without configuration. Saved places (Calendar settings → Places) fill in an event's location, can be the default for new events, rooms can belong to one, and editing a place updates its upcoming events. Adds migration v43.
+
+- Forms. Build reusable forms and templates under Content → Forms, publish them at `/forms/:id` or place them on any page with the Form block, and collect responses.
+
+  - **Builder:** questions on the left, the live form in the middle, and settings for the selected question on the right. Edit labels and help text right on the form, add questions from a searchable menu (or press `/`), drag to reorder, and use undo/redo. Drafts save automatically, and visitors only see changes after you click Publish changes. On phones, editing happens in a question list with a bottom sheet.
+  - **Question types:** short and long text, multiple choice and checkboxes (with an optional "Other" answer), dropdown, email, phone, website, number, date, agree checkbox, and section headings. Fields can be half width, so two sit side by side. Forms saved before this release keep working unchanged.
+  - **Responses:** a table with one column per question, search, date range, a side drawer with every answer (including questions you've since removed), bulk export and delete, and a CSV with one row per response.
+  - **Share:** public link, embed code, the pages that use the form, and a switch to stop accepting responses. In the post editor, the Form block shows a preview of the actual form.
+  - **Event registration:** an event's built-in RSVP form opens in the same builder, full screen. Name, email and seats are always asked; start from a starter or a saved event template, and save your questions as a template for other events.
+
 ## 0.3.6
 
 ### Patch Changes

package/integration.mjs

@@ -249,6 +249,28 @@ function resolveSearch(search) {
   return { enabled };
 }
 
+// Defaults + validation for acms({ maps }). Maps are bring-your-own: the
+// provider is named here, its key/URL come from MAPS_API_KEY / MAPS_URL at
+// runtime (never serialized into the build). Omitted provider = picked from
+// the environment (lib/maps/config.ts); nothing runs without configuration.
+const MAPS_PROVIDERS = ['geoapify', 'google', 'mapbox', 'locationiq', 'stadia', 'photon', 'nominatim', 'pelias'];
+function resolveMaps(maps) {
+  if (maps === undefined || maps === null) return { provider: '' };
+  if (typeof maps !== 'object' || Array.isArray(maps)) throw new Error('acms: maps must be an object like { provider: "geoapify" }');
+  const unknown = Object.keys(maps).filter((k) => k !== 'provider');
+  if (unknown.length > 0) {
+    throw new Error(
+      `acms: unknown maps key${unknown.length > 1 ? 's' : ''} ${unknown.map((k) => `"${k}"`).join(', ')} — ` +
+        'the only valid key is maps.provider (keys go in the MAPS_API_KEY / MAPS_URL environment variables)'
+    );
+  }
+  const provider = maps.provider ?? '';
+  if (provider !== '' && !MAPS_PROVIDERS.includes(provider)) {
+    throw new Error(`acms: maps.provider must be one of ${MAPS_PROVIDERS.map((p) => `"${p}"`).join(', ')} — got "${provider}"`);
+  }
+  return { provider };
+}
+
 // Defaults + validation for acms({ calendar }). The calendar module ships on:
 // a main calendar page at `base`, event pages under `eventsBase`, ICS feeds,
 // and the admin Calendar section. `calendar: false` (or enabled: false)
@@ -459,6 +481,13 @@ function acmsVitePlugin(userConfig) {
  *   embeds, and the admin Calendar section. `eventFields` adds custom fields
  *   to every event (edited in the event sidebar, exposed to templates and the
  *   API). On by default — `calendar: false` removes all of it.
+ * @param {{provider?: 'geoapify' | 'google' | 'mapbox' | 'locationiq' | 'stadia' | 'photon' | 'nominatim' | 'pelias'}} [options.maps]
+ *   Maps for events (bring your own provider): address suggestions in the
+ *   event editor and a static map image on event pages. Set MAPS_API_KEY
+ *   (hosted providers) or MAPS_URL (self-hosted Photon/Nominatim/Pelias) in
+ *   the environment. Without a provider, MAPS_URL picks photon and
+ *   MAPS_API_KEY picks geoapify; with neither, maps are off — saved places and
+ *   pasted map links still work.
  * @param {false | {enabled?: boolean, operatorName?: string, contactEmail?: string, updatedAt?: string}} [options.legal]
  *   Default privacy/terms routes and footer links; published CMS pages at those slugs override the text.
  * @returns {import('astro').AstroIntegration}
@@ -473,6 +502,7 @@ export default function acms(options = {}) {
   const search = resolveSearch(options.search);
   const mobile = resolveMobile(options.mobile);
   const calendar = resolveCalendar(options.calendar, contentBases, i18n.locales);
+  const maps = resolveMaps(options.maps);
   const legal = { enabled: true, operatorName: '', contactEmail: '', updatedAt: '', ...(options.legal === false ? { enabled: false } : options.legal ?? {}) };
   if (typeof legal.enabled !== 'boolean' || ['operatorName','contactEmail','updatedAt'].some(k => typeof legal[k] !== 'string')) throw new Error('acms: invalid legal configuration');
   if (legal.contactEmail && !/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(legal.contactEmail)) throw new Error('acms: legal.contactEmail must be an email address');
@@ -486,11 +516,17 @@ export default function acms(options = {}) {
     search,
     mobile,
     calendar,
+    maps,
     legal,
   };
   const routes = [...ROUTES,
     ['/api/v1/site', 'api/v1/site.ts'],
     ['/api/v1/theme', 'api/v1/theme.ts'],
+    ['/admin/forms', 'admin/forms/index.astro'],
+    ['/admin/forms/[id]', 'admin/forms/[id].astro'],
+    ['/admin/forms/[id]/submissions', 'admin/forms/[id]/submissions.astro'],
+    ['/admin/forms/[id]/share', 'admin/forms/[id]/share.astro'],
+    ['/forms/[id]', 'forms/[id].astro'],
     ['/api/v1/pages/home', 'api/v1/pages/home.ts'],
     ['/api/v1/pages/[...slug]', 'api/v1/pages/[...slug].ts'],
     ['/api/v1/openapi.json', 'api/v1/openapi.json.ts'],
@@ -567,11 +603,12 @@ export default function acms(options = {}) {
       ['/admin/calendar/calendars', 'admin/calendar/calendars.astro'],
       ['/admin/calendar/integrations', 'admin/calendar/integrations.astro'],
       ['/api/calendar/docs', 'api/calendar/docs.ts'],
+      [`${calendar.bookBase}/manage/[token]`, 'book/manage/[token].astro'],
+      ['/admin/calendar/bookings', 'admin/calendar/bookings.astro'],
     );
     if (calendar.bookings) {
       routes.push(
         [calendar.bookBase, 'book/index.astro'],
-        [`${calendar.bookBase}/manage/[token]`, 'book/manage/[token].astro'],
         [`${calendar.bookBase}/[resource].ics`, 'book/[resource].ics.ts'],
         [`${calendar.bookBase}/[resource]`, 'book/[resource]/index.astro'],
         [`${calendar.bookBase}/[resource]/[link]`, 'book/[resource]/[link].astro'],
@@ -583,7 +620,6 @@ export default function acms(options = {}) {
         ['/api/calendar/bookings', 'api/calendar/bookings/index.ts'],
         ['/api/calendar/bookings/[id]', 'api/calendar/bookings/[id].ts'],
         ['/api/calendar/resources', 'api/calendar/resources.ts'],
-        ['/admin/calendar/bookings', 'admin/calendar/bookings.astro'],
         ['/admin/calendar/resources', 'admin/calendar/resources/index.astro'],
         ['/admin/calendar/resources/[id]', 'admin/calendar/resources/[id].astro'],
         ['/admin/calendar/resources/[id]/links/[link]', 'admin/calendar/resources/link.astro'],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acms-subir/core",
-  "version": "0.3.6",
+  "version": "0.3.8",
   "publishConfig": {
     "access": "public"
   },

package/src/actions/index.ts

@@ -1,3 +1,4 @@
+import { FormDefinition } from '../lib/forms/schema';
 import { pickDesignDraft } from '../lib/drafts';
 import { ApiError } from '../lib/api';
 import { validateSectionDesign } from '../lib/design-service';
@@ -36,6 +37,8 @@ import { shareEpoch } from '../lib/drafts';
 import { createDesignToken } from '../lib/preview';
 import { getTheme } from '../lib/theme';
 import { savePost, applyPostUpdate, savePage, applyPageUpdate, saveEvent, applyEventUpdate, type SaveHooks } from '../lib/content-service';
+import { resolveMapLink, searchPlaces } from '../lib/maps/service';
+import { savePlace } from '../lib/maps/places';
 
 // "What changes" for the Design screen: the staged draft vs the live design
 async function designChanges(repo: Awaited<ReturnType<typeof getRepo>>) {
@@ -67,6 +70,22 @@ const BlockInput = z.object({
   type: z.string(),
   config: z.record(z.any()),
 });
+// an event's Where. The pin fields are optional so older callers that send
+// only name/address/url keep working (unchanged text keeps the pin).
+const Lat = z.number().min(-90).max(90).nullable();
+const Lng = z.number().min(-180).max(180).nullable();
+const LocationInput = z.object({
+  name: z.string().max(300),
+  address: z.string().max(500),
+  url: z.string().max(1000),
+  lat: Lat.optional(),
+  lng: Lng.optional(),
+  placeId: z.string().max(100).optional(),
+  showMap: z.boolean().optional(),
+  mapImage: z.string().max(500).optional(),
+  mapImageDark: z.string().max(500).optional(),
+});
+const mapsCtx = (ctx: ActionAPIContext) => ({ locals: ctx.locals, origin: ctx.url.origin });
 
 
 // ---- calendar helpers ------------------------------------------------------
@@ -105,6 +124,70 @@ async function importEvents(
 }
 
 export const server = {
+  forms: {
+    list: defineAction({ handler: async (_, ctx) => {
+      await requireAdmin(ctx);
+      return { forms: await (await getRepo(ctx.locals)).forms.list() };
+    } }),
+    // Static preview for the post editor's Form block: the published (live)
+    // definition rendered with the public field markup.
+    preview: defineAction({
+      input: z.object({ id: z.string().min(1).max(80) }),
+      handler: async (input, ctx) => {
+        await requireAdmin(ctx);
+        const form = await (await getRepo(ctx.locals)).forms.get(input.id);
+        if (!form || form.kind !== 'form') throw new ActionError({ code: 'NOT_FOUND', message: 'Form not found.' });
+        const { renderFields } = await import('../lib/forms/fields');
+        const d = form.definition;
+        return { name: form.name, status: form.status, hasDraft: Boolean(form.draft), title: d.title, intro: d.intro, submitLabel: d.submitLabel || 'Submit', html: renderFields(d, {}, `pv-${form.id.slice(0, 8)}`) };
+      },
+    }),
+    saveTemplate: defineAction({
+      input: z.object({ name: z.string().trim().min(1).max(120), definition: z.any(), purpose: z.enum(['event', 'general']) }),
+      handler: async (input, ctx) => {
+        await requireAdmin(ctx);
+        const parsed = FormDefinition.safeParse(input.definition);
+        if (!parsed.success) throw new ActionError({ code: 'BAD_REQUEST', message: parsed.error.issues[0]?.message || 'Invalid form.' });
+        const repo = await getRepo(ctx.locals);
+        const form = await repo.forms.create(input.name, parsed.data, 'template', input.purpose);
+        return { form };
+      },
+    }),
+    // Builder autosave + publish. `save` on a published form stages a draft;
+    // `publish` makes the definition live. The revision guards against edits
+    // from another window (409 → reload).
+    save: defineAction({
+      input: z.object({ id: z.string(), revision: z.number().int(), name: z.string().trim().min(1).max(120), definition: z.any(), op: z.enum(['save', 'publish', 'archive']) }),
+      handler: async (input, ctx) => {
+        await requireAdmin(ctx);
+        const parsed = FormDefinition.safeParse(input.definition);
+        if (!parsed.success) throw new ActionError({ code: 'BAD_REQUEST', message: parsed.error.issues[0]?.message || 'Invalid form.' });
+        const repo = await getRepo(ctx.locals);
+        const current = await repo.forms.get(input.id);
+        if (!current) throw new ActionError({ code: 'NOT_FOUND', message: 'Form not found.' });
+        // Editing a published form back to what's live drops the staged draft
+        // (re-publishing an identical definition changes nothing visitors see).
+        const backToLive = input.op === 'save' && current.status === 'published' && JSON.stringify(parsed.data) === JSON.stringify(current.definition);
+        try { await repo.forms.save(input.id, input.revision, input.name, parsed.data, backToLive ? 'publish' : input.op); } catch (e) { asActionError(e); }
+        const form = await repo.forms.get(input.id);
+        if (!form) throw new ActionError({ code: 'NOT_FOUND', message: 'Form not found.' });
+        return { revision: form.revision, status: form.status, hasDraft: Boolean(form.draft) };
+      },
+    }),
+    // "Use template" from a general template's Build page: an independent form copy.
+    useTemplate: defineAction({
+      input: z.object({ id: z.string(), name: z.string().trim().min(1).max(120).optional() }),
+      handler: async (input, ctx) => {
+        await requireAdmin(ctx);
+        const repo = await getRepo(ctx.locals);
+        const source = await repo.forms.get(input.id);
+        if (!source || source.kind !== 'template' || source.purpose !== 'general') throw new ActionError({ code: 'NOT_FOUND', message: 'Template not found.' });
+        const form = await repo.forms.create(input.name || source.name, source.draft ?? source.definition, 'form', 'general');
+        return { id: form.id };
+      },
+    }),
+  },
+
   posts: {
     save: defineAction({
       input: z.object({
@@ -883,11 +966,11 @@ export const server = {
         rrule: z.string().max(500).optional(),
         exdates: z.array(z.string()).max(500).optional(),
         cancelled: z.boolean().optional(),
-        location: z.object({ name: z.string().max(300), address: z.string().max(500), url: z.string().max(1000) }).optional(),
+        location: LocationInput.optional(),
         cta: z.object({ label: z.string().max(120), href: z.string().max(1000), style: z.enum(['primary', 'outline']) }).optional(),
         calendarIds: z.array(z.string()).max(50).optional(),
         fields: z.record(z.string().max(2000)).optional(),
-        rsvp: z.object({ enabled: z.boolean(), capacity: z.number().int().min(0).max(100000), autoConfirm: z.boolean(), maxSeats: z.number().int().min(1).max(50) }).optional(),
+        rsvp: z.object({ enabled: z.boolean(), capacity: z.number().int().min(0).max(100000), autoConfirm: z.boolean(), maxSeats: z.number().int().min(1).max(50), form: z.any().optional() }).optional(),
         roomHold: z.object({ resourceIds: z.array(z.string()).max(50), span: z.enum(['event', 'day']), before: z.number().int().min(0).max(1440), after: z.number().int().min(0).max(1440), whileDraft: z.boolean(), keep: z.array(z.string()).max(500).default([]) }).optional(),
         scheduledAt: nullableTs.optional(),
       }),
@@ -1186,6 +1269,67 @@ export const server = {
     }),
   },
 
+  // Maps (bring your own provider — lib/maps/config.ts). Keys never leave
+  // the server; with nothing configured, search returns [] and resolve still
+  // parses links.
+  maps: {
+    search: defineAction({
+      input: z.object({ q: z.string().max(200), near: z.object({ lat: z.number().min(-90).max(90), lng: z.number().min(-180).max(180) }).optional() }),
+      handler: async ({ q, near }, ctx) => {
+        await requireAdmin(ctx);
+        try { return { results: await searchPlaces(q, near, mapsCtx(ctx)) }; }
+        catch (err) {
+          console.warn('[acms maps] search failed:', err instanceof Error ? err.message : err);
+          throw new ActionError({ code: 'BAD_GATEWAY', message: 'Address suggestions aren’t answering right now.' });
+        }
+      },
+    }),
+    // a pasted map link / embed code / "lat, lng" → location (short links
+    // are expanded server-side through Google's hosts only)
+    resolve: defineAction({
+      input: z.object({ url: z.string().max(10_000) }),
+      handler: async ({ url }, ctx) => {
+        await requireAdmin(ctx);
+        return { location: await resolveMapLink(url, mapsCtx(ctx)) };
+      },
+    }),
+  },
+
+  places: {
+    list: defineAction({
+      handler: async (_input, ctx) => {
+        await requireAdmin(ctx);
+        return { places: await (await getRepo(ctx.locals)).listPlaces() };
+      },
+    }),
+    // create (no id) or update; refreshes upcoming events that use the place
+    save: defineAction({
+      input: z.object({
+        id: z.string().max(100).optional(),
+        name: z.string().max(300),
+        address: z.string().max(500).default(''),
+        url: z.string().max(1000).default(''),
+        lat: Lat.default(null),
+        lng: Lng.default(null),
+        notes: z.string().max(2000).default(''),
+        isDefault: z.boolean().default(false),
+      }),
+      handler: async (input, ctx) => {
+        await requireAdmin(ctx);
+        const repo = await getRepo(ctx.locals);
+        try { return await savePlace(repo, input, mapsCtx(ctx)); } catch (e) { asActionError(e); }
+      },
+    }),
+    delete: defineAction({
+      input: z.object({ id: z.string().max(100) }),
+      handler: async ({ id }, ctx) => {
+        await requireAdmin(ctx);
+        await (await getRepo(ctx.locals)).deletePlace(id);
+        return { ok: true };
+      },
+    }),
+  },
+
   unsplash: {
     search: defineAction({
       input: z.object({ query: z.string().min(1), page: z.number().int().min(1).default(1) }),

package/src/components/EmailSettings.tsx

@@ -278,6 +278,12 @@ export default function EmailSettings() {
 
   return (
     <div className="ems">
+      {data.linkError && !savedOff && (
+        <p className="notice warn" role="status">
+          {data.linkError} A connection test can succeed before this is set.{' '}
+          <a href="/admin/settings#site">Open site settings</a>
+        </p>
+      )}
       <div className="seg ems-tabs" role="tablist" aria-label="Email settings">
         {TABS.map((t, i) => (
           <button key={t.id} ref={(el) => { tabRefs.current[i] = el; }} type="button" role="tab" id={id(`tab-${t.id}`)}

package/src/components/EventPage.astro

@@ -9,6 +9,7 @@ import { addToCalendarLinks, eventTimeZone, formatOccurrence, safeColor, type Oc
 import { describeRepeat } from '../lib/calendar/rrule';
 import { eventCardHtml, safeHref } from '../lib/calendar/cards';
 import { siteLocale } from '../lib/dates';
+import { directionsUrl, mapAttribution, MAP_HEIGHT, MAP_WIDTH } from '../lib/maps/service';
 
 interface Props {
   event: CalEvent;
@@ -20,7 +21,7 @@ interface Props {
   origin: string;
   preview?: boolean;
   // RSVP state when the event takes RSVPs (null otherwise)
-  rsvp?: { going: number; left: number | null; maxSeats: number; error: string; open: boolean } | null;
+  rsvp?: { going: number; left: number | null; maxSeats: number; error: string; open: boolean; formHtml?: string; fieldsHtml?: string; values?: { name: string; email: string; seats: string } } | null;
 }
 const { event: e, occurrence: o, settings, calendars, html, upcoming, origin, preview = false, rsvp = null } = Astro.props;
 const tz = eventTimeZone(e, settings);
@@ -38,6 +39,12 @@ const mapHref = e.location.url
   : e.location.address
     ? `https://www.google.com/maps/search/?api=1&query=${encodeURIComponent([e.location.name, e.location.address].filter(Boolean).join(', '))}`
     : '';
+// static map (made when the event was saved; see lib/maps/service.ts)
+const loc = e.location;
+const showMap = loc.showMap !== false && Boolean(loc.mapImage) && typeof loc.lat === 'number' && typeof loc.lng === 'number';
+const directions = showMap ? safeHref(directionsUrl(loc)) : '';
+const mapCredit = showMap ? mapAttribution(loc.mapImage) : '';
+const mapLabel = loc.name || loc.address || 'the location';
 const fieldRows = CALENDAR.eventFields.filter((fd) => e.fields[fd.key]).map((fd) => ({ label: fd.label, value: e.fields[fd.key], type: fd.type }));
 const visibleTags = e.tags.filter((t) => !t.startsWith('#'));
 const I = {
@@ -95,6 +102,15 @@ const online = /zoom\.us|meet\.google|teams\.microsoft|webex|whereby|jit\.si/i.t
           </div>
         </div>
       )}
+      {showMap && (
+        <figure class="pc-ev-map">
+          <a href={directions || undefined} target="_blank" rel="noopener" aria-label={`Directions to ${mapLabel}`}>
+            <img class:list={['pc-ev-map-img', { 'is-light': Boolean(loc.mapImageDark) }]} src={loc.mapImage} alt={`Map of ${mapLabel}`} width={MAP_WIDTH} height={MAP_HEIGHT} loading="lazy" decoding="async" />
+            {loc.mapImageDark && <img class="pc-ev-map-img is-dark" src={loc.mapImageDark} alt={`Map of ${mapLabel}`} width={MAP_WIDTH} height={MAP_HEIGHT} loading="lazy" decoding="async" />}
+          </a>
+          {mapCredit && <figcaption class="pc-ev-map-credit">{mapCredit}</figcaption>}
+        </figure>
+      )}
       {repeats && (
         <div class="pc-ev-fact">
           <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d={I.repeat} /></svg>
@@ -114,15 +130,19 @@ const online = /zoom\.us|meet\.google|teams\.microsoft|webex|whereby|jit\.si/i.t
             <details class="pc-ev-rsvpform" open={Boolean(rsvp.error)}>
               <summary class="pc-ev-cta">Save my seat</summary>
               <form method="post">
+                <Fragment set:html={rsvp.formHtml ?? ''}/>
+                {e.rsvp.form?.title && <h3>{e.rsvp.form.title}</h3>}
+                {e.rsvp.form?.intro && <p>{e.rsvp.form.intro}</p>}
                 {rsvp.error && <p class="pc-bk-error">{rsvp.error}</p>}
-                <label class="pc-bk-field"><span>Your name</span><input name="name" required autocomplete="name" /></label>
-                <label class="pc-bk-field"><span>Email</span><input name="email" type="email" required autocomplete="email" /></label>
+                <label class="pc-bk-field"><span>Your name</span><input name="name" required maxlength="120" autocomplete="name" value={rsvp.values?.name} /></label>
+                <label class="pc-bk-field"><span>Email</span><input name="email" type="email" required maxlength="200" autocomplete="email" value={rsvp.values?.email} /></label>
                 {rsvp.maxSeats > 1 && (
                   <label class="pc-bk-field"><span>Seats</span>
-                    <select name="seats">{Array.from({ length: Math.min(rsvp.maxSeats, rsvp.left ?? rsvp.maxSeats) }, (_, i) => <option value={i + 1}>{i + 1}</option>)}</select>
+                    <select name="seats">{Array.from({ length: Math.min(rsvp.maxSeats, rsvp.left ?? rsvp.maxSeats) }, (_, i) => <option value={i + 1} selected={Number(rsvp.values?.seats || 1) === i + 1}>{i + 1}</option>)}</select>
                   </label>
                 )}
-                <button class="pc-bk-submit" type="submit">{e.rsvp.autoConfirm ? 'Confirm my seat' : 'Request a seat'}</button>
+                <Fragment set:html={rsvp.fieldsHtml ?? ''}/>
+                <button class="pc-bk-submit" type="submit">{e.rsvp.form?.submitLabel || (e.rsvp.autoConfirm ? 'Confirm my seat' : 'Request a seat')}</button>
               </form>
             </details>
           ) : <p class="pc-ev-full">{rsvp.open ? 'This event is full.' : 'RSVPs are closed.'}</p>}

package/src/components/booking/DurationEditor.astro

@@ -0,0 +1,156 @@
+---
+// Booking lengths as Hours + Minutes. "One length" is a single pair; "Several
+// lengths" is a list of pairs people pick from (add/remove rows, plus a few
+// common presets). Each block carries data-mode so the page can show/disable
+// it with the mode switch. Rows are raw text so a failed save shows what was typed.
+import type { DurationRow } from '../../lib/booking/forms';
+import { describeLength } from '../../lib/booking/availability';
+interface Props { single: DurationRow; singleError?: string; several: DurationRow[]; severalError?: string }
+const { single, singleError = '', several, severalError = '' } = Astro.props;
+const PRESETS = [30, 60, 90, 120, 150, 180, 240];
+const rows = several.length ? several : [{ h: '1', m: '0' }];
+---
+
+<div class="dur" data-mode="slots" data-dur-single>
+  <fieldset aria-describedby={singleError ? 'dur-one-err' : undefined}>
+    <legend>Length</legend>
+    <div class="dur-row">
+      <label class="dur-part"><input type="number" name="durH" min="0" max="24" step="1" inputmode="numeric" value={single.h} aria-invalid={singleError ? 'true' : undefined} /> <span>hours</span></label>
+      <label class="dur-part"><input type="number" name="durM" min="0" max="59" step="1" inputmode="numeric" value={single.m} aria-invalid={singleError ? 'true' : undefined} /> <span>min</span></label>
+    </div>
+    {singleError && <p class="dur-err" id="dur-one-err" role="alert">{singleError}</p>}
+    <div class="dur-presets" role="group" aria-label="Common lengths">
+      {PRESETS.map((n) => <button type="button" class="btn sm" data-preset={n}>{describeLength(n)}</button>)}
+    </div>
+  </fieldset>
+</div>
+
+<div class="dur" data-mode="range" data-dur-several>
+  <fieldset aria-describedby={`dur-many-hint${severalError ? ' dur-many-err' : ''}`}>
+    <legend>Lengths people can pick</legend>
+    <ol class="dur-list" data-dur-list>
+      {rows.map((r, i) => (
+        <li class="dur-item">
+          <div class="dur-row">
+            <label class="dur-part"><input type="number" name="lenH" min="0" max="24" step="1" inputmode="numeric" value={r.h} aria-label={`Length ${i + 1}, hours`} aria-invalid={r.error ? 'true' : undefined} aria-describedby={r.error ? `dur-row-err-${i}` : undefined} /> <span aria-hidden="true">hours</span></label>
+            <label class="dur-part"><input type="number" name="lenM" min="0" max="59" step="1" inputmode="numeric" value={r.m} aria-label={`Length ${i + 1}, minutes`} aria-invalid={r.error ? 'true' : undefined} aria-describedby={r.error ? `dur-row-err-${i}` : undefined} /> <span aria-hidden="true">min</span></label>
+            <button type="button" class="icon-btn" data-dur-remove aria-label={`Remove length ${i + 1}`} title="Remove" disabled={rows.length === 1}>×</button>
+          </div>
+          {r.error && <p class="dur-err" id={`dur-row-err-${i}`}>{r.error}</p>}
+        </li>
+      ))}
+    </ol>
+    <template data-dur-row>
+      <li class="dur-item">
+        <div class="dur-row">
+          <label class="dur-part"><input type="number" name="lenH" min="0" max="24" step="1" inputmode="numeric" /> <span aria-hidden="true">hours</span></label>
+          <label class="dur-part"><input type="number" name="lenM" min="0" max="59" step="1" inputmode="numeric" /> <span aria-hidden="true">min</span></label>
+          <button type="button" class="icon-btn" data-dur-remove title="Remove">×</button>
+        </div>
+      </li>
+    </template>
+    {severalError && <p class="dur-err" id="dur-many-err" role="alert">{severalError}</p>}
+    <div class="dur-presets" role="group" aria-label="Add a common length">
+      <button type="button" class="btn sm" data-dur-add>+ Add a length</button>
+      {PRESETS.map((n) => <button type="button" class="btn sm ghost" data-preset={n}>+ {describeLength(n)}</button>)}
+    </div>
+    <p class="hint" id="dur-many-hint">People pick one of these when they book. Duplicates are merged and the list is sorted when you save.</p>
+  </fieldset>
+</div>
+
+<style>
+  .dur { margin-bottom: 14px; }
+  .dur fieldset { border: 0; padding: 0; margin: 0; min-width: 0; }
+  .dur legend { padding: 0; font-size: 12px; color: var(--muted); margin-bottom: 5px; font-weight: 500; }
+  .dur-row { display: flex; align-items: center; gap: 10px; flex-wrap: wrap; }
+  .dur-part { display: inline-flex; align-items: center; gap: 6px; font-size: 13px; color: var(--muted); }
+  .dur-part input { width: 84px; }
+  .dur [aria-invalid='true'] { border-color: var(--red); }
+  .dur-err { color: var(--red); font-size: 12.5px; margin: 5px 0 0; }
+  .dur-list { list-style: none; margin: 0; padding: 0; display: grid; gap: 8px; }
+  .dur-item .icon-btn:disabled { opacity: 0.35; cursor: default; }
+  .dur-presets { display: flex; flex-wrap: wrap; gap: 6px; margin-top: 10px; }
+  .dur .hint { margin: 8px 0 0; }
+  @media (max-width: 480px) {
+    .dur-part input { width: 72px; }
+  }
+</style>
+
+<script>
+  const minutesOf = (h: string, m: string) => (Number(h) || 0) * 60 + (Number(m) || 0);
+  const clearError = (scope: Element) => {
+    scope.querySelectorAll('[aria-invalid]').forEach((i) => i.removeAttribute('aria-invalid'));
+    scope.querySelectorAll('.dur-err').forEach((p) => p.remove());
+  };
+
+  document.querySelectorAll<HTMLElement>('[data-dur-single]').forEach((root) => {
+    const [h, m] = root.querySelectorAll<HTMLInputElement>('input[type=number]');
+    root.addEventListener('input', () => clearError(root));
+    root.addEventListener('click', (e) => {
+      const b = (e.target as Element).closest<HTMLElement>('[data-preset]');
+      if (!b) return;
+      const n = Number(b.dataset.preset);
+      h.value = String(Math.floor(n / 60));
+      m.value = String(n % 60);
+      clearError(root);
+      h.dispatchEvent(new Event('change', { bubbles: true }));
+    });
+  });
+
+  document.querySelectorAll<HTMLElement>('[data-dur-several]').forEach((root) => {
+    const list = root.querySelector<HTMLOListElement>('[data-dur-list]')!;
+    const tpl = root.querySelector<HTMLTemplateElement>('template[data-dur-row]')!;
+    const addBtn = root.querySelector<HTMLButtonElement>('[data-dur-add]')!;
+    const items = () => [...list.querySelectorAll<HTMLLIElement>(':scope > li')];
+    const parts = (li: Element) => li.querySelectorAll<HTMLInputElement>('input[type=number]');
+    const renumber = () => {
+      const all = items();
+      all.forEach((li, i) => {
+        const [h, m] = parts(li);
+        h.setAttribute('aria-label', `Length ${i + 1}, hours`);
+        m.setAttribute('aria-label', `Length ${i + 1}, minutes`);
+        const x = li.querySelector<HTMLButtonElement>('[data-dur-remove]')!;
+        x.setAttribute('aria-label', `Remove length ${i + 1}`);
+        x.disabled = all.length === 1;
+      });
+    };
+    const add = (n: number) => {
+      const li = tpl.content.firstElementChild!.cloneNode(true) as HTMLLIElement;
+      const [h, m] = parts(li);
+      h.value = String(Math.floor(n / 60));
+      m.value = String(n % 60);
+      list.append(li);
+      renumber();
+      return li;
+    };
+    list.addEventListener('input', (e) => { const li = (e.target as Element).closest('li'); if (li) clearError(li); });
+    root.addEventListener('click', (e) => {
+      const t = e.target as Element;
+      if (t.closest('[data-dur-add]')) {
+        const last = items().at(-1);
+        const prev = last ? minutesOf(parts(last)[0].value, parts(last)[1].value) : 0;
+        // a new row starts an hour past the last one (or at 1 h)
+        add(prev ? Math.min(1440, prev + 60) : 60).querySelector('input')!.focus();
+        return;
+      }
+      const preset = t.closest<HTMLElement>('[data-preset]');
+      if (preset) {
+        const n = Number(preset.dataset.preset);
+        const hit = items().find((li) => minutesOf(parts(li)[0].value, parts(li)[1].value) === n);
+        (hit ?? add(n)).querySelector('input')!.focus();
+        return;
+      }
+      const rm = t.closest<HTMLButtonElement>('[data-dur-remove]');
+      if (rm && !rm.disabled) {
+        const all = items();
+        const i = all.indexOf(rm.closest('li')!);
+        all[i].remove();
+        renumber();
+        const next = items()[Math.min(i, items().length - 1)];
+        (next?.querySelector<HTMLButtonElement>('[data-dur-remove]:not(:disabled)') ?? addBtn).focus();
+        const msg = root.querySelector('#dur-many-err');
+        if (msg && !list.querySelector('[aria-invalid]')) msg.remove();
+      }
+    });
+  });
+</script>

package/src/components/calendar/BookingsHead.astro

@@ -1,4 +1,5 @@
 ---
+import { bookingsEnabled } from '../../lib/calendar/config';
 // Shared header for the Bookings home: Requests (what came in) and Rooms &
 // people (what can be booked) are two tabs of one place, with the same ⚙ and
 // "New ▾" as the Schedule. Extra page actions go in the default slot.
@@ -22,7 +23,7 @@ const gear = 'M12 15a3 3 0 1 0 0-6 3 3 0 0 0 0 6zM19.4 15a1.65 1.65 0 0 0 .33 1.
   <div class="page-actions">
     <slot />
     <a class="btn ico" href="/admin/calendar/settings#bookings" title="Calendar settings" aria-label="Calendar settings"><svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><path d={gear} /></svg></a>
-    <details class="newmenu">
+    {bookingsEnabled() && <details class="newmenu">
       <summary class="btn primary">New <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round"><path d="M6 9l6 6 6-6" /></svg></summary>
       <div class="newmenu-pop" role="menu">
         {inPlace
@@ -35,12 +36,12 @@ const gear = 'M12 15a3 3 0 1 0 0-6 3 3 0 0 0 0 6zM19.4 15a1.65 1.65 0 0 0 .33 1.
           ? <button type="button" role="menuitem" data-modal="new-resource">Room or person</button>
           : <a role="menuitem" href="/admin/calendar/resources?new=1">Room or person</a>}
       </div>
-    </details>
+    </details>}
   </div>
 </div>
 <nav class="ptabs" aria-label="Bookings">
   <a href="/admin/calendar/bookings" aria-current={active === 'requests' ? 'page' : undefined}>Requests{pending > 0 && <small class="attn">{pending} {pending === 1 ? 'needs' : 'need'} approval</small>}</a>
-  <a href="/admin/calendar/resources" aria-current={active === 'rooms' ? 'page' : undefined}>Rooms &amp; people<small>{rooms}</small></a>
+  {bookingsEnabled() && <a href="/admin/calendar/resources" aria-current={active === 'rooms' ? 'page' : undefined}>Rooms &amp; people<small>{rooms}</small></a>}
 </nav>
 
 <script>

package/src/components/calendar/RoomHolds.tsx

@@ -78,8 +78,8 @@ export default function RoomHolds({ times, hold, status, locationName, onChange,
   };
   const label = (r: RoomRow) => {
     if (!r.conflicts.length) return { text: 'Free', cls: 'free' };
-    if (r.dates > 1) return { text: `Booked on ${r.datesWithBookings} of ${r.dates} dates`, cls: 'busy' };
-    return { text: `${r.conflicts.length} booking${r.conflicts.length === 1 ? '' : 's'}`, cls: 'busy' };
+    if (r.dates > 1) return { text: `Busy on ${r.datesWithBookings} of ${r.dates} dates`, cls: 'busy' };
+    return { text: r.conflicts.length === 1 ? 'Busy' : `Busy · ${r.conflicts.length} bookings`, cls: 'busy' };
   };
   const conflicted = data.rooms.filter((r) => selected.has(r.id) && r.conflicts.length);
   const draft = status === 'draft';
@@ -95,16 +95,21 @@ export default function RoomHolds({ times, hold, status, locationName, onChange,
   }
 
   return (
-    <section className="pe-sb-section pe-ev rh">
-      <h3 className="pe-sb-title">Rooms</h3>
-      <p className="pe-ev-note">Rooms and people this event uses can't be booked while it happens.</p>
-      <div className="rh-list">
+    <section className="rh" aria-labelledby="rh-title">
+      <div className="rh-head">
+        <b id="rh-title">Hold rooms &amp; people</b>
+        <small>can’t be booked while this runs</small>
+      </div>
+      <div className="rh-table" role="group" aria-labelledby="rh-title">
+        <div className="rh-tr rh-th" aria-hidden="true"><span /><span>Name</span><span>Capacity</span><span>Status</span></div>
         {data.rooms.map((r) => {
           const l = label(r);
+          const kind = r.kind.trim().toLowerCase();
           return (
-            <label key={r.id} className={`rh-room${selected.has(r.id) ? ' on' : ''}`}>
+            <label key={r.id} className={`rh-tr rh-room${selected.has(r.id) ? ' on' : ''}`}>
               <input type="checkbox" checked={selected.has(r.id)} onChange={() => toggle(r)} />
-              <span className="rh-name"><b>{r.name}</b><small>{r.kind}{r.capacity ? ` · up to ${r.capacity}` : ''}</small></span>
+              <span className="rh-name"><b>{r.name}</b>{kind && kind !== 'room' && <small>· {kind}</small>}</span>
+              <span className="rh-cap">{r.capacity ? <><span className="rh-cap-l">up to </span>{r.capacity}</> : '—'}</span>
               <span className={`rh-st ${l.cls}`}>{l.text}</span>
             </label>
           );