Fix #3 (head and header partials)1.0.6

The naming of head and header were mixed up and did not match the actual content. This is a fix for issue #3 from @nardoyala.
author: dataCobra <datacobra@mailbox.org> 2020-03-22 17:37:37 +0300
committer: dataCobra <datacobra@mailbox.org> 2020-03-22 17:37:37 +0300
commit: 5302b6e47a613865ed6652db4f0eb40f8d8083c2 (patch)
tree: 2ef37b103704aaed4d29919eab41b10bb08eace5
parent: 2a28bf9ab4bb0108d3abb2913200e408ff92bac8 (diff)
8 files changed, 86 insertions, 86 deletions
diff --git a/layouts/404.html b/layouts/404.html
index ee61439..0694436 100644
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html>
-{{ partial "header.html" . }}
+{{ partial "head.html" . }}
 <body>
 	<div class="container wrapper">
-		{{ partial "head.html" . }}
+		{{ partial "header.html" . }}
 		<div class="404-error">
 			<h2 class="page-title">HTTP-404 Error</h2>
 			<p>
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index d1f2cef..c088969 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <html>
-{{ partial "header.html" . }}
+{{ partial "head.html" . }}
 
 <body>
 	<div class="container wrapper list">
-		{{ partial "head.html" . }}
+		{{ partial "header.html" . }}
 
 		{{ if isset .Data "Term" }}
 			<h2>{{ .Data.Term }}</h2>
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index f37fc70..418dbc4 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html>
-{{ partial "header.html" . }}
+{{ partial "head.html" . }}
 <body>
 	<div class="container wrapper">
-		{{ partial "head.html" . }}
+		{{ partial "header.html" . }}
 
 		<div class="post">
 			<div class="author">
diff --git a/layouts/_default/term.html b/layouts/_default/term.html
index d17e013..aaa57ea 100644
--- a/layouts/_default/term.html
+++ b/layouts/_default/term.html
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <html>
-{{ partial "header.html" . }}
+{{ partial "head.html" . }}
 
 <body>
 	<div class="container wrapper">
-		{{ partial "head.html" . }}
+		{{ partial "header.html" . }}
 
 		<h1 class="page-title">All tags</h1>
 	</div>
diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html
index 74a49d4..b492c4b 100644
--- a/layouts/_default/terms.html
+++ b/layouts/_default/terms.html
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <html>
-{{ partial "header.html" . }}
+{{ partial "head.html" . }}
 
 <body>
 	<div class="container wrapper">
-		{{ partial "head.html" . }}
+		{{ partial "header.html" . }}
 
 		<h2 class="page-title">{{ .Name }}</h2>
 
diff --git a/layouts/index.html b/layouts/index.html
index 40b2958..01bb500 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html>
-{{ partial "header.html" . }}
+{{ partial "head.html" . }}
 <body>
 	<div class="container wrapper">
-		{{ partial "head.html" . }}
+		{{ partial "header.html" . }}
 
 		<div class="recent-posts section">
 			<div class="posts">
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index ce8cb28..108a9fb 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -1,42 +1,34 @@
-<div class="header">
-	{{ if .Site.Params.Avatar }}
-		<div class="avatar">
-			<a href="{{ .Site.BaseURL }}">
-				<img src="{{ .Site.Params.Avatar }}" alt="{{ .Site.Title }}" />
-			</a>
-		</div>
-	{{ end }}
-	{{if .IsHome}}
-		<h1 class="site-title">
-	{{ else }}
-		<h2 class="site-title">
-	{{ end }}
-		<a href="{{ .Site.BaseURL }}">{{ .Site.Title }}</a>
-	{{if .IsHome}}
-		</h1>
-	{{ else }}
-	</h2>
+<head>
+	<meta charset="utf-8" />
+	<meta http-equiv="X-UA-Compatible" content="IE=edge">
+
+	{{- $title := ( .Title ) -}}
+	{{- $siteTitle := ( .Site.Title ) -}}
+
+	{{- if .IsHome -}}
+		<title>{{ $siteTitle }} {{ if isset .Site.Params "subtitle" }}- {{ .Site.Params.Subtitle }}{{ end }} </title>
+	{{- else -}}
+		<title>{{ $title }} - {{ $siteTitle }}</title>
+	{{- end -}}
+
+	{{- if isset .Site.Params "favicon" -}}
+		<link rel="icon" type="image/png" href={{ .Site.Params.favicon }} />
+	{{- end -}}
+
+	<meta name="viewport" content="width=device-width, initial-scale=1">
+
+	{{ with .OutputFormats.Get "rss" -}}
+		{{ printf `<link rel="%s" type="%s" href="%s" title="%s" />` .Rel .MediaType.Type .Permalink $.Site.Title | safeHTML }}
+	{{ end -}}
+
+	{{- template "_internal/opengraph.html" . -}}
+	{{- template "_internal/twitter_cards.html" . -}}
+
+	<link rel="stylesheet" type="text/css" media="screen" href="{{ .Site.BaseURL }}css/normalize.css" />
+	<link rel="stylesheet" type="text/css" media="screen" href="{{ .Site.BaseURL }}css/main.css" />
+	<link rel="stylesheet" type="text/css" media="screen" href="{{ .Site.BaseURL }}css/all.css" />
+
+	{{- if isset .Site.Params "customcss" }}
+		<link rel="stylesheet" type="text/css" href="{{ .Site.BaseURL }}{{ .Site.Params.customCSS }}" />
 	{{ end }}
-	<div class="site-description">
-		{{- if isset .Site.Params "subtitle" -}}
-		<p>{{ .Site.Params.Subtitle | markdownify }}</p>
-		{{- end -}}
-		<nav class="nav social">
-			<ul class="flat">
-				{{- range $index, $key := .Site.Params.Social -}}
-					<li class="li-social"><a href="{{ $key.url }}"><i title="{{ $key.name }}" class="icons {{ $key.icon }}"></i></a></li>
-				{{- end -}}
-			</ul>
-		</nav>
-	</div>
-
-	<nav class="nav">
-		<ul class="flat">
-			{{ range .Site.Menus.main }}
-			<li>
-				<a href="{{ .URL }}">{{ .Name }}</a>
-			</li>
-			{{ end }}
-		</ul>
-	</nav>
-</div>
+</head>
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 108a9fb..ce8cb28 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -1,34 +1,42 @@
-<head>
-	<meta charset="utf-8" />
-	<meta http-equiv="X-UA-Compatible" content="IE=edge">
-
-	{{- $title := ( .Title ) -}}
-	{{- $siteTitle := ( .Site.Title ) -}}
-
-	{{- if .IsHome -}}
-		<title>{{ $siteTitle }} {{ if isset .Site.Params "subtitle" }}- {{ .Site.Params.Subtitle }}{{ end }} </title>
-	{{- else -}}
-		<title>{{ $title }} - {{ $siteTitle }}</title>
-	{{- end -}}
-
-	{{- if isset .Site.Params "favicon" -}}
-		<link rel="icon" type="image/png" href={{ .Site.Params.favicon }} />
-	{{- end -}}
-
-	<meta name="viewport" content="width=device-width, initial-scale=1">
-
-	{{ with .OutputFormats.Get "rss" -}}
-		{{ printf `<link rel="%s" type="%s" href="%s" title="%s" />` .Rel .MediaType.Type .Permalink $.Site.Title | safeHTML }}
-	{{ end -}}
-
-	{{- template "_internal/opengraph.html" . -}}
-	{{- template "_internal/twitter_cards.html" . -}}
-
-	<link rel="stylesheet" type="text/css" media="screen" href="{{ .Site.BaseURL }}css/normalize.css" />
-	<link rel="stylesheet" type="text/css" media="screen" href="{{ .Site.BaseURL }}css/main.css" />
-	<link rel="stylesheet" type="text/css" media="screen" href="{{ .Site.BaseURL }}css/all.css" />
-
-	{{- if isset .Site.Params "customcss" }}
-		<link rel="stylesheet" type="text/css" href="{{ .Site.BaseURL }}{{ .Site.Params.customCSS }}" />
+<div class="header">
+	{{ if .Site.Params.Avatar }}
+		<div class="avatar">
+			<a href="{{ .Site.BaseURL }}">
+				<img src="{{ .Site.Params.Avatar }}" alt="{{ .Site.Title }}" />
+			</a>
+		</div>
+	{{ end }}
+	{{if .IsHome}}
+		<h1 class="site-title">
+	{{ else }}
+		<h2 class="site-title">
+	{{ end }}
+		<a href="{{ .Site.BaseURL }}">{{ .Site.Title }}</a>
+	{{if .IsHome}}
+		</h1>
+	{{ else }}
+	</h2>
 	{{ end }}
-</head>
+	<div class="site-description">
+		{{- if isset .Site.Params "subtitle" -}}
+		<p>{{ .Site.Params.Subtitle | markdownify }}</p>
+		{{- end -}}
+		<nav class="nav social">
+			<ul class="flat">
+				{{- range $index, $key := .Site.Params.Social -}}
+					<li class="li-social"><a href="{{ $key.url }}"><i title="{{ $key.name }}" class="icons {{ $key.icon }}"></i></a></li>
+				{{- end -}}
+			</ul>
+		</nav>
+	</div>
+
+	<nav class="nav">
+		<ul class="flat">
+			{{ range .Site.Menus.main }}
+			<li>
+				<a href="{{ .URL }}">{{ .Name }}</a>
+			</li>
+			{{ end }}
+		</ul>
+	</nav>
+</div>
author	dataCobra <datacobra@mailbox.org>	2020-03-22 17:37:37 +0300
committer	dataCobra <datacobra@mailbox.org>	2020-03-22 17:37:37 +0300
commit	5302b6e47a613865ed6652db4f0eb40f8d8083c2 (patch)
tree	2ef37b103704aaed4d29919eab41b10bb08eace5
parent	2a28bf9ab4bb0108d3abb2913200e408ff92bac8 (diff)