summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Smith <luke@lukesmith.xyz>2022-12-05 13:31:54 -0500
committerLuke Smith <luke@lukesmith.xyz>2022-12-05 13:31:54 -0500
commit551de0c6f18d145848586b8cc1b55f2788edff23 (patch)
tree3c3c850ba1cf8d08452d7472f427e50bbfafa582
parent7469e71baeed2d2ede0b3f2dc1a4a79d33946ec3 (diff)
template fix
-rw-r--r--layouts/_default/baseof.html26
-rw-r--r--layouts/partials/footer.html22
2 files changed, 20 insertions, 28 deletions
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index a299bc0..6a1b6ff 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -19,18 +19,32 @@
<main>
<header><h1>{{ with .Params.icon }}<img src="/pix/{{ . }}" class=titleicon>{{ end }}{{ .Title }}</h1></header>
<article>{{ with .Params.img }}<img src="/pix/{{ . }}" class=titleimg>{{ end }}
-{{ block "main" . }}
+{{ block "main" . -}}
{{ .Content }}
-{{ end }}
-{{ if .Param "nextprev" }}{{ partial "nextprev.html" . -}}{{ end -}}
-{{ if .Param "taglist" }}{{ partial "taglist.html" . }}{{ end -}}
+{{- end -}}
</article>
+{{- if in .Params.tags "basic" -}}
+{{ with .NextInSection }}
+<a class=next href="{{ .RelPermalink }}">Next: {{ .Title }}</a>
+{{- end }}
+{{- with .PrevInSection }}
+<span class=prev>Or Previous: <a href="{{ .RelPermalink }}">{{ .Title }}</a></span>
+{{- end -}}
+{{- end }}
+{{ if in .Params.tags "mail" -}}
+{{ with .NextInSection -}}
+<a class=next href="{{ .RelPermalink }}">Next: {{ .Title }}</a>
+{{- end -}}
+{{- with .PrevInSection }}
+<span class=prev>Or Previous: <a href="{{ .RelPermalink }}">{{ .Title }}</a></span>
+{{- end -}}
+{{- end }}
</main>
-{{ block "footer" . }}
+{{ block "footer" . -}}
<footer>
<a href="{{ .Site.BaseURL }}">{{ .Site.BaseURL }}</a>
{{- if .Param "showrss" }}<br><br><a href="/index.xml"><img src="/rss.svg" style="max-height:1.5em" alt="RSS Feed" title="Subscribe via RSS for updates."></a>{{ end }}
</footer>
-{{ end }}
+{{- end }}
</body>
</html>
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
deleted file mode 100644
index ecfb175..0000000
--- a/layouts/partials/footer.html
+++ /dev/null
@@ -1,22 +0,0 @@
- {{ if in .Params.tags "basic" }}
- {{ with .NextInSection }}
- <a class=next href="{{ .RelPermalink }}">Next: {{ .Title }}</a>
- {{ end }}
- {{ with .PrevInSection }}
- <span class=prev>Or Previous: <a href="{{ .RelPermalink }}">{{ .Title }}</a></span>
- {{ end }}
- {{ end }}
-
- {{ if in .Params.tags "mail" }}
- {{ with .NextInSection }}
- <a class=next href="{{ .RelPermalink }}">Next: {{ .Title }}</a>
- {{ end }}
- {{ with .PrevInSection }}
- <span class=prev>Or Previous: <a href="{{ .RelPermalink }}">{{ .Title }}</a></span>
- {{ end }}
- {{ end }}
-
- </main>
- <footer><a href="{{ .Site.BaseURL }}">{{ .Site.BaseURL }}</a></footer>
-</body>
-</html>