From fbae824150310495e087c7d76203541f79d5bf6d Mon Sep 17 00:00:00 2001
From: Fredrik Jonsson <frjo@xdeb.org>
Date: Mon, 20 Mar 2017 22:12:24 +0100
Subject: [PATCH] Moving scripts to partial. Adding cache buser to script file.
 Generate cache buster from /public and not /theme since theme path is not
 known.

---
 layouts/_default/baseof.html  | 6 ++----
 layouts/partials/meta.html    | 4 ++--
 layouts/partials/scripts.html | 3 +++
 3 files changed, 7 insertions(+), 6 deletions(-)
 create mode 100644 layouts/partials/scripts.html

diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index c4bb77a..8f3a9fe 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="{{ .Site.Language.Lang }}">
 <head>
+<meta charset="utf-8">
 <title>{{ block "title" . }}{{ .Site.Title }}{{ end }}</title>
-<link rel="stylesheet" href="/css/styles.css?{{ readFile "/themes/zen/static/css/styles.css" | sha1}}">
 {{ partial "meta.html" . }}
 {{ block "meta" . }}{{ end }}
 </head>
@@ -27,8 +27,6 @@
 {{ if .Site.Params.poweredby }}<p>Powered by <a href="https://gohugo.io/">Hugo</a></p>{{ end }}
 </footer>
 </div>
-{{ if .Site.Params.jquery }}<script src="/js/jquery.min.js"></script>{{ end }}
-{{ if and .Site.Params.jquery .Site.Params.slicknav }}<script src="/js/jquery.slicknav.min.js"></script>{{ end }}
-{{ if .Site.Params.jquery }}<script src="/js/script.js"></script>{{ end }}
+{{ partial "scripts.html" . }}
 </body>
 </html>
diff --git a/layouts/partials/meta.html b/layouts/partials/meta.html
index f10c1fe..50f2131 100644
--- a/layouts/partials/meta.html
+++ b/layouts/partials/meta.html
@@ -1,10 +1,10 @@
-<meta charset="utf-8">
-<link rel="shortcut icon" href="{{ .Site.BaseURL }}favicon.ico" type="image/vnd.microsoft.icon">
 <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=2.0, user-scalable=yes">
 <meta name="MobileOptimized" content="width">
 <meta name="HandheldFriendly" content="true">
 {{ .Hugo.Generator }}
+<link rel="stylesheet" href="/css/styles.css?{{ readFile "/public/css/styles.css" | sha1}}">
 <link rel="canonical" href="{{ .Permalink }}">
+<link rel="shortcut icon" href="{{ .Site.BaseURL }}favicon.ico" type="image/vnd.microsoft.icon">
 <link rel="apple-touch-icon" href="{{ .Site.BaseURL }}apple-touch-icon.png">
 {{ with .RSSLink }}<link rel="alternate" type="application/rss+xml" title="RSS" href="{{ . }}">{{ end }}
 {{ with .Site.Params.contact }}<meta name="contact" content="{{ . }}">{{ end }}
diff --git a/layouts/partials/scripts.html b/layouts/partials/scripts.html
new file mode 100644
index 0000000..5d54c97
--- /dev/null
+++ b/layouts/partials/scripts.html
@@ -0,0 +1,3 @@
+{{ if .Site.Params.jquery }}<script src="/js/jquery.min.js"></script>{{ end }}
+{{ if and .Site.Params.jquery .Site.Params.slicknav }}<script src="/js/jquery.slicknav.min.js"></script>{{ end }}
+{{ if .Site.Params.jquery }}<script src="/js/script.js?{{ readFile "/public/js/script.js" | sha1}}"></script>{{ end }}