Update theme

This commit is contained in:
Ben Goldsworthy 2023-02-17 19:38:04 -05:00
parent 9e8626d8ba
commit eaf2377efb
3 changed files with 1139 additions and 91 deletions

File diff suppressed because it is too large Load diff

View file

@ -16,14 +16,14 @@ function drawChart() {
"Web Developer",
"#BCBC7E",
new Date("2022-10-26"),
new Date("2023-01-29")
new Date("2023-02-17")
],
[
"Chartered Institute for Information Security",
"Associate Member",
"#BBBBB0",
new Date("2022-08-09"),
new Date("2023-01-29")
new Date("2023-02-17")
],
[
"West Lancs Scouts Active Support",
@ -37,112 +37,112 @@ function drawChart() {
"Member",
"#BBBBB0",
new Date("2022-06-06"),
new Date("2023-01-29")
new Date("2023-02-17")
],
[
"Computer Arts Society",
"Member",
"#BBBBB0",
new Date("2022-06-06"),
new Date("2023-01-29")
new Date("2023-02-17")
],
[
"Computer Conservation Society",
"Member",
"#BBBBB0",
new Date("2022-06-06"),
new Date("2023-01-29")
new Date("2023-02-17")
],
[
"Consultancy Specialist Group",
"Member",
"#BBBBB0",
new Date("2022-06-06"),
new Date("2023-01-29")
new Date("2023-02-17")
],
[
"Enterprise Architecture Specialist Group",
"Member",
"#BBBBB0",
new Date("2022-06-06"),
new Date("2023-01-29")
new Date("2023-02-17")
],
[
"Green IT Specialist Group",
"Member",
"#BBBBB0",
new Date("2022-06-06"),
new Date("2023-01-29")
new Date("2023-02-17")
],
[
"Health & Care Specialist Group",
"Member",
"#BBBBB0",
new Date("2022-06-06"),
new Date("2023-01-29")
new Date("2023-02-17")
],
[
"Internet Specialist Group",
"Member",
"#BBBBB0",
new Date("2022-06-06"),
new Date("2023-01-29")
new Date("2023-02-17")
],
[
"Information Risk Management and Assurance Specialist Group",
"Member",
"#BBBBB0",
new Date("2022-06-06"),
new Date("2023-01-29")
new Date("2023-02-17")
],
[
"Information Security Specialist Group",
"Member",
"#BBBBB0",
new Date("2022-06-06"),
new Date("2023-01-29")
new Date("2023-02-17")
],
[
"IT Ethics Specialist Group",
"Member",
"#BBBBB0",
new Date("2022-06-06"),
new Date("2023-01-29")
new Date("2023-02-17")
],
[
"Law Specialist Group",
"Member",
"#BBBBB0",
new Date("2022-06-06"),
new Date("2023-01-29")
new Date("2023-02-17")
],
[
"BCS Nottingham & Derby Branch",
"Member",
"#BBBBB0",
new Date("2022-06-06"),
new Date("2023-01-29")
new Date("2023-02-17")
],
[
"Open Source Specialist Group",
"Member",
"#BBBBB0",
new Date("2022-06-06"),
new Date("2023-01-29")
new Date("2023-02-17")
],
[
"Sociotechnical Specialist Group",
"Member",
"#BBBBB0",
new Date("2022-06-06"),
new Date("2023-01-29")
new Date("2023-02-17")
],
[
"BCS, the Chartered Institute for IT",
"Professional Member",
"#BBBBB0",
new Date("2022-06-06"),
new Date("2023-01-29")
new Date("2023-02-17")
],
[
"Chartered Institute for Information Security",
@ -163,7 +163,7 @@ function drawChart() {
"Student Member",
"#BBBBB0",
new Date("2022-05-26"),
new Date("2023-01-29")
new Date("2023-02-17")
],
[
"MORS Cyber CoP",
@ -205,7 +205,7 @@ function drawChart() {
"Supporter",
"#BBBBB0",
new Date("2022-01-14"),
new Date("2023-01-29")
new Date("2023-02-17")
],
[
"Actica Consulting",
@ -261,14 +261,14 @@ function drawChart() {
"Member",
"#BBBBB0",
new Date("2021-09-24"),
new Date("2023-01-29")
new Date("2023-02-17")
],
[
"Mountain Training Association",
"Trainee Member",
"#BBBBB0",
new Date("2021-08-24"),
new Date("2023-01-29")
new Date("2023-02-17")
],
[
"North West Area Meeting",
@ -282,7 +282,7 @@ function drawChart() {
"Member",
"#BBBBB0",
new Date("2021-07-26"),
new Date("2023-01-29")
new Date("2023-02-17")
],
[
"Lancaster Quaker Meeting",
@ -338,7 +338,7 @@ function drawChart() {
"Participant",
"#BBBBB0",
new Date("2021-01-23"),
new Date("2023-01-29")
new Date("2023-02-17")
],
[
"footnotes",
@ -373,7 +373,7 @@ function drawChart() {
"Member",
"#BBBBB0",
new Date("2020-09-29"),
new Date("2023-01-29")
new Date("2023-02-17")
],
[
"Executive Committee",
@ -394,7 +394,7 @@ function drawChart() {
"Website Content Manager",
"#BBBBB0",
new Date("2020-08-31"),
new Date("2023-01-29")
new Date("2023-02-17")
],
[
"Unity2020",
@ -548,14 +548,14 @@ function drawChart() {
"Associate Member",
"#BBBBB0",
new Date("2019-04-01"),
new Date("2023-01-29")
new Date("2023-02-17")
],
[
"Youth Hostel Association",
"Company Member",
"#BBBBB0",
new Date("2019-02-20"),
new Date("2023-01-29")
new Date("2023-02-17")
],
[
"Friends of Lancaster Library",
@ -737,14 +737,14 @@ function drawChart() {
"Member",
"#BBBBB0",
new Date("2018-06-20"),
new Date("2023-01-29")
new Date("2023-02-17")
],
[
"UK England Chapter",
"Member",
"#BBBBB0",
new Date("2018-06-13"),
new Date("2023-01-29")
new Date("2023-02-17")
],
[
"Community Networks SIG",
@ -758,14 +758,14 @@ function drawChart() {
"Member",
"#BBBBB0",
new Date("2018-06-06"),
new Date("2023-01-29")
new Date("2023-02-17")
],
[
"Internet Society",
"Member",
"#BBBBB0",
new Date("2018-06-04"),
new Date("2023-01-29")
new Date("2023-02-17")
],
[
"Mitigate Cyber",
@ -954,7 +954,7 @@ function drawChart() {
"Member",
"#BBBBB0",
new Date("2017-06-06"),
new Date("2023-01-29")
new Date("2023-02-17")
],
[
"Lonsdale District Scout Network, Scout Network",
@ -1017,7 +1017,7 @@ function drawChart() {
"Member",
"#BBBBB0",
new Date("2016-12-19"),
new Date("2023-01-29")
new Date("2023-02-17")
],
[
"Pendle College, Lancaster University Students' Union",
@ -1388,7 +1388,7 @@ function drawChart() {
"Librarian",
"#BBBBB0",
new Date("2013-05-01"),
new Date("2023-01-29")
new Date("2023-02-17")
],
[
"Patient Participation Group",
@ -1444,7 +1444,7 @@ function drawChart() {
"Minister",
"#BBBBB0",
new Date("2012-01-01"),
new Date("2023-01-29")
new Date("2023-02-17")
],
[
"Salvation Army",

View file

@ -1,63 +1,96 @@
{{ $src := $.Page.Resources.GetMatch (.Get "src") }}
{{ $link := $.Page.Resources.GetMatch (.Get "link") }}
{{- if ( and ( .Get "src" ) ( .Get "chart-id" ) ) -}}
{{- errorf "Both chart ID and resource source defined" -}}
{{- end -}}
<figure{{ with .Get "class" }} class="{{ . }}"{{ end }}>
{{- if .Get "link" -}}
{{- if $link }}
<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 eq $src.ResourceType "image" -}}
<picture class="figure__picture">
<img class="figure__image"
{{ with $src.Resize (printf "%dx%d webp" $src.Width $src.Height) }}
src="{{ .RelPermalink }}"
{{ end }}
{{- if or ($src.Params.alt) (.Get "caption") }}
alt="{{ with $src.Params.alt }}{{ . }}{{ else }}{{ .Get "caption" | markdownify| plainify }}{{ end }}"
{{- end -}}
{{- with $src.Params.title }} title="{{ . }}"{{ end -}}
width="{{ $src.Width }}"
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>
{{ $src := $.Page.Resources.GetMatch (.Get "src") }}
{{ $linkedResource := $.Page.Resources.GetMatch (.Get "link") }}
<figure class="article__figure{{ with .Get "class" }} {{ . }}{{ end }}">
{{- with .Get "chart-id" -}}
<canvas class="figure__chart" id="{{ . }}">
You must enable Javascript to view this chart.
</canvas>
{{- else -}}
{{- if .Get "link" -}}
{{- if $linkedResource }}
<a href="{{ $linkedResource.RelPermalink }}"{{ with .Get "rel" }} rel="{{ . }}"{{ end }}>
{{ else }}
<a
href="{{ .Get "link" }}"
{{- with .Get "target" -}}
target="{{ . }}"
{{- else -}}
{{ warnf "No target defined for non-page resource link %q" ( .Get "link" ) -}}
{{- end -}}
{{- with .Get "rel" -}}
rel="{{ . }}"
{{- else -}}
{{- warnf "No rel defined for non-page resource link %q" ( .Get "link" ) -}}
{{- end -}}
>
{{ end }}
{{- end -}}
{{- else if or ( ne $src.ResourceType "image" ) ( ne $src.ResourceType "video" ) -}}
{{- errorf "No handling for resource of type %q" $src.ResourceType -}}
{{- if eq $src.ResourceType "image" -}}
<picture class="figure__picture">
<img class="figure__image"
{{ with $src.Resize "1500x webp" }}
src="{{ .RelPermalink }}"
{{ end }}
{{- if or ($src.Params.alt) (.Get "caption") }}
alt="{{ with $src.Params.alt }}{{ . }}{{ else }}{{ .Get "caption" | markdownify | plainify }}{{ end }}"
{{- end -}}
{{- with $src.Params.title }} title="{{ . }}"{{ end -}}
width="{{ $src.Width }}"
height="{{ $src.Height }}"
/>
</picture>
{{- else if eq $src.ResourceType "video" -}}
{{- if eq $src.MediaType "video/ogg" -}}
<audio class="figure__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 -}}
{{- end -}}
{{- if .Get "link" }}</a>{{ end -}}
{{- if or (.Get "caption") ($src.Params.attr) -}}
<figcaption class="figure__caption{{ if not (.Get "caption") }} figure__caption--no-height{{ end }}">
{{- if $src.Params.attrlink -}}
<a class="figcaption__attrlink" href="{{ $src.Params.attrlink }}"
{{- with $src.Params.attrtarget }} target="{{ . }}"{{ end -}}
{{- with $src.Params.attrrel }} rel="{{ . }}"{{ end -}}
>
{{- if or ( .Get "caption" ) ( .Get "title" ) ( $src.Params.attr ) -}}
<figcaption class="figure__caption{{ if not ( or ( .Get "caption" ) ( .Get "title" ) ) }} figure__caption--no-height{{ end }}">
{{- with $src -}}
{{ if .Params.attrlink -}}
<a class="figcaption__attrlink" href="{{ .Params.attrlink }}"
{{- with .Params.attrtarget }} target="{{ . }}"{{ end -}}
{{- with .Params.attrrel }} rel="{{ . }}"{{ end -}}
>
{{- end -}}
{{- if .Params.attr -}}<p class="figcaption__attr">{{ .Params.attr | safeHTML }}{{ with .Params.attrlicence }} <span class="figcaption__licence">{{ . | safeHTML }}</span>{{ end }}</p>{{- end -}}
{{- if .Params.attrlink -}}
</a>
{{- end -}}
{{- with .Params.title -}}<h4 class="figcaption__title">{{ . }}</h4>{{- end -}}
{{- end -}}
{{- with $src.Params.attr -}}<p class="figcaption__attr">{{ . | safeHTML }}{{ with $src.Params.attrlicence }} <span class="figcaption__licence">{{ . | safeHTML }}</span>{{ end }}</p>{{- end -}}
{{- if $src.Params.attrlink -}}
</a>
{{- with .Get "title" -}}<h4 class="figcaption__title">{{ . }}</h4>{{- end -}}
{{- with .Get "caption" -}}
<p class="figcaption__caption">{{ . | markdownify }}
{{- with $src -}}
{{- if ( and ( eq .ResourceType "image" ) (or (gt .Width 2000) (gt .Height 2000) ) ) -}}
<span class="figcaption__full-size-link"><a href="{{ .RelPermalink }}">View full size</a></span>
{{- end -}}
{{- end -}}
</p>
{{- end -}}
{{- with $src.Params.title -}}<h4 class="figcaption__title">{{ . }}</h4>{{- end -}}
{{- with .Get "caption" -}}<p class="figcaption__caption">{{ . | markdownify }}</p>{{- end -}}
</figcaption>
{{- end -}}
</figure>