update theme

layouts/partials/cite.html

@@ -34,5 +34,5 @@
   </a>
   {{- end -}}
 {{- else -}}
-  {{- warnf "Invalid Schema.org type value %q for %q" $itemType .Params.title -}}
+  {{- erroridf "invalid-schema-type" "Invalid Schema.org type value %q for %q" $itemType .Params.title -}}
 {{- end -}}

layouts/partials/cv/organisations/get_top_level_parent_organisation.html

@@ -0,0 +1,13 @@
+<!--. is .c-->
+<!--$ is .g-->
+
+{{ $scratch := .g.Scratch }}
+{{ if .c.Parent }}
+  {{ if ne .c.Parent.Type "cv/organisations" }}
+    {{ with .c.Parent }}
+      {{ partial "cv/organisations/recursive-parents.html" (dict "c" . "g" $.g ) }}
+    {{ end }}
+  {{ else }}
+    {{ $scratch.Set "top-level-parent" .c.Parent }}
+  {{ end }}
+{{ end }}

layouts/partials/cv/organisations/items-table.html

@@ -13,7 +13,7 @@
       <tr>
         <td>  
           {{- if .Params.featured_image -}}
-            <img width="150" height="auto" loading="lazy" src="
+            <img class="organisation-table__logo" loading="lazy" src="
             {{- if .Resources.GetMatch .Params.featured_image -}}
               {{- ( .Resources.GetMatch .Params.featured_image ).RelPermalink -}}
             {{- else -}}
@@ -22,7 +22,13 @@
             ">
           {{- end -}}
         </td>
-        <td><a href="{{ .RelPermalink }}">{{ .Title | safeHTML }}</a></td>
+        <td>
+          <a href="{{ .RelPermalink }}">
+            {{- if .Params.TitleLang -}}<i lang="{{ .Params.TitleLang }}" title="{{ .Params.TitleTrans }}"}>{{- end -}}
+            {{- with .Params.markup_title -}}{{- . | safeHTML -}}{{- else -}}{{- .Title | safeHTML -}}{{- end -}}
+            {{- if .Params.TitleLang -}}</i>{{- end -}}
+          </a>
+        </td>
         <td>{{- if gt (len .Sections) 0 -}}&#10004;{{- end -}}</td>
         <td></td>
       </tr>

layouts/partials/cv/organisations/recursive-children-titles.html

@@ -1,9 +1,9 @@
 {{ $titles := ( slice )}}
 
 {{ range . }}
-   {{ $titles = $titles | append (slice (.Title | plainify) )}}
-    {{ with .Sections }}
-         {{ $titles = $titles | append ( partial "cv/organisations/recursive-children-titles.html" . ) }}
+   {{ $titles = $titles | append (slice ( .Title | plainify ) )}}
+    {{ if .Sections }}
+         {{ $titles = $titles | append ( partialCached "cv/organisations/recursive-children-titles.html" .Sections .Title) }}
     {{ end }}
 {{ end }}
 

layouts/partials/cv/organisations/recursive-children.html

@@ -1,5 +1,5 @@
 <li class="hierarchy-item hierarchy-item--child"><a href="{{ .RelPermalink }}">{{ with .Params.markup_title }}{{ . | safeHTML }}{{ else }}{{ .Title | safeHTML }}{{ end }}</a>
-{{ range .Sections }}<ul>
-{{ partial "cv/organisations/recursive-children.html" . }}
-</ul>{{ end }}
+{{- range .Sections -}}<ul>
+    {{- partialCached "cv/organisations/recursive-children.html" . .Title -}}
+</ul>{{- end -}}
 </li>

layouts/partials/cv/organisations/recursive-parents.html

@@ -6,7 +6,7 @@
   {{ if ne .c.Parent.Type "cv/organisations" }}
     {{ with .c.Parent }}
       {{ $scratch.Add "parents" ( slice . ) }}
-      {{ partial "cv/organisations/recursive-parents.html" (dict "c" . "g" $.g ) }}
+      {{ partialCached "cv/organisations/recursive-parents.html" (dict "c" . "g" $.g ) .Title }}
     {{ end }}
   {{ end }}
 {{ end }}

layouts/partials/cv/timeline-legend.html

@@ -0,0 +1,16 @@
+<aside class="timeline__legend">
+    <div>
+    <label for="legend__past">Past</label>
+    <div id="legend__past">
+        <button id="past-unpaid" class="legend__button"><p><span class="colour-square colour-square--unpaid-past"></span> Unpaid</p></button>
+        <button id="past-paid" class="legend__button"><p><span class="colour-square colour-square--paid-past"></span> Paid</p></button>
+    </div>
+    </div>
+    <div>
+    <label for="legend__current">Current</label>
+    <div id="legend__current">
+        <button id="current-unpaid" class="legend__button"><p><span class="colour-square colour-square--unpaid-current"></span> Unpaid</p></button>
+        <button id="current-paid" class="legend__button"><p><span class="colour-square colour-square--paid-current"></span> Paid</p></button>
+    </div>
+    </div>
+</aside>

layouts/partials/header/site-header.html

@@ -3,6 +3,12 @@
     <h2 class="p-name site-header__title" itemprop="name"><a class="u-url" href="{{ .Site.Home.RelPermalink }}" rel="me author">{{ .Site.Title }}</a></h2>
     <p class="p-note site-header__tagline" itemprop="about">Views my own. Discussion ≠ endorsement. Do try this at home.</p>
     <p class="site-header__icons">~ <a class="u-email" href="mailto:{{ $.Site.Author.email }}" rel="me">&#128231;</a> ~ <a class="u-url" href="{{ .Site.Params.codeURL }}" rel="me">&#128187;</a> ~ <a class="u-key" href="/{{ .Site.Params.keyfile }}" rel="me">&#128272;</a> ~ <a href="/index.xml" aria-label="{{ .Site.Title }} RSS feed"><img class="feed-icon" alt="RSS feed" src="{{ .Site.Params.feedIcon }}"></a> ~</p>
-    {{ partial "header/site-nav.html" . }}
+    <nav class="site-header__nav">
+      <ul>
+        {{ range ( where .Site.Sections.ByTitle "Type" "in" site.Params.mainSections ) }}
+        <li><a href="{{ .RelPermalink }}">{{ .Title | safeHTML }}</a></li>
+        {{ end }}
+      </ul>
+    </nav>
   {{ end }}
 </header>

layouts/partials/post-meta.html

@@ -41,28 +41,28 @@
   {{- end -}}
   
   {{- if .GetTerms "organisations" -}}
-    <section id="post-organisations" class="article-footer__organisations" aria-labelledby="post-organisations-title" itemprop="articleSection">
-      <h3 id="post-organisations-title">Organisations</h3>
+    <section id="post-organisations" class="article-footer__organisations" itemprop="articleSection">
+      <h3>Organisations</h3>
       <ul>
       {{ $all_organisations := partialCached "get_all_organisations.html" . }}
       <!-- TODO: Replace with hierarchy partial -->
       {{- range ( .GetTerms "organisations" ) -}}
-          {{ with ( where $all_organisations "Title" ( .Title | plainify ) ) }}
-            {{ range . }}
-              <li><a href="{{ .RelPermalink }}">{{ if ( .Params.markup_title ) }}{{ .Params.markup_title | safeHTML }}{{ else }}{{ .Title }}{{ end }}</a></li>
-            {{ end }}
-          {{ else }}
-            {{ warnf "Could not find organisation %q (%q)" .Title $.File.Path }}
-              <li>{{ if ( .Params.markup_title ) }}{{ .Params.markup_title | safeHTML }}{{ else }}{{ .Title }}{{ end }}</li>
+        {{ with ( where $all_organisations "Title" ( .Title | plainify ) ) }}
+          {{ range . }}
+            <li><a href="{{ .RelPermalink }}">{{ if ( .Params.markup_title ) }}{{ .Params.markup_title | safeHTML }}{{ else }}{{ .Title }}{{ end }}</a></li>
           {{ end }}
+        {{ else }}
+          {{ erroridf "missing-organisation" "Could not find organisation %q (%q)" .Title $.File.Path }}
+            <li>{{ if ( .Params.markup_title ) }}{{ .Params.markup_title | safeHTML }}{{ else }}{{ .Title }}{{ end }}</li>
+        {{ end }}
       {{- end -}}
       </ul>
     </section>
   {{- end -}}
   
   {{- if .GetTerms "locations" -}}
-    <section id="post-locations" class="article-footer__locations" aria-labelledby="post-locations-title">
-      <h3 id="post-locations-title">Locations</h3>
+    <section id="post-locations" class="article-footer__locations">
+      <h3>Locations</h3>
       <div id="map" style="width: 100%; height: 500px; margin: 0; display: block;"></div>
       <ul style="display: none">
       {{- range ( .GetTerms "locations" ).ByTitle -}}
@@ -73,8 +73,8 @@
   {{- end -}}
   
   {{- if .GetTerms "tags" -}}
-    <section id="post-tags" class="article-footer__tags" aria-labelledby="post-tags-title">
-      <h3 id="post-tags-title">Tags</h3>
+    <section id="post-tags" class="article-footer__tags">
+      <h3>Tags</h3>
       <ul>
       {{- range ( .GetTerms "tags" ).ByTitle -}}
         <li class="p-category"><a href="{{ .RelPermalink }}">{{ .LinkTitle | safeHTML }}</a></li>