Cleanup HTML and templating

dfsnow · Oct 31, 2024 · eb33b0d · eb33b0d
1 parent ddd356c
commit eb33b0d
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 44 deletions.
diff --git a/site/layouts/_default/baseof.html b/site/layouts/_default/baseof.html
@@ -3,8 +3,8 @@
 
 <head>
     {{- partial "head.html" . -}}
-    {{- block "styles" . -}}{{- end }}
-    {{- block "scripts" . -}}{{- end }}
+    {{- block "styles" . -}}{{- end -}}
+    {{- block "scripts" . -}}{{- end -}}
 </head>
 
 <body>

diff --git a/site/layouts/_default/single.html b/site/layouts/_default/single.html
@@ -1,5 +1,5 @@
-{{ define "main" }}
+{{- define "main" -}}
 <article>
     {{- partial "header-link.html" .Content -}}
 </article>
-{{ end }}
+{{- end -}}
diff --git a/site/layouts/_default/sitemap.xml b/site/layouts/_default/sitemap.xml
@@ -1,24 +1,24 @@
-{{ printf "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\"?>" | safeHTML }}
+{{- printf "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\"?>" | safeHTML -}}
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"
     xmlns:xhtml="http://www.w3.org/1999/xhtml">
-    {{ range .Data.Pages }}
+    {{- range .Data.Pages -}}
         {{- if or (and (.Permalink) (gt (len .Content) 0)) (.Params.src) -}}
         <url>
-            <loc>{{ .Permalink }}</loc>{{ if not .Lastmod.IsZero }}
-            <lastmod>{{ safeHTML ( .Lastmod.Format "2006-01-02T15:04:05-07:00" ) }}</lastmod>{{ end }}{{ with .Sitemap.ChangeFreq }}
-            <changefreq>{{ . }}</changefreq>{{ end }}{{ if ge .Sitemap.Priority 0.0 }}
-            <priority>{{ .Sitemap.Priority }}</priority>{{ end }}{{ if .IsTranslated }}{{ range .Translations }}
+            <loc>{{- .Permalink -}}</loc>{{- if not .Lastmod.IsZero -}}
+            <lastmod>{{- safeHTML ( .Lastmod.Format "2006-01-02T15:04:05-07:00" ) -}}</lastmod>{{- end -}}{{- with .Sitemap.ChangeFreq -}}
+            <changefreq>{{- . -}}</changefreq>{{- end -}}{{- if ge .Sitemap.Priority 0.0 -}}
+            <priority>{{- .Sitemap.Priority -}}</priority>{{- end -}}{{- if .IsTranslated -}}{{- range .Translations -}}
             <xhtml:link
                 rel="alternate"
-                hreflang="{{ .Language.LanguageCode }}"
-                href="{{ .Permalink }}"
-                />{{ end }}
+                hreflang="{{- .Language.LanguageCode -}}"
+                href="{{- .Permalink -}}"
+                />{{- end -}}
             <xhtml:link
                 rel="alternate"
-                hreflang="{{ .Language.LanguageCode }}"
-                href="{{ .Permalink }}"
-                />{{ end }}
+                hreflang="{{- .Language.LanguageCode -}}"
+                href="{{- .Permalink -}}"
+                />{{- end -}}
         </url>
         {{- end -}}
-    {{ end }}
-</urlset>
+    {{- end -}}
+</urlset>
diff --git a/site/layouts/index.html b/site/layouts/index.html
@@ -1,17 +1,17 @@
-{{ define "styles" }}
-{{ $maplibrecss := resources.Get "vendor/maplibre-gl-4.7.0.min.css" | fingerprint }}
-<link href="{{ $maplibrecss.RelPermalink }}" rel="stylesheet"/>
-{{ end }}
+{{- define "styles" -}}
+{{- $maplibrecss := resources.Get "vendor/maplibre-gl-4.7.0.min.css" | fingerprint -}}
+<link href="{{- $maplibrecss.RelPermalink -}}" rel="stylesheet" />
+{{- end -}}
 
-{{ define "scripts" }}
-{{ $maplibrejs := resources.Get "vendor/maplibre-gl-4.7.0.min.js" | fingerprint }}
-{{ $pmtilesjs := resources.Get "vendor/pmtiles-3.2.0.min.js" | fingerprint }}
-{{ $map := resources.Get "js/map.js" | minify | fingerprint }}
-<script defer src="{{ $maplibrejs.RelPermalink }}"></script>
-<script defer src="{{ $pmtilesjs.RelPermalink }}"></script>
-<script type="module" src="{{ $map.RelPermalink }}"></script>
-{{ end }}
+{{- define "scripts" -}}
+{{- $maplibrejs := resources.Get "vendor/maplibre-gl-4.7.0.min.js" | fingerprint -}}
+{{- $pmtilesjs := resources.Get "vendor/pmtiles-3.2.0.min.js" | fingerprint -}}
+{{- $map := resources.Get "js/map.js" | minify | fingerprint -}}
+<script defer src="{{- $maplibrejs.RelPermalink -}}"></script>
+<script defer src="{{- $pmtilesjs.RelPermalink -}}"></script>
+<script type="module" src="{{- $map.RelPermalink -}}"></script>
+{{- end -}}
 
-{{ define "main" }}
+{{- define "main" -}}
 <div id="map"></div>
-{{ end }}
+{{- end -}}
diff --git a/site/layouts/partials/head.html b/site/layouts/partials/head.html
@@ -1,19 +1,19 @@
 <meta charset="utf-8">
 
-{{ if ne .Site.Title .Title -}}
-<title>{{ .Site.Title }} | {{ .Title }}</title>
-{{ else -}}
-<title>{{ .Site.Title }}</title>
-{{ end -}}
+{{- if ne .Site.Title .Title -}}
+<title>{{- .Site.Title -}} | {{- .Title -}}</title>
+{{- else -}}
+<title>{{- .Site.Title -}}</title>
+{{- end -}}
 
-<meta name="description" content="{{ .Site.Params.description }}">
-<meta name="author" content="{{ .Site.Params.author }}">
+<meta name="description" content="{{- .Site.Params.description -}}">
+<meta name="author" content="{{- .Site.Params.author -}}">
 <meta name="viewport" content="width=device-width,initial-scale=1.0">
 
 <link rel="shortcut icon" href="/favicon.ico">
 <link rel="icon" href="/favicon.svg" type="image/svg+xml">
 <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
 <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#000000">
 
-{{ $main := resources.Get "css/main.scss" | toCSS | minify | fingerprint }}
-<link rel="stylesheet" href="{{ $main.RelPermalink }}" integrity="{{ $main.Data.Integrity }}">
+{{- $main := resources.Get "css/main.scss" | toCSS | minify | fingerprint -}}
+<link rel="stylesheet" href="{{- $main.RelPermalink -}}" integrity="{{- $main.Data.Integrity -}}">
diff --git a/site/layouts/partials/header-link.html b/site/layouts/partials/header-link.html
@@ -1,5 +1,5 @@
-{{ . | replaceRE
+{{- . | replaceRE
     "(<h[2-9] id=\"([^\"]+)\".+)(</h[2-9]+>)"
     "<a class=\"header-link hover-icon\" role=\"none\" href=\"#${2}\">${1}<svg version=\"1.2\" xmlns=\"http://www.w3.org/2000/svg\" role=\"img\" aria-label=\"Header link\" aria-hidden=\"true\" class=\"header-link-icon\" viewBox=\"0 0 32 32\" width=\"0.7em\" height=\"0.7em\" fill=\"currentcolor\"><title>Link to ${2} section</title><path d=\"M14 21h-5a4.8 4.8 90 010-10h5v-3h-5a1 1 0 000 16h5ZM18 11h5a4.8 4.8 270 010 10h-5v3h5a1 1 180 000-16h-5ZM8 14.5h16v3h-16Z\" /></svg>${3}</a>"
     | safeHTML
-}}
+-}}
diff --git a/site/layouts/partials/header.html b/site/layouts/partials/header.html
@@ -1,7 +1,7 @@
 <header class="navbar">
     <nav class="navbar-content">
         <h1 class="navbar-title">
-            <a href="/" class="link-nowrap-nodec" title="Link to home">{{ .Site.Title }}</a>
+            <a href="/" class="link-nowrap-nodec" title="Link to home">{{- .Site.Title -}}</a>
         </h1>
         <ul class="navbar-internal-links">
             <li>