Update theme to work with newer versions of Hugo, minor changes here and there.

7 files changed, 41 insertions, 15 deletions

diff --git a/layouts/404.html b/layouts/404.html
index b0169d3..09751ad 100644
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -1,4 +1,5 @@
-{{ partial "header.html" . }}{{ $baseurl := .Site.BaseUrl }}<div class="empty">&nbsp;</div>
+{{ partial "header.html" . }}
+<div class="empty">&nbsp;</div>
   <div class="post-title">
     404 Page Not Found
   </div>
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index b967300..8ffbc61 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,9 +1,11 @@
-{{ partial "header.html" . }}{{ $baseurl := .Site.BaseUrl }}{{ range .Paginator.Pages }}{{ if eq .Type "post"}}<div class="empty">&nbsp;</div>
+{{ partial "header.html" . }}
+{{ range .Paginator.Pages }}{{ if eq .Type "post"}}
+<div class="empty">&nbsp;</div>
   <div class="post-title">
     <a class="post-title-link" href="{{ .Permalink }}">{{ .Title }}</a>
   </div>{{ if isset .Params "tags" }}
       <div class="tags">tags:</br>
-        {{ range  .Params.tags }}<a class="tag-link" href="{{ $baseurl }}/tags/{{ . | urlize }}">{{ . }} </a>{{ end }}
+        {{ range  .Params.tags }}<a class="tag-link" href="{{ "/tags/" | relLangURL }}{{ . | urlize }}">{{ . }} </a>{{ end }}
     </div>
     <div class="content-tags"><p>{{.Summary}}</p></div>{{ else }}
     <div class="content-full"><p>{{.Summary}}</p></div>  {{ end }}{{ end }}{{ end }}{{ partial "pagination.html" . }}{{ partial "footer.html" . }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 1478e0f..343433a 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,8 +1,10 @@
-{{ partial "header.html" . }}{{ $baseurl := .Site.BaseUrl }}<div class="empty">&nbsp;</div>
+{{ partial "header.html" . }}
+<div class="empty">&nbsp;</div>
   <div class="post-title">
     <a class="post-title-link" href="{{ .Permalink }}">{{ .Title }}</a>
   </div>{{ if isset .Params "tags" }}
       <div class="tags">tags:</br>
-        {{ range  .Params.tags }}<a class="tag-link" href="{{ $baseurl }}/tags/{{ . | urlize }}">{{ . }} </a>{{ end }}
+        {{ range  .Params.tags }}<a class="tag-link" href="{{ "/tags/" | relLangURL }}{{ . | urlize }}">{{ . }} </a>{{ end }}
     </div>{{ end }}
-    <div class="content-full">{{ .Content }}{{ partial "disqus.html" . }}</div>{{ partial "footer.html" . }}
+    <div class="content-full">{{ .Content }}{{ partial "disqus.html" . }}</div>
+    {{ partial "footer.html" . }}
diff --git a/layouts/index (copy).html b/layouts/index (copy).html
new file mode 100644
index 0000000..b967300
--- /dev/null
+++ b/layouts/index (copy).html
@@ -0,0 +1,9 @@
+{{ partial "header.html" . }}{{ $baseurl := .Site.BaseUrl }}{{ range .Paginator.Pages }}{{ if eq .Type "post"}}<div class="empty">&nbsp;</div>
+  <div class="post-title">
+    <a class="post-title-link" href="{{ .Permalink }}">{{ .Title }}</a>
+  </div>{{ if isset .Params "tags" }}
+      <div class="tags">tags:</br>
+        {{ range  .Params.tags }}<a class="tag-link" href="{{ $baseurl }}/tags/{{ . | urlize }}">{{ . }} </a>{{ end }}
+    </div>
+    <div class="content-tags"><p>{{.Summary}}</p></div>{{ else }}
+    <div class="content-full"><p>{{.Summary}}</p></div>  {{ end }}{{ end }}{{ end }}{{ partial "pagination.html" . }}{{ partial "footer.html" . }}
diff --git a/layouts/index.html b/layouts/index.html
index b967300..1e46f3f 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -1,9 +1,13 @@
-{{ partial "header.html" . }}{{ $baseurl := .Site.BaseUrl }}{{ range .Paginator.Pages }}{{ if eq .Type "post"}}<div class="empty">&nbsp;</div>
+
+{{ partial "header.html" . }}
+{{ range (.Paginate (where .Data.Pages "Type" "post")).Pages }}
+<div class="empty">&nbsp;</div>
   <div class="post-title">
     <a class="post-title-link" href="{{ .Permalink }}">{{ .Title }}</a>
   </div>{{ if isset .Params "tags" }}
       <div class="tags">tags:</br>
-        {{ range  .Params.tags }}<a class="tag-link" href="{{ $baseurl }}/tags/{{ . | urlize }}">{{ . }} </a>{{ end }}
-    </div>
+        {{ range  .Params.tags }}<a class="tag-link" href="{{ "/tags/" | relLangURL }}{{ . | urlize }}">{{ . }} </a>{{ end }}</div>
     <div class="content-tags"><p>{{.Summary}}</p></div>{{ else }}
-    <div class="content-full"><p>{{.Summary}}</p></div>  {{ end }}{{ end }}{{ end }}{{ partial "pagination.html" . }}{{ partial "footer.html" . }}
+    <div class="content-full"><p>{{.Summary}}</p></div>  {{ end }}{{ end }}
+    {{ partial "pagination.html" . }}
+    {{ partial "footer.html" . }}
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index bde6f79..9759cab 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -3,7 +3,7 @@
           <li class="navbar-item"><a class="navbar-link" href="{{.Url}}">{{.Name}}</a></li>{{ end }}
         </ul>
     </div>
-    <div class="copyright"><p>{{ with .Site.Params.copyright | safeHtml }}{{.}}{{ else }}&copy; {{.Now.Format "2006"}}. All rights reserved. {{end}}
+    <div class="copyright"><p>{{ with .Site.Copyright | safeHTML }}{{.}}{{ else }}&copy; {{.Now.Format "2006"}}. {{ .Site.Title }}. All rights reserved. {{end}}
       </p>
     </div>    {{ partial "google_analytics.html" . }}
 </div>
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index cdb2275..a6ebfd3 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -1,16 +1,24 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="{{ .Site.LanguageCode | default "en-us" }}">
 <head>
   <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="theme" content="darksimplicity">
+  {{ .Hugo.Generator }}
+  {{ with .Site.Params.name }}<meta name="author" content="{{ . }}">{{ end }}
+  {{ with .Site.Params.role }}<meta name="description" content="{{ . }}">{{ end }}
+  <base href="{{ .Site.BaseURL }}">
   <title>{{ .Title }}</title>
-  <link rel="stylesheet" type="text/css" href="{{ .Site.BaseUrl }}/css/style.min.css">
+  <link rel="stylesheet" href="{{ "/css/style.min.css" | relURL }}">
 </head>
 <body>
   <div class="wrap">
     <div class="navbar">
         <ul class="navbar-list" style="float:right">
           {{ range .Site.Menus.top }}
-          <li class="navbar-item"><a class="navbar-link" href="{{.Url}}">{{.Name}}</a></li>{{ end }}
+          <li class="navbar-item"><a class="navbar-link" href="{{ .URL }}">{{ .Name }}</a></li>{{ end }}
         </ul>
     </div>
-    <div class="header"><span style="font-size: 34px;"><a href="{{ .Site.BaseUrl }}">{{ .Site.Title }}</a></span>{{ if .Site.Params.description }}<span style="font-size:12px;">&nbsp;&nbsp;|<i>{{ .Site.Params.description }}</i> </span>{{end}}</div>
+    <div class="header"><span style="font-size: 34px;">
+      <a href="{{ .Site.BaseURL  }}">{{ .Site.Title }}</a></span>
+      {{ if .Site.Params.description }}<span style="font-size:12px;">&nbsp;&nbsp;|<i>{{ .Site.Params.description }}</i> </span>{{end}}</div>