Portal v0.6.14: mindre luft over ordmerket

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01GT37Z1Xtfd9pUuQtMTg6Yt

.gitea/workflows/deploy.yml

@@ -17,7 +17,7 @@ on:
       - .gitea/workflows/deploy.yml
 
 env:
-  PORTAL_RELEASE: v0.6.10
+  PORTAL_RELEASE: v0.6.14
   INSTANCE: gullberg-portal
 
 jobs:

.gitea/workflows/lint-and-reload.yml

@@ -13,7 +13,7 @@ jobs:
       # (PORTAL_RELEASE in deploy.yml).
       - name: lint
         env:
-          PORTAL_RELEASE: v0.6.10
+          PORTAL_RELEASE: v0.6.14
         run: |
           curl -sfL "https://project.uhhm.no/uhhm/portal/releases/download/$PORTAL_RELEASE/portal-x86_64-linux" -o portal && chmod +x portal
           ./portal lint --path checkout/questions

aggregates.yaml

@@ -20,16 +20,16 @@ aggregates:
       event: received
       mail:
         to: fredrik@klingenbergbygg.no
-        subject: Meldingen om {hva} er mottatt
-        body: Feilen du meldte om {hva} er registrert hos oss. Klingenberg Bygg ser på den og melder tilbake når de vet mer. {link}
+        subject: 'Ny feil meldt på Gullberg: {hva}'
+        body: 'En leietaker på Gullberg har meldt fra om {hva}. Se meldingen og avtal befaring: {link}'
     befaring:
       event: befaring
     overslag:
       event: overslag
       mail:
         to: bl@klingenbergbygg.no
-        subject: Overslag er på vei for {hva}
-        body: Klingenberg Bygg har sett på {hva} og styret har fått et overslag å ta stilling til. Du hører fra oss når det er avgjort. {link}
+        subject: 'Overslag til styret: {hva}'
+        body: 'Klingenberg Bygg har sett på {hva} og gitt et overslag. Styret godkjenner eller avviser det før arbeidet settes i gang: {link}'
     godkjent:
       event: godkjent
     utbedret:
@@ -113,8 +113,8 @@ aggregates:
       event: received
       mail:
         to: bl@klingenbergbygg.no
-        subject: Overslaget for {gjelder} er mottatt
-        body: Overslaget for {gjelder} er kommet inn til styret og ligger til vurdering. Du hører fra oss når det er avgjort. {link}
+        subject: 'Nytt overslag fra Klingenberg Bygg: {gjelder}'
+        body: 'Klingenberg Bygg har sendt et overslag for {gjelder}. Det ligger hos styret til godkjenning: {link}'
     godkjent:
       event: godkjent
     avvist:
@@ -156,11 +156,15 @@ aggregates:
       event: received
       mail:
         to: submitter
-        subject: Søknaden til {studiested} er mottatt
+        subject: Søknaden din om rom på Gullberg er mottatt
         body: |-
-          Søknaden din om rom, som student ved {studiested}, er registrert hos styret. Du hører fra oss når det er sett på. {link}
+          Hei {name},
+
+          søknaden din om rom på Gullberg er mottatt. Styret går gjennom søknadene fortløpende; studenter går foran, men alle blir sett på. Du hører fra oss om visning. {link}
 
           Det du kan gjøre nå: {site}/decide/leie-rom?chain={chain}&email={email}
+
+          Hilsen styret i Gullberg
     visning:
       event: visning
       mail:
@@ -183,8 +187,8 @@ aggregates:
       event: akseptert
       mail:
         to: bl@klingenbergbygg.no
-        subject: Du har fått rommet
-        body: Søknaden din om et rom til studieåret er godtatt. Vi tar kontakt om det videre, og du er velkommen til å svare her om du har spørsmål. {link}
+        subject: '{name} har takket ja til rommet'
+        body: '{name} har takket ja til tilbudet om rom på Gullberg. Neste steg er kontrakten og depositumet. {link}'
     signert:
       event: signert
       mail:

custom.css

@@ -74,11 +74,10 @@ h1, h2, h3 {
   line-height: 1.15;
 }
 
-/* What is asked is set like the wordmark: capitals, spaced. */
+/* What is asked is set in Futura, spaced a touch, in its own case. */
 .hero-copy h1,
 .alt-card h2 {
-  text-transform: uppercase;
-  letter-spacing: 0.12em;
+  letter-spacing: 0.02em;
 }
 
 /* ---- the top ---------------------------------------------------- */
@@ -107,6 +106,16 @@ h1, h2, h3 {
   letter-spacing: 0.06em;
 }
 
+/* Who is here, on the wordmark's line at the right edge. */
+.hero-top {
+  justify-content: space-between;
+}
+
+.hero-top .session {
+  position: static;
+  transform: none;
+}
+
 .hero-copy {
   display: flex;
   flex-direction: column;
@@ -117,8 +126,7 @@ h1, h2, h3 {
 
 .hero-copy h1 {
   margin: 0.9rem 0 0;
-  font-size: clamp(1.35rem, 1rem + 1.6vw, 1.85rem);
-  letter-spacing: 0.08em;
+  font-size: clamp(1.5rem, 1.1rem + 1.8vw, 2.1rem);
 }
 
 .hero-copy p {
@@ -147,7 +155,7 @@ h1, h2, h3 {
 }
 
 .alt-card h2 {
-  font-size: 1.15rem;
+  font-size: 1.3rem;
   margin: 0 0 0.45rem;
 }
 

images/wordmark.svg

@@ -1,9 +1,11 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 409.87222 77.398003" role="img" aria-label="GULLBERG sanatorium">
   <title>GULLBERG sanatorium</title>
   <!-- Futura, drawn as outlines so every machine shows the same mark.
-       As an image it colours itself for light and dark; with
-       wordmark_ink in site.yaml, portal colours it with the page's own
-       ink instead, and "sanatorium" stays lighter by its opacity. -->
+       "sanatorium" is spaced out to run the width of GULLBERG, set in
+       a little from each edge. As an image it colours itself for light
+       and dark; with wordmark_ink in site.yaml, portal colours it with
+       the page's own ink instead, and "sanatorium" stays lighter by its
+       opacity. -->
   <style>
     .mark { fill: #1d1b18; }
     .sub { fill: #1d1b18; fill-opacity: 0.6; }
@@ -12,13 +14,13 @@
     }
   </style>
 <path class="mark"
-     d="M 0,25.216 Q 0,19.84 1.984,15.232 3.968,10.624 7.36,7.232 10.816,3.84 15.424,1.92 20.032,0 25.216,0 q 2.88,0 5.44,0.576 2.624,0.512 4.992,1.728 2.432,1.216 4.736,3.072 2.304,1.856 4.608005,4.48 L 39.808,14.784 Q 33.856,6.912 25.344,6.912 q -3.84,0 -7.168,1.408 -3.264,1.408 -5.696,3.904 -2.432,2.432 -3.84,5.76 -1.344,3.328 -1.344,7.232 0,3.968 1.472,7.296 1.536,3.328 3.968,5.76 2.496,2.368 5.632,3.712 3.136,1.344 6.4,1.344 3.008,0 5.568,-0.96 2.56,-1.024 4.416,-2.688 1.92,-1.664 3.072,-3.904 1.152,-2.304 1.408,-4.8 V 30.912 H 27.2 v -6.848 h 19.968005 v 1.6 q 0,5.504 -1.6,10.048 -1.600005,4.48 -4.544005,7.68 -2.88,3.2 -7.104,4.992 -4.16,1.728 -9.344,1.728 -5.12,0 -9.6,-1.92 Q 10.496,46.208 7.168,42.816 3.84,39.424 1.92,34.88 0,30.336 0,25.216 Z M 69.360025,0.96 h 7.296 v 30.208 q 0,3.328 0.832,5.696 0.832,2.304 2.24,3.712 1.472,1.408 3.392,2.048 1.92,0.64 4.096,0.64 2.176,0 4.096,-0.64 1.92,-0.64 3.328,-2.048 1.472,-1.472 2.304,-3.84 0.896,-2.368 0.896,-5.824 V 0.96 h 7.231995 V 32 q 0,4.352 -1.472,7.744 -1.40799,3.392 -3.839995,5.696 -2.432,2.304 -5.696,3.52 -3.2,1.152 -6.848,1.152 -3.648,0 -6.912,-1.152 -3.2,-1.216 -5.632,-3.52 -2.432,-2.304 -3.904,-5.696 -1.408,-3.392 -1.408,-7.744 z M 129.18403,49.216 V 0.96 h 7.296 v 41.408 h 14.208 v 6.848 z m 41.90406,0 V 0.96 h 7.296 v 41.408 h 14.208 v 6.848 z m 41.90405,0 V 0.96 h 8.32 q 8.064,0 12.48,3.264 4.48001,3.2 4.48001,9.792 0,3.2 -1.536,5.76 -1.472,2.496 -3.904,3.84 v 0.064 q 4.416,1.28 6.91199,4.416 2.56,3.136 2.56,7.296 0,3.52 -1.27999,6.144 -1.28,2.56 -3.584,4.288 -2.304,1.728 -5.568,2.56 -3.2,0.832 -7.168,0.832 z m 12.416,-6.848 q 2.496,0 4.288,-0.576 1.792,-0.576 2.94401,-1.536 1.15199,-0.96 1.66399,-2.24 0.512,-1.344 0.512,-2.88 0,-1.536 -0.512,-2.816 -0.512,-1.344 -1.728,-2.368 -1.152,-1.024 -3.136,-1.6 -1.92,-0.576 -4.8,-0.576 h -4.352 v 14.592 z m -2.688,-20.672 q 4.352,0 6.33601,-1.984 1.98399,-1.984 1.98399,-5.504 0,-3.456 -2.048,-4.992 -1.98399,-1.536 -6.272,-1.536 h -2.432 V 21.696 Z M 291.31218,0.96 v 6.848 h -19.32799 v 11.584 h 18.81599 v 6.848 h -18.81599 v 16.128 h 19.32799 v 6.848 h -26.624 V 0.96 Z m 32.56005,0 q 4.16,0 7.552,0.832 3.392,0.832 5.824,2.56 2.432,1.728 3.776,4.416 1.344,2.624 1.344,6.336 0,4.736 -2.688,8.32 -2.624,3.52 -7.808,5.376 l 14.71999,20.416 h -8.896 l -13.568,-19.776 h -1.536 v 19.776 h -7.296 V 0.96 Z m -1.28,22.144 h 2.304 q 5.12,0 7.744,-1.984 2.624,-1.984 2.624,-5.888 0,-7.424 -10.048,-7.424 h -2.624 z m 40.11199,2.112 q 0,-5.376 1.984,-9.984 1.984,-4.608 5.376,-8 3.456,-3.392 8.064,-5.312 4.608,-1.92 9.792,-1.92 2.88,0 5.44,0.576 2.624,0.512 4.992,1.728 2.432,1.216 4.736,3.072 2.304,1.856 4.608,4.48 l -5.184,4.928 q -5.952,-7.872 -14.464,-7.872 -3.84,0 -7.168,1.408 -3.264,1.408 -5.696,3.904 -2.432,2.432 -3.84,5.76 -1.344,3.328 -1.344,7.232 0,3.968 1.472,7.296 1.536,3.328 3.968,5.76 2.496,2.368 5.632,3.712 3.136,1.344 6.4,1.344 3.008,0 5.568,-0.96 2.56,-1.024 4.416,-2.688 1.92,-1.664 3.072,-3.904 1.152,-2.304 1.408,-4.8 v -0.064 h -12.032 v -6.848 h 19.968 v 1.6 q 0,5.504 -1.6,10.048 -1.6,4.48 -4.544,7.68 -2.88,3.2 -7.104,4.992 -4.16,1.728 -9.344,1.728 -5.12,0 -9.6,-1.92 -4.48,-1.984 -7.808,-5.376 -3.328,-3.392 -5.248,-7.936 -1.92,-4.544 -1.92,-9.664 z"
-     id="text1"
+     d="M 0,25.216 Q 0,19.84 1.984,15.232 3.968,10.624 7.36,7.232 10.816,3.84 15.424,1.92 20.032,0 25.216,0 q 2.88,0 5.44,0.576 2.624,0.512 4.992,1.728 2.432,1.216 4.736,3.072 2.304,1.856 4.608,4.48 l -5.184,4.928 Q 33.856,6.912 25.344,6.912 q -3.84,0 -7.168,1.408 -3.264,1.408 -5.696,3.904 -2.432,2.432 -3.84,5.76 -1.344,3.328 -1.344,7.232 0,3.968 1.472,7.296 1.536,3.328 3.968,5.76 2.496,2.368 5.632,3.712 3.136,1.344 6.4,1.344 3.008,0 5.568,-0.96 2.56,-1.024 4.416,-2.688 1.92,-1.664 3.072,-3.904 1.152,-2.304 1.408,-4.8 V 30.912 H 27.2 v -6.848 h 19.968 v 1.6 q 0,5.504 -1.6,10.048 -1.6,4.48 -4.544,7.68 -2.88,3.2 -7.104,4.992 -4.16,1.728 -9.344,1.728 -5.12,0 -9.6,-1.92 Q 10.496,46.208 7.168,42.816 3.84,39.424 1.92,34.88 0,30.336 0,25.216 Z M 69.360026,0.96 h 7.296004 v 30.208 q 0,3.328 0.832,5.696 0.832,2.304 2.24,3.712 1.472,1.408 3.392,2.048 1.92,0.64 4.096,0.64 2.176,0 4.096,-0.64 1.92,-0.64 3.328,-2.048 1.472,-1.472 2.304,-3.84 0.896,-2.368 0.896,-5.824 V 0.96 h 7.232 V 32 q 0,4.352 -1.472,7.744 -1.408,3.392 -3.84,5.696 -2.432,2.304 -5.696,3.52 -3.2,1.152 -6.848,1.152 -3.648,0 -6.912,-1.152 -3.2,-1.216 -5.632004,-3.52 -2.432,-2.304 -3.904,-5.696 -1.408,-3.392 -1.408,-7.744 z M 129.18404,49.216 V 0.96 h 7.296 v 41.408 h 14.208 v 6.848 z m 41.90405,0 V 0.96 h 7.296 v 41.408 h 14.208 v 6.848 z m 41.90405,0 V 0.96 h 8.32 q 8.064,0 12.48,3.264 4.48,3.2 4.48,9.792 0,3.2 -1.536,5.76 -1.472,2.496 -3.904,3.84 v 0.064 q 4.416,1.28 6.912,4.416 2.56,3.136 2.56,7.296 0,3.52 -1.28,6.144 -1.28,2.56 -3.584,4.288 -2.304,1.728 -5.568,2.56 -3.2,0.832 -7.168,0.832 z m 12.416,-6.848 q 2.496,0 4.288,-0.576 1.792,-0.576 2.944,-1.536 1.152,-0.96 1.664,-2.24 0.512,-1.344 0.512,-2.88 0,-1.536 -0.512,-2.816 -0.512,-1.344 -1.728,-2.368 -1.152,-1.024 -3.136,-1.6 -1.92,-0.576 -4.8,-0.576 h -4.352 v 14.592 z m -2.688,-20.672 q 4.352,0 6.336,-1.984 1.984,-1.984 1.984,-5.504 0,-3.456 -2.048,-4.992 -1.984,-1.536 -6.272,-1.536 h -2.432 V 21.696 Z M 291.31219,0.96 v 6.848 h -19.328 v 11.584 h 18.816 v 6.848 h -18.816 v 16.128 h 19.328 v 6.848 h -26.624 V 0.96 Z m 32.56003,0 q 4.16,0 7.552,0.832 3.392,0.832 5.824,2.56 2.432,1.728 3.776,4.416 1.344,2.624 1.344,6.336 0,4.736 -2.688,8.32 -2.624,3.52 -7.808,5.376 l 14.72,20.416 h -8.896 l -13.568,-19.776 h -1.536 v 19.776 h -7.296 V 0.96 Z m -1.28,22.144 h 2.304 q 5.12,0 7.744,-1.984 2.624,-1.984 2.624,-5.888 0,-7.424 -10.048,-7.424 h -2.624 z m 40.112,2.112 q 0,-5.376 1.984,-9.984 1.984,-4.608 5.376,-8 3.456,-3.392 8.064,-5.312 4.608,-1.92 9.792,-1.92 2.88,0 5.44,0.576 2.624,0.512 4.992,1.728 2.432,1.216 4.736,3.072 2.304,1.856 4.608,4.48 l -5.184,4.928 q -5.952,-7.872 -14.464,-7.872 -3.84,0 -7.168,1.408 -3.264,1.408 -5.696,3.904 -2.432,2.432 -3.84,5.76 -1.344,3.328 -1.344,7.232 0,3.968 1.472,7.296 1.536,3.328 3.968,5.76 2.496,2.368 5.632,3.712 3.136,1.344 6.4,1.344 3.008,0 5.568,-0.96 2.56,-1.024 4.416,-2.688 1.92,-1.664 3.072,-3.904 1.152,-2.304 1.408,-4.8 v -0.064 h -12.032 v -6.848 h 19.968 v 1.6 q 0,5.504 -1.6,10.048 -1.6,4.48 -4.544,7.68 -2.88,3.2 -7.104,4.992 -4.16,1.728 -9.344,1.728 -5.12,0 -9.6,-1.92 -4.48,-1.984 -7.808,-5.376 -3.328,-3.392 -5.248,-7.936 -1.92,-4.544 -1.92,-9.664 z"
+     id="g"
     
      aria-label="GULLBERG" />
   <path class="sub"
-     d="m 141.22211,76.176 1.079,-0.819 q 0.195,0.338 0.481,0.546 0.286,0.195 0.676,0.195 0.351,0 0.546,-0.143 0.195,-0.156 0.195,-0.442 0,-0.143 -0.065,-0.26 -0.052,-0.117 -0.195,-0.234 -0.143,-0.117 -0.39,-0.247 -0.247,-0.13 -0.624,-0.299 -0.793,-0.364 -1.118,-0.793 -0.32499,-0.442 -0.32499,-1.066 0,-0.403 0.156,-0.728 0.156,-0.325 0.416,-0.546 0.273,-0.234 0.624,-0.351 0.364,-0.13 0.78,-0.13 0.67599,0 1.16999,0.247 0.50701,0.247 0.79301,0.663 l -1.053,0.845 q -0.143,-0.182 -0.403,-0.325 -0.24701,-0.143 -0.52,-0.143 -0.273,0 -0.429,0.117 -0.15601,0.117 -0.15601,0.312 0,0.104 0.052,0.195 0.052,0.091 0.195,0.195 0.143,0.104 0.39,0.234 0.26,0.13 0.663,0.312 0.819,0.377 1.118,0.832 0.299,0.442 0.299,1.066 0,0.455 -0.156,0.832 -0.156,0.364 -0.442,0.624 -0.286,0.26 -0.676,0.39 -0.39,0.143 -0.845,0.143 -0.884,0 -1.443,-0.377 -0.559,-0.377 -0.793,-0.845 z m 12.21299,-2.067 q 0,-0.689 0.221,-1.274 0.234,-0.598 0.637,-1.027 0.416,-0.442 0.962,-0.689 0.559,-0.247 1.209,-0.247 0.585,0 1.079,0.195 0.494,0.195 0.962,0.65 h 0.013 v -0.689 h 1.43 v 6.188 h -1.43 v -0.689 h -0.013 q -0.468,0.455 -0.962,0.663 -0.481,0.208 -1.04,0.208 -0.663,0 -1.235,-0.247 -0.559,-0.26 -0.975,-0.702 -0.403,-0.442 -0.637,-1.04 -0.221,-0.598 -0.221,-1.3 z m 1.456,0 q 0,0.429 0.117,0.806 0.13,0.364 0.364,0.637 0.234,0.273 0.572,0.429 0.351,0.143 0.78,0.143 0.429,0 0.767,-0.143 0.351,-0.156 0.598,-0.416 0.247,-0.273 0.377,-0.637 0.143,-0.364 0.143,-0.793 0,-0.416 -0.143,-0.78 -0.13,-0.364 -0.377,-0.624 -0.247,-0.273 -0.598,-0.429 -0.338,-0.156 -0.754,-0.156 -0.416,0 -0.767,0.156 -0.338,0.156 -0.585,0.416 -0.234,0.26 -0.364,0.624 -0.13,0.351 -0.13,0.767 z m 15.28101,-3.081 v 0.663 h 0.026 q 0.338,-0.39 0.78,-0.611 0.45501,-0.221 1.09201,-0.221 1.079,0 1.59899,0.676 0.533,0.663 0.533,1.885 v 3.796 h -1.43 v -3.458 q 0,-0.897 -0.286,-1.248 -0.286,-0.364 -0.884,-0.364 -0.663,0 -1.053,0.442 -0.377,0.442 -0.377,1.521 v 3.107 h -1.43 v -6.188 z m 12.278,3.081 q 0,-0.689 0.221,-1.274 0.234,-0.598 0.637,-1.027 0.416,-0.442 0.962,-0.689 0.559,-0.247 1.209,-0.247 0.585,0 1.079,0.195 0.494,0.195 0.962,0.65 h 0.013 v -0.689 h 1.43 v 6.188 h -1.43 v -0.689 h -0.013 q -0.468,0.455 -0.962,0.663 -0.481,0.208 -1.04,0.208 -0.663,0 -1.235,-0.247 -0.559,-0.26 -0.975,-0.702 -0.403,-0.442 -0.637,-1.04 -0.221,-0.598 -0.221,-1.3 z m 1.456,0 q 0,0.429 0.117,0.806 0.13,0.364 0.364,0.637 0.234,0.273 0.572,0.429 0.351,0.143 0.78,0.143 0.429,0 0.767,-0.143 0.351,-0.156 0.598,-0.416 0.247,-0.273 0.377,-0.637 0.143,-0.364 0.143,-0.793 0,-0.416 -0.143,-0.78 -0.13,-0.364 -0.377,-0.624 -0.247,-0.273 -0.598,-0.429 -0.338,-0.156 -0.754,-0.156 -0.416,0 -0.767,0.156 -0.338,0.156 -0.585,0.416 -0.234,0.26 -0.364,0.624 -0.13,0.351 -0.13,0.767 z m 14.15001,-3.081 v -2.262 h 1.43001 v 2.262 h 1.10499 v 1.339 h -1.10499 v 4.849 h -1.43001 v -4.849 h -1.001 v -1.339 z m 10.068,3.055 q 0,-0.663 0.23399,-1.248 0.234,-0.585 0.663,-1.014 0.44201,-0.442 1.04001,-0.702 0.611,-0.26 1.35199,-0.26 0.741,0 1.339,0.26 0.611,0.247 1.04001,0.689 0.442,0.442 0.67599,1.04 0.24701,0.598 0.24701,1.287 0,0.689 -0.24701,1.287 -0.23399,0.598 -0.67599,1.04 -0.429,0.429 -1.04001,0.689 -0.61099,0.247 -1.365,0.247 -0.728,0 -1.339,-0.247 -0.598,-0.26 -1.027,-0.702 -0.42899,-0.442 -0.663,-1.053 -0.23399,-0.611 -0.23399,-1.313 z m 1.456,0.026 q 0,0.923 0.494,1.469 0.494,0.546 1.339,0.546 0.832,0 1.339,-0.546 0.507,-0.546 0.507,-1.443 0,-0.884 -0.507,-1.43 -0.494,-0.559 -1.339,-0.559 -0.403,0 -0.741,0.143 -0.338,0.143 -0.585,0.416 -0.247,0.26 -0.377,0.624 -0.13,0.351 -0.13,0.78 z m 13.5,-3.081 h 1.43001 v 0.559 h 0.026 q 0.351,-0.377 0.64999,-0.546 0.31201,-0.182 0.767,-0.182 0.55901,0 1.17001,0.377 l -0.65,1.3 q -0.403,-0.286 -0.793,-0.286 -1.17,0 -1.17,1.755 v 3.211 h -1.43001 z m 13.36999,0 v 6.188 h -1.43 v -6.188 z m -1.651,-2.691 q 0,-0.377 0.273,-0.65 0.27301,-0.273 0.65,-0.273 0.39,0 0.663,0.273 0.286,0.273 0.286,0.65 0,0.377 -0.273,0.663 -0.273,0.273 -0.663,0.273 -0.403,0 -0.676,-0.273 -0.26,-0.286 -0.26,-0.663 z m 10.34101,2.691 h 1.43 v 3.549 q 0,1.547 1.209,1.547 1.222,0 1.222,-1.547 v -3.549 h 1.43 v 3.588 q 0,1.313 -0.676,2.054 -0.676,0.728 -1.976,0.728 -0.598,0 -1.092,-0.169 -0.481,-0.169 -0.832,-0.507 -0.338,-0.351 -0.533,-0.871 -0.182,-0.52 -0.182,-1.235 z m 13.968,0 h 1.43 V 71.6 h 0.013 q 0.286,-0.338 0.65,-0.533 0.377,-0.208 0.962,-0.208 0.624,0 1.027,0.234 0.403,0.221 0.702,0.689 h 0.013 q 0.377,-0.455 0.845,-0.689 0.481,-0.234 1.118,-0.234 1.105,0 1.651,0.637 0.546,0.637 0.546,1.898 v 3.822 h -1.43 v -3.432 q 0,-0.897 -0.26,-1.261 -0.26,-0.377 -0.845,-0.377 -0.65,0 -0.949,0.429 -0.286,0.416 -0.286,1.313 v 3.328 h -1.43 v -3.523 q 0,-0.806 -0.26,-1.17 -0.26,-0.377 -0.819,-0.377 -0.637,0 -0.949,0.429 -0.299,0.416 -0.299,1.313 v 3.328 h -1.43 z"
-     id="text2"
+     d="m 11.999999,76.176 1.079,-0.819 q 0.195,0.338 0.481,0.546 0.286,0.195 0.676,0.195 0.351,0 0.546,-0.143 0.195,-0.156 0.195,-0.442 0,-0.143 -0.065,-0.26 -0.052,-0.117 -0.195,-0.234 -0.143,-0.117 -0.39,-0.247 -0.247,-0.13 -0.624,-0.299 -0.793,-0.364 -1.118,-0.793 -0.325,-0.442 -0.325,-1.066 0,-0.403 0.156,-0.728 0.156,-0.325 0.416,-0.546 0.273,-0.234 0.624,-0.351 0.364,-0.13 0.78,-0.13 0.676,0 1.17,0.247 0.507,0.247 0.793,0.663 l -1.053,0.845 q -0.143,-0.182 -0.403,-0.325 -0.247,-0.143 -0.52,-0.143 -0.273,0 -0.429,0.117 -0.156,0.117 -0.156,0.312 0,0.104 0.052,0.195 0.052,0.091 0.195,0.195 0.143,0.104 0.39,0.234 0.26,0.13 0.663,0.312 0.819,0.377 1.118,0.832 0.299,0.442 0.299,1.066 0,0.455 -0.156,0.832 -0.156,0.364 -0.442,0.624 -0.286,0.26 -0.676,0.39 -0.39,0.143 -0.845,0.143 -0.884,0 -1.443,-0.377 -0.559,-0.377 -0.793,-0.845 z m 40.993985,-2.067 q 0,-0.689 0.221,-1.274 0.234,-0.598 0.637,-1.027 0.416,-0.442 0.962,-0.689 0.559,-0.247 1.209,-0.247 0.585,0 1.079,0.195 0.494,0.195 0.962,0.65 h 0.013 v -0.689 h 1.43 v 6.188 h -1.43 v -0.689 h -0.013 q -0.468,0.455 -0.962,0.663 -0.481,0.208 -1.04,0.208 -0.663,0 -1.235,-0.247 -0.559,-0.26 -0.975,-0.702 -0.403,-0.442 -0.637,-1.04 -0.221,-0.598 -0.221,-1.3 z m 1.456,0 q 0,0.429 0.117,0.806 0.13,0.364 0.364,0.637 0.234,0.273 0.572,0.429 0.351,0.143 0.78,0.143 0.429,0 0.767,-0.143 0.351,-0.156 0.598,-0.416 0.247,-0.273 0.377,-0.637 0.143,-0.364 0.143,-0.793 0,-0.416 -0.143,-0.78 -0.13,-0.364 -0.377,-0.624 -0.247,-0.273 -0.598,-0.429 -0.338,-0.156 -0.754,-0.156 -0.416,0 -0.767,0.156 -0.338,0.156 -0.585,0.416 -0.234,0.26 -0.364,0.624 -0.13,0.351 -0.13,0.767 z M 98.512,71.028 v 0.663 h 0.026 q 0.338,-0.39 0.78,-0.611 0.455,-0.221 1.092,-0.221 1.079,0 1.599,0.676 0.533,0.663 0.533,1.885 v 3.796 h -1.43 v -3.458 q 0,-0.897 -0.286,-1.248 -0.286,-0.364 -0.884,-0.364 -0.663,0 -1.053,0.442 -0.377,0.442 -0.377,1.521 v 3.107 h -1.43 v -6.188 z m 41.05899,3.081 q 0,-0.689 0.221,-1.274 0.234,-0.598 0.637,-1.027 0.416,-0.442 0.962,-0.689 0.559,-0.247 1.209,-0.247 0.585,0 1.079,0.195 0.494,0.195 0.962,0.65 h 0.013 v -0.689 h 1.43 v 6.188 h -1.43 v -0.689 h -0.013 q -0.468,0.455 -0.962,0.663 -0.481,0.208 -1.04,0.208 -0.663,0 -1.235,-0.247 -0.559,-0.26 -0.975,-0.702 -0.403,-0.442 -0.637,-1.04 -0.221,-0.598 -0.221,-1.3 z m 1.456,0 q 0,0.429 0.117,0.806 0.13,0.364 0.364,0.637 0.234,0.273 0.572,0.429 0.351,0.143 0.78,0.143 0.429,0 0.767,-0.143 0.351,-0.156 0.598,-0.416 0.247,-0.273 0.377,-0.637 0.143,-0.364 0.143,-0.793 0,-0.416 -0.143,-0.78 -0.13,-0.364 -0.377,-0.624 -0.247,-0.273 -0.598,-0.429 -0.338,-0.156 -0.754,-0.156 -0.416,0 -0.767,0.156 -0.338,0.156 -0.585,0.416 -0.234,0.26 -0.364,0.624 -0.13,0.351 -0.13,0.767 z M 183.958,71.028 v -2.262 h 1.43 v 2.262 h 1.105 v 1.339 h -1.105 v 4.849 h -1.43 v -4.849 h -1.001 v -1.339 z m 38.849,3.055 q 0,-0.663 0.234,-1.248 0.234,-0.585 0.663,-1.014 0.442,-0.442 1.04,-0.702 0.611,-0.26 1.352,-0.26 0.741,0 1.339,0.26 0.611,0.247 1.04,0.689 0.442,0.442 0.676,1.04 0.247,0.598 0.247,1.287 0,0.689 -0.247,1.287 -0.234,0.598 -0.676,1.04 -0.429,0.429 -1.04,0.689 -0.611,0.247 -1.365,0.247 -0.728,0 -1.339,-0.247 -0.598,-0.26 -1.027,-0.702 -0.429,-0.442 -0.663,-1.053 -0.234,-0.611 -0.234,-1.313 z m 1.456,0.026 q 0,0.923 0.494,1.469 0.494,0.546 1.339,0.546 0.832,0 1.339,-0.546 0.507,-0.546 0.507,-1.443 0,-0.884 -0.507,-1.43 -0.494,-0.559 -1.339,-0.559 -0.403,0 -0.741,0.143 -0.338,0.143 -0.585,0.416 -0.247,0.26 -0.377,0.624 -0.13,0.351 -0.13,0.78 z m 42.28101,-3.081 h 1.43 v 0.559 h 0.026 q 0.351,-0.377 0.65,-0.546 0.312,-0.182 0.767,-0.182 0.559,0 1.17,0.377 l -0.65,1.3 q -0.403,-0.286 -0.793,-0.286 -1.17,0 -1.17,1.755 v 3.211 h -1.43 z m 42.15098,0 v 6.188 h -1.43 v -6.188 z m -1.651,-2.691 q 0,-0.377 0.273,-0.65 0.273,-0.273 0.65,-0.273 0.39,0 0.663,0.273 0.286,0.273 0.286,0.65 0,0.377 -0.273,0.663 -0.273,0.273 -0.663,0.273 -0.403,0 -0.676,-0.273 -0.26,-0.286 -0.26,-0.663 z m 39.122,2.691 h 1.43 v 3.549 q 0,1.547 1.209,1.547 1.222,0 1.222,-1.547 v -3.549 h 1.43 v 3.588 q 0,1.313 -0.676,2.054 -0.676,0.728 -1.976,0.728 -0.598,0 -1.092,-0.169 -0.481,-0.169 -0.832,-0.507 -0.338,-0.351 -0.533,-0.871 -0.182,-0.52 -0.182,-1.235 z m 42.74902,0 h 1.43 V 71.6 h 0.013 q 0.286,-0.338 0.65,-0.533 0.377,-0.208 0.962,-0.208 0.624,0 1.027,0.234 0.403,0.221 0.702,0.689 h 0.013 q 0.377,-0.455 0.845,-0.689 0.481,-0.234 1.118,-0.234 1.105,0 1.651,0.637 0.546,0.637 0.546,1.898 v 3.822 h -1.43 v -3.432 q 0,-0.897 -0.26,-1.261 -0.26,-0.377 -0.845,-0.377 -0.65,0 -0.949,0.429 -0.286,0.416 -0.286,1.313 v 3.328 h -1.43 v -3.523 q 0,-0.806 -0.26,-1.17 -0.26,-0.377 -0.819,-0.377 -0.637,0 -0.949,0.429 -0.299,0.416 -0.299,1.313 v 3.328 h -1.43 z"
+     id="s"
     
      aria-label="sanatorium" />
 </svg>

needs.yaml

@@ -1,9 +1,9 @@
 needs:
 - id: leie-rom
-  who: en student som trenger et rimelig rom for studieåret
-  wants: et rom å bo på til en leie som går opp med studielånet
+  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
   enters: /
-  via: Søk rom for studieåret
+  via: Søk om et rom
   lands_in: romsoknader
   handled_by: styret
   stages:
@@ -29,7 +29,7 @@ needs:
     avslatt: avsluttet uten leie
 - id: ledig-rom
   who: styret, når et rom blir ledig
-  wants: at studenter ser rommet før de søker
+  wants: at de som søker ser rommet før de søker
   enters: /styret/ledig-rom
   via: Meld inn et rom som er ledig
   lands_in: rom
@@ -272,9 +272,12 @@ needs:
     avvist: avvist
   enters_as: aksjonaerer
 personas:
-- id: student-bergen
+- id: student-nmbu
   need: leie-rom
-  text: Jeg begynner på master til høsten og har ikke råd til hybel i sentrum. Et rimelig rom i et stort hus høres perfekt ut.
+  text: Jeg begynner på master på NMBU til høsten og har ikke råd til hybel i Ås sentrum. Et rimelig rom i et stort hus høres perfekt ut.
+- id: ung-arbeider
+  need: leie-rom
+  text: Jeg har fått jobb i Ås og trenger et rimelig sted å bo. Jeg er ikke student; kan jeg søke likevel?
 - id: student-kort
   need: leie-rom
   text: Jeg skal på utveksling og trenger et rom bare for ett semester. Går det an?

questions/hvem.yaml

@@ -1,11 +1,11 @@
 name: Hva er Gullberg?
-description: Et gammelt hus eid av fire aksjonærer og drevet av styret, med Klingenberg Bygg som forvalter. Her er rommene som er ledige nå.
+description: Et gammelt hus bak Ås kirke, eid av fire aksjonærer og drevet av styret, med Klingenberg Bygg som forvalter. Her er rommene som er ledige nå.
 responsible:
   name: Styret i Gullberg
   contact: bl@klingenbergbygg.no
 alternatives:
 - name: Rommene som er ledige
-  description: Rommene som står åpne for studenter som søker om et sted å bo.
+  description: Rommene som står ledige for dem som søker et sted å bo.
   features:
   - name: ''
     description: ''

questions/index.yaml

@@ -1,15 +1,15 @@
-name: Trenger du et rimelig rom å bo i mens du studerer?
-description: Gullberg er et gammelt hus med rom til studenter. Eierne driver det selv, og Klingenberg Bygg forvalter huset og vedlikeholdet.
+name: 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.
 responsible:
   name: Styret i Gullberg
   contact: bl@klingenbergbygg.no
   group: styret
 alternatives:
-- name: Et rimelig sted å bo for studenter
-  description: Gullberg har rom til leie gjennom studieåret, til en pris som går opp med studielånet.
+- name: Et rimelig sted å bo, nær NMBU
+  description: Rommene leies ut for et år av gangen, til en pris som går opp med studielånet. Studenter går foran, men alle kan søke.
   features:
-  - name: Rom til leie gjennom hele studieåret
-    description: Du leier et rom i huset så lenge studieåret varer, til en husleie satt for studenter.
+  - name: Rom til leie, studenter først
+    description: Du leier et rom i huset for et år av gangen. Studenter ved NMBU får rommene først; er det ledig, får andre også.
     icon: lucide:house
 - name: Hva er Gullberg?
   description: Fire aksjonærer eier huset sammen og driver det selv, med Klingenberg Bygg som forvalter.
@@ -34,8 +34,8 @@ alternatives:
       link:
         to: /status/liste/{id}
         label: Svar
-- name: Søk rom for studieåret
-  description: Fortell oss litt om deg, så tar styret kontakt når et rom passer.
+- name: Søk om et rom
+  description: Fortell litt om deg og hva du gjør til daglig. Studenter går foran, men alle kan søke.
   action: /received/leie-rom
   consequence:
   - Søk rom
@@ -53,18 +53,23 @@ alternatives:
       label: Navn
       type: text
       placeholder: Kari Nordmann
+      value: '{user.name}'
     - name: email
       label: E-post
       type: email
       placeholder: kari@student.no
+      value: '{user.email}'
     - name: telefon
       label: Telefon
       type: tel
       placeholder: 123 45 678
-    - name: studiested
-      label: Studiested
-      type: text
-      placeholder: NTNU
+    - name: situasjon
+      label: Hva gjør du til daglig?
+      type: select
+      options:
+      - Student ved NMBU
+      - Student et annet sted
+      - Jobber eller annet
     - name: innflytting
       label: Ønsket innflytting
       type: date

questions/styret/index.yaml

@@ -177,14 +177,14 @@ alternatives:
       - from: open
         to: utleid
         label: Merk som utleid
-- name: Følg opp søknader om rom fra studenter
-  description: Se hvem som har søkt, sett opp visning, og før søknaden frem til signert leieavtale.
+- name: Følg opp søknader om rom
+  description: Se hvem som har søkt og hva de gjør til daglig (studenter går foran), sett opp visning, og før søknaden frem til signert leieavtale.
   action: /styret
   consequence:
   - Bekreft
   features:
   - name: Søknader om rom
-    description: Hver rad er en søknad fra en student, med studiested og ønsket innflytting; knappene under fører den videre eller avslår den.
+    description: Hver rad er en søknad, med hva søkeren gjør til daglig og ønsket innflytting. Studenter går foran. Knappene fører søknaden videre eller avslår den.
     resource:
       source:
         kind: kv

questions/styret/ledig-rom-sent.yaml

@@ -1,5 +1,5 @@
 name: Hva skjer med rommet du nettopp la ut?
-description: Rommet er lagt inn og synlig for studenter som søker. Dere ser det under ledige rom til det er leid ut.
+description: Rommet er lagt inn og synlig for dem som søker. Dere ser det under ledige rom til det er leid ut.
 alternatives:
 - name: Studenter kan søke på rommet nå
   description: Søknader kommer inn etter hvert, og dere i styret ser dem sammen med de andre søknadene.

questions/styret/ledig-rom.yaml

@@ -1,13 +1,13 @@
 followup: false
 name: Hvilket rom er ledig nå?
-description: Legg ut et rom som har blitt ledig, så studenter kan se det og søke.
+description: Legg ut et rom som har blitt ledig, så de som søker kan se det.
 responsible:
   name: Styret i Gullberg
   contact: bl@klingenbergbygg.no
   group: styret
 alternatives:
 - name: Meld inn et rom som er ledig
-  description: Når et rom står tomt, legger du det ut her, så ser studenter det før de søker.
+  description: Når et rom står tomt, legger du det ut her, så ser de som søker det først.
   action: /styret/ledig-rom-sent
   consequence:
   - Legg ut rommet
@@ -33,7 +33,7 @@ alternatives:
       label: Om rommet
       type: textarea
       placeholder: Lyst rom med eget bad, nær kjøkken og felles stue.
-    description: Et bilde og en kort beskrivelse er nok til at studenter kan se seg om.
+    description: Et bilde og en kort beskrivelse er nok til at de som søker kan se seg om.
     icon: lucide:key
   encouragements:
-  - Så snart det er lagt ut, kan studenter melde seg på.
+  - Så snart det er lagt ut, kan folk søke på det.