-
- {{ end }}
-
-
-
- {{ with .Resources.GetMatch "images/*.png" }}
- {{ $image := .Resize "150x" }}
- 
- {{ end }}
-
+
+
+ {{/* Partner header card */}}
+
+ {{ with .Resources.GetMatch "images/*.png" }}
+
{{ end }}
diff --git a/layouts/section/get-involved.html b/layouts/section/get-involved.html
index ca205b3fc..9eeaa8f88 100644
--- a/layouts/section/get-involved.html
+++ b/layouts/section/get-involved.html
@@ -1,13 +1,70 @@
{{ define "main" }}
-{{ $blocks := .Page.GetPage "./get-involved-blocks" }}
-
+ 
+
+ {{ end }}
-
-
- {{ .Content }}
+ {{/* Partner description */}}
+ {{ .Params.name }}
- {{ .Params.country }} - {{ with .Params.website }} -
- website
-
- {{ end }}
+
+
+ {{ .Params.name }}
+ {{ if .Params.country }} ++ + {{ .Params.country }} +
+ {{ end }} + {{ with .Params.website }} + + {{ end }}
+ {{ .Content }}
+
+ {{/* Collaboration reports */}}
{{ with .Params.reports }}
- Collaboration
- {{ end }} --
- {{ range .Params.reports }}
-
- {{ .text }} - {{ end }} +
- + {{ partial "ext-link-item.html" (dict "url" .link "name" .text) }} + + {{ end }}
+
+ {{ end }}
- ← back to partners
+ {{/* Back link */}}
+
Collaboration
+-
+ {{ range . }}
+
-
- {{ range sort $blocks.Resources "File.Path" }}
-
+
+
+
+ {{ end }}
{{ end }}
diff --git a/layouts/section/partners.html b/layouts/section/partners.html
index 940831be4..33c89c446 100644
--- a/layouts/section/partners.html
+++ b/layouts/section/partners.html
@@ -1,35 +1,41 @@
{{ define "main" }}
+{{ .Title }}
+ {{ with .Params.intro }} +{{ . }}
+ {{ end }} + + + + {{ range .Params.sections }} ++ {{ .title }} +
+ {{ with .intro }} ++ {{ . | safeHTML }} +
+ {{ end }} + + {{ with .links }} +-
+ {{ range . }}
+ {{ $u := urls.Parse .url }}
+ {{ $isExternal := and $u.Host (not (eq $u.Host "ooni.org")) }}
+
-
+
+ {{ .name }}
+ {{ if $isExternal }}
+
+ {{ end }}
+
+ {{ with .description }}
+
+ {{ . | safeHTML }} +
+ {{ end }} +
+ {{ end }}
+
+ {{ . | safeHTML }} +
+ {{ end }} +
+
{{ .Title }}
-
-
{{ .Title }}
-+ {{/* Intro text + stats */}} +
{{ .Content }}
-
-
- {{ len .Pages }} active partnerships -
-
+
+
+
+ {{/* Partner grid */}}
+ + {{ len .Pages }} active partnerships +
+
{{ range .Pages }}
- {{ $name := .Params.Name }}
- {{ $country := .Params.Country }}
- {{ $href := .Permalink }}
- {{ with .Resources.GetMatch "images/*.png" }}
- {{ $image := .Fit "140x150" }}
-
-
-{{ end }}
\ No newline at end of file
+{{ end }}
diff --git a/layouts/support/faq.html b/layouts/support/faq.html
new file mode 100644
index 000000000..5aa551bfa
--- /dev/null
+++ b/layouts/support/faq.html
@@ -0,0 +1,75 @@
+{{ define "main" }}
+
+
+
+ {{ $name := .Params.name }}
+ {{ $country := .Params.country }}
+ {{ $href := .RelPermalink }}
+
-
-
-
- {{ $name }}
- -{{ $country }}
+ + {{ $name }} +
+ {{ if $country }} +{{ $country }}
+ {{ end }}
-
+ {{ with .Resources.GetMatch "images/*.png" }}
+
- {{ end }}
+ {{ end }}
+
+
{{ end }}
+
-
+
+{{ end }}
+
+{{ define "script" }}
+
+{{ end }}
diff --git a/layouts/support/resources.html b/layouts/support/resources.html
new file mode 100644
index 000000000..80aec7f82
--- /dev/null
+++ b/layouts/support/resources.html
@@ -0,0 +1,33 @@
+{{ define "main" }}
+{{ .Title }}
+ +
+ {{ .Content }}
+
+
+ {{ $linkIcon := `` }}
+
+ {{ range $sIdx, $section := .Params.sections }}
+
+ {{ if $section.heading }}
+
+ {{ end }}
+{{ $section.heading }}
+ {{ end }} + + {{ range $iIdx, $item := $section.items }} + {{ $id := $item.q | anchorize }} +
+
+ {{ end }}
+ + + {{ $item.q }} + {{ $linkIcon | safeHTML }} + + +
+
+ {{ $item.a | markdownify }}
+
+
+
+
+ {{ end }}
+
+
+{{ end }}
{{ .Title }}
+ {{ with .Params.description }} +{{ . }}
+ {{ end }} + + {{ range .Params.sections }} ++ {{ .title }} +
+ +
+ {{ range .groups }}
+
+
+
+ {{ end }}
+ {{ .title }}
+-
+ {{ range .links }}
+ {{ partial "ext-link-item.html" (dict "url" .url "name" .text) }}
+ {{ end }}
+
+ Also available as PDF for download and printing. +
+