fix: absURLize all urls and minor html fixes

9 files changed, 48 insertions, 59 deletions

diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 1dd6986..b8b9ddc 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -10,28 +10,28 @@
 		{{ partial "head.html" . }}
 		{{ partial "menu.html" . }}
 		<div id="content">
-		{{ partial "nav.html" . }}
-        <div id="main">
-            {{- block "main" . }}{{- end }}
-            {{ partial "footer.html" . }}
-        </div>
-        {{- block "footerfiles" . }}{{- end }}
+			{{ partial "nav.html" . }}
+			<div id="main">
+				{{- block "main" . }}{{- end }}
+				{{ partial "footer.html" . }}
+			</div>
+			{{- block "footerfiles" . }}{{- end }}
 
-        {{ if and .Site.Params.fathomAnalytics .Site.Params.fathomAnalytics.siteID }}
-        {{- partial "fathom" . -}}
-		{{ end }}
-
-		{{ template "_internal/google_analytics_async.html" . }}
+			{{ if and .Site.Params.fathomAnalytics .Site.Params.fathomAnalytics.siteID }}
+			{{- partial "fathom" . -}}
+			{{ end }}
 
+			{{ template "_internal/google_analytics_async.html" . }}
+		</div>
 		{{- with .Site.Params.Social -}}
 		<script>feather.replace({
 			width: "1em",
 			height: "1em",
 		})
 		</script>
-		{{- end -}}
+		{{- end }}
 		
-		<script src="/js/main.js"></script>
+		<script src="{{"/js/main.js" | absURL }}"></script>
 	</body>
 
 </html>
diff --git a/layouts/partials/commento.html b/layouts/partials/commento.html
index a690f3e..2285be9 100644
--- a/layouts/partials/commento.html
+++ b/layouts/partials/commento.html
@@ -1,3 +1,2 @@
 <div id="commento"></div>
-<script src="{{ . }}"></script>
-
+<script src="{{ . }}"></script>
\ No newline at end of file
diff --git a/layouts/partials/display_meta.html b/layouts/partials/display_meta.html
index 17d67f9..c4b40a2 100644
--- a/layouts/partials/display_meta.html
+++ b/layouts/partials/display_meta.html
@@ -6,13 +6,13 @@
 	{{ with .Params.categories }}
 	categories: 
 	{{ range . }}
-	<a href="{{ "/categories/" | relLangURL }}{{ . | urlize }}">{{ . }}</a>
+	<a href="{{ "/categories/" | absURL }}{{ . | urlize }}">{{ . }}</a>
 	{{ end }}
 	{{ end }}
 	{{ with .Params.tags }}
 	tags: 
 	{{ range . }}
-	<a href="{{ "/tags/" | relLangURL }}{{ . | urlize }}">{{ . }}</a>
+	<a href="{{ "/tags/" | absURL }}{{ . | urlize }}">{{ . }}</a>
 	{{ end }}
 	{{ end }}
 </div>
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 8497dfe..3785abd 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -2,7 +2,7 @@
     {{ if .Site.Params.Avatar }}
         <div class="avatar">
 			<a href="{{ .Site.BaseURL }}">
-				<img src="{{ .Site.Params.Avatar }}" alt="{{ .Site.Title }}" />
+				<img src="{{ .Site.Params.Avatar | absURL }}" alt="{{ .Site.Title }}" />
 			</a>
         </div>
     {{ end }}
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 56198d3..cdba2fc 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -23,13 +23,13 @@
 <meta name="viewport" content="width=device-width, initial-scale=1">
 
 <link rel="stylesheet" href="{{ "/css/normalize.min.css" | absURL }}" />
-<link rel="stylesheet" type="text/css" href="/css/style.css" />
+<link rel="stylesheet" type="text/css" href="{{ "/css/style.css" | absURL }}" />
 <link href="https://fonts.googleapis.com/css?family=Inter|Source+Serif+Pro" rel="stylesheet" type="text/css" />
 
 {{ if and (isset .Site.Params "social") (isset .Site.Params "feathericonscdn") (eq .Site.Params.featherIconsCDN true) -}}
 <script src="https://cdn.jsdelivr.net/npm/feather-icons/dist/feather.min.js"></script>
 {{- else if (isset .Site.Params "social") -}}
-<script src="/js/feather.min.js"></script>
+<script src="{{ "/js/feather.min.js" | absURL }}"></script>
 {{ end }}
 
 {{ partial "favicon.html" . }}
\ No newline at end of file
diff --git a/layouts/partials/list_preview.html b/layouts/partials/list_preview.html
index 6df0779..2abb8e3 100644
--- a/layouts/partials/list_preview.html
+++ b/layouts/partials/list_preview.html
@@ -1,5 +1,5 @@
 <h2> 
-	<a href="{{ .RelPermalink }}">{{.Title}}{{ if .Draft }}<sup class="draft-label">DRAFT</sup>{{ end }}</a>
+	<a href="{{ .RelPermalink | absURL }}">{{.Title}}{{ if .Draft }}<sup class="draft-label">DRAFT</sup>{{ end }}</a>
 </h2>
 
 {{ if in (slice "single" "") .Layout }}
diff --git a/layouts/partials/menu.html b/layouts/partials/menu.html
index d80d71d..911d269 100644
--- a/layouts/partials/menu.html
+++ b/layouts/partials/menu.html
@@ -2,23 +2,23 @@
 	{{ $currentPage := . }}
 	{{ range .Site.Menus.main }}
 	{{if eq $currentPage.Params.url .URL }}<b>{{end}}
-	<a href="{{ .URL }}">{{ .Name }}</a>
+	<a href="{{ .URL | absURL }}">{{ .Name }}</a>
 	{{if eq $currentPage.Params.url .URL }}</b>{{end}}
 	{{ end }}
 	<span class="right">
 		{{ range .Site.Menus.main_right }}
 		{{if eq $currentPage.Params.url .URL }}<b>{{end}}
-			<a href="{{ .URL }}">{{ .Name }}</a>
+			<a href="{{ .URL | absURL }}">{{ .Name }}</a>
 		{{if eq $currentPage.Params.url .URL }}</b>{{end}}
 	{{ end }}
 	{{- range $index, $key := .Site.Params.Social -}}
-	<a href="{{ $key.url }}" title="{{ $key.name }}">
+	<a href="{{ $key.url | absURL }}" title="{{ $key.name }}">
 		<i data-feather="{{ $key.icon }}"></i>
 	</a>
 	{{- end -}}
 	{{if eq $currentPage.Params.url "/search/" }}<b>{{end}}
-	{{if and (not (isset .Site.Params "disableSearch")) (not (eq .Site.Params.disableSearch false)) }}
-		<a href="/search">search<svg aria-hidden="true" class="i-search" viewBox="0 0 32 32" width="10" height="10" fill="none" stroke="currentcolor" stroke-linecap="round" stroke-linejoin="round" stroke-width="3"><circle cx="14" cy="14" r="12"></circle><path d="M23 23l7 7"></path></svg></a>	
+	{{if and (not (isset .Site.Params "disableSearch")) (not (eq .Site.Params.disableSearch true)) }}
+		<a href="{{ "/search" | absURL }}">search<svg aria-hidden="true" class="i-search" viewBox="0 0 32 32" width="10" height="10" fill="none" stroke="currentcolor" stroke-linecap="round" stroke-linejoin="round" stroke-width="3"><circle cx="14" cy="14" r="12"></circle><path d="M23 23l7 7"></path></svg></a>	
 	{{end}}
 	{{if eq $currentPage.Params.url "/search/" }}</b>{{end}}
 	</span>
diff --git a/layouts/partials/nav.html b/layouts/partials/nav.html
index d227c0b..b1e5866 100644
--- a/layouts/partials/nav.html
+++ b/layouts/partials/nav.html
@@ -1,39 +1,29 @@
 <div id="nav">
+  {{- $currentPage := . -}}
+  
+  {{ range .Site.Menus.nav }}
+  {{ $menuentry := . }}
+  {{ $menuPage := $.Site.GetPage $menuentry.URL }}
   <ul>
-    {{ $currentPage := . }}
-
-    {{ range .Site.Menus.nav }}
-    {{ $menuentry := . }}
-    {{ $menuPage := $.Site.GetPage $menuentry.URL }}
-    {{ if .HasChildren }}
     <li>
       {{ if eq $currentPage $menuPage }}<b>{{ end }}
-        <a href="{{.URL}}">
-          <span>{{ .Name }} /</span>
+        <a href="{{.URL | absURL }}">
+          <span>{{ .Name }} {{ if .Children }}/{{ end }}</span>
         </a>
-        {{ if eq $currentPage $menuPage }}</b>{{ end }}
-      <ul class="sub-menu">
-        {{ range .Children }}
+      {{ if eq $currentPage $menuPage }}</b>{{ end }}
+
+      {{ range .Children }}
         {{ $menuChildPage := $.Site.GetPage .URL }}
 
-        <li>
-          {{ if eq $currentPage $menuChildPage }}<b>{{ end }}
-            <a href="{{ .URL }}">{{ .Name }}</a>
+        <ul>
+          <li>
+            {{ if eq $currentPage $menuChildPage }}<b>{{ end }}
+              <a href="{{ .URL | absURL }}">{{ .Name }}</a>
             {{ if eq $currentPage $menuChildPage }}</b>{{ end }}
-        </li>
-        {{ end }}
-      </ul>
-    </li>
-    </ul>
-    {{ else }}
-    <li>
-      {{ if eq $currentPage $menuPage }}<b>{{ end }}
-      <a href="{{ .URL }}">
-        <span>{{ .Name }}</span>
-      </a>
-      {{ if eq $currentPage $menuPage }}</b>{{ end }}
+          </li>
+        </ul>
+      {{ end }}
     </li>
-    {{ end }}
-    {{ end }}
   </ul>
-</div>
+  {{ end }}
+</div>
\ No newline at end of file
diff --git a/layouts/partials/pagination.html b/layouts/partials/pagination.html
index cad506d..fe9fed5 100644
--- a/layouts/partials/pagination.html
+++ b/layouts/partials/pagination.html
@@ -1,13 +1,13 @@
 <div id="pagination">
 {{ if .Paginator.HasPrev }}
-<a href="{{ .Paginator.Prev.URL }}"><</a>
+<a href="{{ .Paginator.Prev.URL | absURL }}"><</a>
 {{ else }}
-< 
+&lt;
 {{ end }}
 {{ .Paginator.PageNumber }} of {{ .Paginator.TotalPages }}
 {{ if .Paginator.HasNext }}
-	<a href="{{ .Paginator.Next.URL }}">></a>
+	<a href="{{ .Paginator.Next.URL | absURL }}">></a>
 {{ else }}
->
+&gt;
 {{ end }}
 </div>