Update

archetypes/blog/posts/index.md

@@ -0,0 +1,10 @@
+---
+{{ partial "archetypes/base-meta.md" . -}}
+
+{{ partial "archetypes/base-resources.md" . -}}
+
+{{ partial "archetypes/base-taxonomies.md" . -}}
+categories:
+  -
+---
+

archetypes/cv/appearances/index.md

@@ -0,0 +1,11 @@
+---
+{{ partial "archetypes/base-meta.md" . -}}
+author: 
+published_in:
+
+{{ partial "archetypes/base-resources.md" . -}}
+external_links:
+  -
+
+{{ partial "archetypes/base-taxonomies.md" . -}}
+---

archetypes/cv/organisations/_index.md

@@ -0,0 +1,11 @@
+---
+{{ partial "archetypes/base-meta.md" . -}}
+
+{{ partial "archetypes/base-resources.md" . -}}
+
+# Taxonomies
+locations:
+  -
+tags:
+  -
+---

archetypes/cv/qualifications/index.md

@@ -0,0 +1,8 @@
+---
+{{ partial "archetypes/base-meta.md" . -}}
+expires_on:
+
+{{ partial "archetypes/base-resources.md" . -}}
+
+{{ partial "archetypes/base-taxonomies.md" . }}
+---

archetypes/cv/roles.md

@@ -0,0 +1,11 @@
+---
+{{ partial "archetypes/base-meta.md" . -}}
+end_date: 
+paid: 
+
+{{ partial "archetypes/base-resources.md" . -}}
+
+{{ partial "archetypes/base-taxonomies.md" . -}}
+socs:
+  -
+---

archetypes/default/default.md

@@ -0,0 +1,8 @@
+---
+{{ partial "archetypes/base-meta.md" . -}}
+
+{{ partial "archetypes/base-resources.md" . -}}
+
+{{ partial "archetypes/base-taxonomies.md" . -}}
+---
+

archetypes/portfolio/presentations/index.md

@@ -0,0 +1,11 @@
+---
+{{ partial "archetypes/base-meta.md" . -}} 
+published_in:
+
+{{ partial "archetypes/base-resources.md" . -}}
+external_links:
+  - title: Recording
+    link: 
+
+{{ partial "archetypes/base-taxonomies.md" . -}}
+---

archetypes/portfolio/programs/index.md

@@ -0,0 +1,12 @@
+---
+{{ partial "archetypes/base-meta.md" . -}}
+version: 0.0.1
+licence:
+
+{{ partial "archetypes/base-resources.md" . -}}
+internal_links:
+  - title: Code repository
+    link: {{ .Site.Params.codeURL }}/Rumperuu/{{ .Name | title }}
+
+{{ partial "archetypes/base-taxonomies.md" . -}}
+---

archetypes/portfolio/websites/index.md

@@ -0,0 +1,15 @@
+---
+{{ partial "archetypes/base-meta.md" . -}}
+version: 0.0.1
+licence:
+
+{{ partial "archetypes/base-resources.md" . -}}
+internal_links:
+  - title: Code repository
+    link: {{ .Site.Params.codeURL }}/Rumperuu/{{ .Name | title }}
+external_links:
+  - title: Web site
+    link: 
+
+{{ partial "archetypes/base-taxonomies.md" . -}}
+---

layouts/_default/baseof.html

@@ -40,7 +40,13 @@
      
     {{- block "footer" . -}}
     <footer class="site-footer">
-      <p>By <a href="/">{{ $.Site.Author.name }}</a> | <a href="{{ $.Site.Params.reportIssueURL }}" target="_blank" rel="noopener noreferrer">Report an Issue</a> | <a href="/privacy-policy">Privacy Policy</a> | <a href="/{{ .Sitemap.Filename }}">Sitemap</a> | Built: {{ now.Format "2006-01-02T15:04:05" }}</p>
+      <p>
+        By <a href="/">{{ $.Site.Author.name }}</a> | 
+        <a href="{{ $.Site.Params.reportIssueURL }}" target="_blank" rel="noopener noreferrer">Report an Issue</a> | 
+        <a href="{{ relref . "privacy-policy" }}">Privacy Policy</a> | 
+        <a href="/{{ .Sitemap.Filename }}">Sitemap</a> | 
+        Built: {{ now.Format "2006-01-02T15:04:05" }}
+      </p>
       {{ block "footer-scripts" . }}<!-- -->{{ end }}
     </footer>
     {{- end -}}

layouts/blog/single.html

@@ -44,6 +44,10 @@
         <script id="MathJax-script" async src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script>
         <script src="/js/mathjax-config.js"></script>
       {{ end }}
+      {{ if in . "charts" }}     
+        <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
+        <script src="js/charts.js"></script>
+      {{ end }}
    {{ end }}
 {{ end }}
 

layouts/cv/list.html

@@ -90,8 +90,17 @@
       {{ end }}
       {{ if eq .Type "cv" }}
          <aside class="timeline__legend">
-            <span><div class="colour-square colour-square--current"></div> <p>Current</p></span>
+            <label for="legend__past">Past</label>
-            <span><div class="colour-square colour-square--past"></div> <p>Past</p></span>
+            <div id="legend__past">
+              <span><div class="colour-square colour-square--unpaid-past"></div> <p>Unpaid</p></span>
+              <span><div class="colour-square colour-square--paid-past"></div> <p>Paid</p></span>
+            </div>
+            <br>
+            <label for="legend__current">Current</label>
+            <div id="legend__current">
+              <span><div class="colour-square colour-square--unpaid-current"></div> <p>Unpaid</p></span>
+              <span><div class="colour-square colour-square--paid-current"></div> <p>Paid</p></span>
+            </div>
          </aside>
       {{ end }}
     </header>
@@ -114,8 +123,17 @@
         
         <section id="roles-timelimne">
          <aside class="timeline__legend">
-            <span><div class="colour-square colour-square--current"></div> <p>Current</p></span>
+            <label for="legend__past">Past</label>
-            <span><div class="colour-square colour-square--past"></div> <p>Past</p></span>
+            <div id="legend__past">
+              <span><div class="colour-square colour-square--unpaid-past"></div> <p>Unpaid</p></span>
+              <span><div class="colour-square colour-square--paid-past"></div> <p>Paid</p></span>
+            </div>
+            <br>
+            <label for="legend__current">Current</label>
+            <div id="legend__current">
+              <span><div class="colour-square colour-square--unpaid-current"></div> <p>Unpaid</p></span>
+              <span><div class="colour-square colour-square--paid-current"></div> <p>Paid</p></span>
+            </div>
          </aside>
           <div id="timeline" aria-label="Role Time" role="img">Javascript must be enabled to view this chart.</div>
         </section>

layouts/cv/section.html

@@ -113,8 +113,17 @@
       {{ end }}
       {{ if eq .Type "cv" }}
          <aside class="timeline__legend">
-            <span><div class="colour-square colour-square--current"></div> <p>Current</p></span>
+            <label for="legend__past">Past</label>
-            <span><div class="colour-square colour-square--past"></div> <p>Past</p></span>
+            <div id="legend__past">
+              <span><div class="colour-square colour-square--unpaid-past"></div> <p>Unpaid</p></span>
+              <span><div class="colour-square colour-square--paid-past"></div> <p>Paid</p></span>
+            </div>
+            <br>
+            <label for="legend__current">Current</label>
+            <div id="legend__current">
+              <span><div class="colour-square colour-square--unpaid-current"></div> <p>Unpaid</p></span>
+              <span><div class="colour-square colour-square--paid-current"></div> <p>Paid</p></span>
+            </div>
          </aside>
       {{ end }}
     </header>
@@ -137,8 +146,17 @@
         
         <section id="roles-timeline">
          <aside class="timeline__legend">
-            <span><div class="colour-square colour-square--current"></div> <p>Current</p></span>
+            <label for="legend__past">Past</label>
-            <span><div class="colour-square colour-square--past"></div> <p>Past</p></span>
+            <div id="legend__past">
+              <span><div class="colour-square colour-square--unpaid-past"></div> <p>Unpaid</p></span>
+              <span><div class="colour-square colour-square--paid-past"></div> <p>Paid</p></span>
+            </div>
+            <br>
+            <label for="legend__current">Current</label>
+            <div id="legend__current">
+              <span><div class="colour-square colour-square--unpaid-current"></div> <p>Unpaid</p></span>
+              <span><div class="colour-square colour-square--paid-current"></div> <p>Paid</p></span>
+            </div>
          </aside>
           <div id="timeline" aria-label="Role Time" role="img">Javascript must be enabled to view this chart.</div>
         </section>

layouts/partials/archetypes/base-meta.md

@@ -0,0 +1,6 @@
+# Meta
+title: "{{ replace .Name "-" " " | title }}"
+subtitle:
+summary:
+date: {{ .Date }}
+draft: true

layouts/partials/archetypes/base-resources.md

@@ -0,0 +1,8 @@
+# Resources
+featured_image: {{ .Name }} 
+resources:
+  - name: {{ .Name }}
+    alt: 
+    src: images/{{ .Name }}.*
+    params:
+      attr:

layouts/partials/archetypes/base-taxonomies.md

@@ -0,0 +1,13 @@
+# Taxonomies
+organisations:
+  - 
+locations:
+  -
+colleagues:
+  -
+areas:
+  -
+skills:
+  -
+tags:
+  - 

layouts/partials/post-meta.html

@@ -42,6 +42,17 @@
     </section>
   {{- end -}}
   
+  {{- if .GetTerms "areas" -}}
+    <section class="article-footer__links">
+      <h2 id="item-areas-title">Areas</h2>
+      <ul>
+      {{- range ( .GetTerms "areas" ).ByTitle -}}
+        <li><a href="{{ .RelPermalink }}">{{ .LinkTitle }}</a></li>
+      {{- end -}}
+      </ul>
+    </section>
+  {{- end -}}
+  
   {{- if .GetTerms "organisations" -}}
     <section id="post-organisations" class="article-footer__organisations" aria-labelledby="post-organisations-title">
       <h2 id="post-organisations-title">Organisations</h2>

layouts/shortcodes/figure.html

@@ -1,44 +1,63 @@
-{{ $img := $.Page.Resources.GetMatch (.Get "src") }}
+{{ $src := $.Page.Resources.GetMatch (.Get "src") }}
-{{ $file := $.Page.Resources.GetMatch (.Get "link") }}
+{{ $link := $.Page.Resources.GetMatch (.Get "link") }}
 
 <figure{{ with .Get "class" }} class="{{ . }}"{{ end }}>
     {{- if .Get "link" -}}
-        {{- if $file }}
+        {{- if $link }}
-          <a href="{{ $file.RelPermalink }}"{{ with .Get "rel" }} rel="{{ . }}"{{ end }}>
+          <a href="{{ $link.RelPermalink }}"{{ with .Get "rel" }} rel="{{ . }}"{{ end }}>
         {{ else }}
           <a href="{{ .Get "link" }}"{{ with .Get "target" }} target="{{ . }}"{{ end }}{{ with .Get "rel" }} rel="{{ . }}"{{ end }}>
         {{ end }}
     {{- end -}}
-    {{ if $img }}
+    
-    <img class="figure__image"
+    {{- if eq $src.ResourceType "image" -}}
-      {{ with $img.Resize (printf "%dx%d webp" $img.Width $img.Height) }}
+    <picture class="figure__picture">
-        src="{{ .RelPermalink }}"
+      <img class="figure__image"
-      {{ end }}
+        {{ with $src.Resize (printf "%dx%d webp" $src.Width $src.Height) }}
-        {{- if or ($img.Params.alt) (.Get "caption") }}
+          src="{{ .RelPermalink }}"
-          alt="{{ with $img.Params.alt }}{{ . }}{{ else }}{{ .Get "caption" | markdownify| plainify }}{{ end }}"
+        {{ end }}
-        {{- end -}}
+          {{- if or ($src.Params.alt) (.Get "caption") }}
-        {{- with $img.Params.title }} title="{{ . }}"{{ end -}}
+            alt="{{ with $src.Params.alt }}{{ . }}{{ else }}{{ .Get "caption" | markdownify| plainify }}{{ end }}"
-        width="{{ $img.Width }}"
+          {{- end -}}
-        height="{{ $img.Height }}"
+          {{- with $src.Params.title }} title="{{ . }}"{{ end -}}
-    />
+          width="{{ $src.Width }}"
-    {{ end }}
+          height="{{ $src.Height }}"
+      />
+    </picture>
+    {{- else if eq $src.ResourceType "video" -}}
+      {{- if eq $src.MediaType "video/ogg" -}}
+        <audio controls>
+          <source src="{{ $src.RelPermalink }}" type="{{ $src.MediaType }}" />
+          <p>Your browser doesn't support embedded audio, but you can view the audio <a href="{{ $src.RelPermalink }}">here</a>.</p>
+        </audio>
+      {{- else -}}
+        <video class="figure__video" 
+               controls
+               src="{{ $src.RelPermalink }}"
+               poster="{{ if $src.Params.poster }}{{ .Get $src.Params.poster }}{{ else }}{{ warnf "No poster defined for resource %q" $src.RelPermalink }}{{ end }}"
+        >
+         Your browser doesn't support embedded video, but you can view the video <a href="{{ $src.RelPermalink }}">here</a>.
+        </video>
+      {{- end -}}
+    {{- else if or ( ne $src.ResourceType "image" ) ( ne $src.ResourceType "video" ) -}}
+        {{- errorf "No handling for resource of type %q" $src.ResourceType -}}
+    {{- end -}}
     {{- if .Get "link" }}</a>{{ end -}}
-    {{- if or (.Get "caption") ($img.Params.attr) -}}
+    
+    {{- if or (.Get "caption") ($src.Params.attr) -}}
         <figcaption class="figure__caption{{ if not (.Get "caption") }} figure__caption--no-height{{ end }}">
-            {{- if $img.Params.attrlink -}}
+            {{- if $src.Params.attrlink -}}
-              <a class="figcaption__attrlink" href="{{ $img.Params.attrlink }}"
+              <a class="figcaption__attrlink" href="{{ $src.Params.attrlink }}"
-                {{- with $img.Params.attrtarget }} target="{{ . }}"{{ end -}}
+                {{- with $src.Params.attrtarget }} target="{{ . }}"{{ end -}}
-                {{- with $img.Params.attrrel }} rel="{{ . }}"{{ end -}}
+                {{- with $src.Params.attrrel }} rel="{{ . }}"{{ end -}}
               >
             {{- end -}}
-            {{- with $img.Params.attr -}}<p class="figcaption__attr">{{ . | safeHTML }}{{ with $img.Params.attrlicence }} <span class="figcaption__licence">{{ . | safeHTML }}</span>{{ end }}</p>{{- end -}}
+            {{- with $src.Params.attr -}}<p class="figcaption__attr">{{ . | safeHTML }}{{ with $src.Params.attrlicence }} <span class="figcaption__licence">{{ . | safeHTML }}</span>{{ end }}</p>{{- end -}}
-            {{- if $img.Params.attrlink -}}
+            {{- if $src.Params.attrlink -}}
               </a>
             {{- end -}}
-            {{- with $img.Params.title -}}<h4 class="figcaption__title">{{ . }}</h4>{{- end -}}
+            {{- with $src.Params.title -}}<h4 class="figcaption__title">{{ . }}</h4>{{- end -}}
-            {{- if .Get "caption" -}}
+            {{- with .Get "caption" -}}<p class="figcaption__caption">{{ . | markdownify }}</p>{{- end -}}
-                <p class="figcaption__caption">{{ .Get "caption" | markdownify }}</p>
-            {{- end -}}
         </figcaption>
     {{- end -}}
 </figure>

layouts/shortcodes/gallery.html

@@ -0,0 +1,30 @@
+<!-- count how many times we've called this shortcode; load the css if it's the first time -->
+{{- if not ($.Page.Scratch.Get "figurecount") }}<link rel="stylesheet" href={{ "css/hugo-easy-gallery.css" | relURL }} />{{ end }}
+{{- $.Page.Scratch.Add "figurecount" 1 }}
+{{ $baseURL := .Site.BaseURL }}
+<div class="gallery caption-position-{{ with .Get "caption-position" | default "bottom" }}{{.}}{{end}} caption-effect-{{ with .Get "caption-effect" | default "slide" }}{{.}}{{end}} hover-effect-{{ with .Get "hover-effect" | default "zoom" }}{{.}}{{end}} {{ if ne (.Get "hover-transition") "none" }}hover-transition{{end}}" itemscope itemtype="http://schema.org/ImageGallery">
+	{{- with (.Get "dir") -}}
+		<!-- If a directory was specified, generate figures for all of the images in the directory -->
+		{{- $files := readDir ( print "content/" $.Page.File.Dir . ) }}
+		{{- range $files -}}
+			<!-- skip files that aren't images, or that include the thumb suffix in their name -->
+			{{- $isimg := lower .Name | findRE "\\.(gif|jpg|jpeg|tiff|png|bmp|webp|avif|jxl)" }}<!-- is the current file an image? -->
+			{{- if $isimg }}
+				{{- $caption :=  .Name | replaceRE "\\..*" "" | humanize }}<!-- humanized filename without extension -->
+				{{- $linkURL := print $.Page.Permalink ($.Get "dir") "/" .Name | absURL }}<!-- absolute URL to hi-res image -->
+				<div class="box">
+				  <figure itemprop="associatedMedia" itemscope itemtype="http://schema.org/ImageObject">
+				    <div class="img" style="background-image: url('{{ $linkURL }}');" >
+				      <img itemprop="thumbnail" src="{{ $linkURL }}" alt="{{ $caption }}" /><!-- <img> hidden if in .gallery -->
+				    </div>
+				    <a href="{{ $linkURL }}" itemprop="contentUrl"></a><!-- put <a> last so it is stacked on top -->
+				  </figure>
+				</div>
+			{{- end }}
+		{{- end }}
+	{{- else -}}
+		<!-- If no directory was specified, include any figure shortcodes called within the gallery -->
+	  {{ .Inner }}
+	{{- end }}
+</div>
+