Compare commits

...
Author SHA1 Message Date
Bendik Aagaard LynghaugandClaude Opus 5.5 d0ee06f48c Less room above the wordmark, now that who is here sits on its line
Test / test (pull_request) Successful in 1m51s
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01GT37Z1Xtfd9pUuQtMTg6Yt
2026-10-01 17:47:45 +02:00
Bendik Aagaard Lynghaug 6a9be3bef4 Release 0.6.13
Test / test (push) Successful in 1m5s
Publish release / publish (push) Successful in 1m48s
2026-10-01 11:40:32 +02:00
bl 49be010e8e Merge pull request 'Who is here on the wordmark's line; signed-in people aren't asked for their name' (#23) from prefill-everywhere into main
docs / deploy (push) Successful in 3s
Test / test (push) Successful in 1m5s
2026-10-01 09:40:29 +00:00
Bendik Aagaard LynghaugandClaude Opus 5.5 78f42e6f8a Who is here on the wordmark's line; every form carries a signed-in person's name and address
Test / test (pull_request) Successful in 1m6s
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01GT37Z1Xtfd9pUuQtMTg6Yt
2026-10-01 11:40:27 +02:00
Bendik Aagaard LynghaugandClaude Opus 5.5 9b50c9cab8 Gullberg: i Ås, ikke på Ås
Test / test (push) Successful in 1m4s
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01GT37Z1Xtfd9pUuQtMTg6Yt
2026-10-01 11:09:08 +02:00
bl 858a66d84e Merge pull request 'GULLBERG sanatorium: plan, words, wordmark; a board may publish its own list' (#20) from gullberg-plan into main
Test / test (push) Successful in 1m5s
2026-10-01 08:44:09 +00:00
8 changed files with 79 additions and 19 deletions
+9
View File
@@ -4,6 +4,15 @@ One line per change, grouped by the release that shipped it. Newest
first. A release is a Cargo.toml bump plus a `v<version>` tag; the
content repos pin the tag they run (see the end of this file).
## 0.6.14 (2026-10-01)
- Less room above the wordmark: 1.75rem, 1.25rem on a narrow screen (it was 4rem). The space was kept for who is here, which now sits on the wordmark's own line, and on a tall, narrow screen it read as dead space.
## 0.6.13 (2026-10-01)
- Who is here (the name and "sign out", or "sign in") sits on the wordmark's own line instead of being pinned to the corner of the page, where it read as a row of its own. With a picture strip it is in the wordmark's bar; without, it is level with the mark at the right edge. On a narrow screen it drops under the mark.
- Trainer: every form, public ones included, carries a signed-in person's name and address from the login instead of asking for them; a visitor still sees the fields. Only the inside forms did before, so someone signed in filled in their own name and address again on a public form.
## 0.6.12 (2026-10-01)
- Trainer: the words model is told who opens each mail: the person who sent the case, the person who posted the record an answer is about, or someone at the business. Mails to the business about another person's case used to be written as if to that person ("you will hear from us"); on Gullberg, three of nine were.
Generated
+1 -1
View File
@@ -3357,7 +3357,7 @@ dependencies = [
[[package]]
name = "portal"
version = "0.6.12"
version = "0.6.13"
dependencies = [
"anyhow",
"arc-swap",
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "portal"
version = "0.6.12"
version = "0.6.13"
edition = "2021"
[lib]
+1 -1
View File
@@ -73,7 +73,7 @@ needs:
# Offentlig: noen søker rom. Studenter går foran; styret ser hva den
# som søker gjør til daglig, og velger etter det.
- id: leie-rom
who: en som trenger et rimelig rom på Ås, oftest en student ved NMBU
who: en som trenger et rimelig rom i Ås, oftest en student ved NMBU
wants: et rom å bo på til en leie som går opp, med studenter først i køen
lands_in: romsoknader
handled_by: styret
+1 -1
View File
@@ -242,7 +242,7 @@
}
},
"questions/index.yaml": {
"question": "Trenger du et rimelig rom på Ås?",
"question": "Trenger du et rimelig rom i Ås?",
"description": "Gullberg er et gammelt hus bak Ås kirke, et kort stykke fra NMBU. Eierne driver det selv, og Klingenberg Bygg forvalter huset og vedlikeholdet.",
"opener": {
"heading": "Et rimelig sted å bo, nær NMBU",
+7 -3
View File
@@ -998,10 +998,12 @@ fn Hero(
}
};
let top = view! { <div class="hero-top">{mark()}{session}</div> };
let (bar_top, copy_top) = if has_slides { (Some(top), None) } else { (None, Some(top)) };
view! {
<header class="hero" class:hero-module=has_module class:hero-slides=has_slides>
<Announcements current_id=current_id/>
{session}
{has_module
.then(|| {
view! {
@@ -1012,10 +1014,12 @@ fn Hero(
// With pictures, the wordmark is a bar of its own above
// them and the question comes under; without, the wordmark
// heads the copy as it always has.
{has_slides.then(|| view! { <div class="hero-bar">{mark()}</div> })}
// Who is here sits on the wordmark's own line, not on a row
// of its own above it.
{bar_top.map(|top| view! { <div class="hero-bar">{top}</div> })}
{slideshow.map(|show| view! { <SlideStrip show=show/> })}
<div class="hero-copy">
{(!has_slides).then(|| mark())}
{copy_top}
<h1>{title}</h1>
<p inner_html=render_inline_markdown(&description)></p>
</div>
+6 -7
View File
@@ -1953,13 +1953,12 @@ fn form_alternative(plan: &Plan, need: &PlanNeed, w: &Value, action: &str) -> Va
if f.multiple { r["multiple"] = json!(true); }
let hint = s(&w["hints"][&f.name]).trim();
if !hint.is_empty() && f.kind != "select" { r["placeholder"] = json!(hint); }
// Someone signed in is not asked for what the site knows: on a
// group's page they always are, and answering a record they
// may be.
if parent.is_some() || need.enters_as.is_some() {
if f.kind == "email" && matches!(f.name.as_str(), "email" | "epost" | "e-post") { r["value"] = json!("{user.email}"); }
if f.kind == "text" && matches!(f.name.as_str(), "name" | "navn") { r["value"] = json!("{user.name}"); }
}
// Someone signed in is not asked for what the site knows, on any
// form: portal carries their name and address and the fields take
// no room (`content::fill_from_user`). A visitor sees the fields
// as usual, so a public form loses nothing by it.
if f.kind == "email" && matches!(f.name.as_str(), "email" | "epost" | "e-post") { r["value"] = json!("{user.email}"); }
if f.kind == "text" && matches!(f.name.as_str(), "name" | "navn") { r["value"] = json!("{user.name}"); }
r
}).collect();
// The record this answer is about, carried in from the page's own
+53 -5
View File
@@ -162,10 +162,13 @@ main.not-found {
/* hero */
/* No room is kept at the top for who is here: that sits on the
wordmark's own line now (.hero-top), and the 4rem it used to need
read as dead space above the mark on a tall, narrow screen. */
.hero {
max-width: 46rem;
margin: 0 auto;
padding: 4rem 1.5rem 2.5rem;
padding: 1.75rem 1.5rem 2.5rem;
display: flex;
flex-direction: column;
align-items: center;
@@ -176,10 +179,6 @@ main.not-found {
/* Who is here and the way in or out: top right of every page, on a
site that has sign-in. */
.session {
position: absolute;
top: 1rem;
right: 1.5rem;
z-index: 5;
display: flex;
gap: 0.9rem;
align-items: baseline;
@@ -201,6 +200,55 @@ main.not-found {
color: var(--ink-dim);
}
/* The wordmark's line, with who is here on it: the mark centred and the
session at the right edge, level with the mark. A skin that sets
everything on one left edge spreads the two apart instead (see
Klingenberg Bygg's and Gullberg's). On a narrow screen the session
drops under the mark rather than over it. */
.hero-top {
position: relative;
width: 100%;
display: flex;
align-items: center;
justify-content: center;
gap: 1rem;
}
.hero-top .session {
position: absolute;
right: 0;
top: 50%;
transform: translateY(-50%);
}
.hero-bar .hero-top {
justify-content: space-between;
}
.hero-bar .hero-top .session {
position: static;
transform: none;
}
@media (max-width: 34rem) {
.hero {
padding-top: 1.25rem;
}
.hero-bar {
padding-block: 0.75rem;
}
.hero-top {
flex-wrap: wrap;
}
.hero-top .session {
position: static;
transform: none;
}
}
/* A page with pictures: the wordmark is a bar of its own, the strip
runs the full width under it, and the question follows. */
.hero-slides {