From a55f766b3af018f92841b34a1103a4652b472706 Mon Sep 17 00:00:00 2001
From: George Cushen <gcushen@users.noreply.github.com>
Date: Mon, 9 May 2016 23:13:11 +0100
Subject: [PATCH] Fix asset and navbar URLs

---
 exampleSite/config.toml                | 12 ++++++------
 layouts/partials/footer.html           |  6 +++---
 layouts/partials/footer_container.html |  2 +-
 layouts/partials/header.html           | 11 ++++++-----
 layouts/partials/navbar.html           |  2 +-
 5 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/exampleSite/config.toml b/exampleSite/config.toml
index 8b8234fa..0b70040c 100644
--- a/exampleSite/config.toml
+++ b/exampleSite/config.toml
@@ -79,30 +79,30 @@ googleAnalytics = ""
 
 [[menu.main]]
     name = "Home"
-    url = "/#bio"
+    url = "#"
     weight = 1
 
 [[menu.main]]
     name = "Publications"
-    url = "/#publications"
+    url = "#publications"
     weight = 2
 
 [[menu.main]]
     name = "Posts"
-    url = "/#posts"
+    url = "#posts"
     weight = 3
 
 [[menu.main]]
     name = "Projects"
-    url = "/#projects"
+    url = "#projects"
     weight = 4
 
 [[menu.main]]
     name = "Teaching"
-    url = "/#teaching"
+    url = "#teaching"
     weight = 5
 
 [[menu.main]]
     name = "Contact"
-    url = "/#contact"
+    url = "#contact"
     weight = 6
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 5bdb568f..f5db58b3 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -1,8 +1,8 @@
-        <script src="/js/jquery-1.12.3.min.js"></script>
         <script src="//cdnjs.cloudflare.com/ajax/libs/gsap/1.18.4/TweenMax.min.js"></script>
         <script src="//cdnjs.cloudflare.com/ajax/libs/gsap/latest/plugins/ScrollToPlugin.min.js"></script>
-        <script src="/js/bootstrap.min.js"></script>
-        <script src="/js/hugo-academic.js"></script>
+        <script src="{{ .Site.BaseURL }}js/jquery-1.12.3.min.js"></script>
+        <script src="{{ .Site.BaseURL }}js/bootstrap.min.js"></script>
+        <script src="{{ .Site.BaseURL }}js/hugo-academic.js"></script>
 
         {{ with .Site.GoogleAnalytics }}
         <script>
diff --git a/layouts/partials/footer_container.html b/layouts/partials/footer_container.html
index a10ffd1b..ffca074f 100644
--- a/layouts/partials/footer_container.html
+++ b/layouts/partials/footer_container.html
@@ -6,7 +6,7 @@
 
             Powered by the <a href="https://github.com/gcushen/hugo-academic" target="_blank">Academic theme</a> for <a href="http://gohugo.io" target="_blank">Hugo</a>.
 
-            <span class="pull-right"><a href="#top" id="back_to_top"><span class="button_icon"><i class="fa fa-chevron-up fa-2x" aria-hidden="true"></i></span></a></span>
+            <span class="pull-right"><a href="#" id="back_to_top"><span class="button_icon"><i class="fa fa-chevron-up fa-2x" aria-hidden="true"></i></span></a></span>
 
         </p>
     </div>
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 3b0dbd34..0f04effc 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -10,12 +10,13 @@
     {{ with .Site.Params.name }}<meta name="author" content="{{ . }}" />{{ end }}
     {{ with .Site.Params.role }}<meta name="description" content="{{ . }}" />{{ end }}
 
-    <link rel="stylesheet" href="/css/bootstrap.min.css" />
     <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.3.0/styles/github.min.css">
-    <link rel="stylesheet" href="/css/font-awesome.min.css" />
-    <link rel="stylesheet" href="/css/academicons.min.css" />
-    <link rel="stylesheet" href="/css/hugo-academic.css" />
-    <link rel="shortcut icon" href="/img/favicon.ico" type="image/x-icon">
+    <link rel="stylesheet" href="{{ .Site.BaseURL }}css/bootstrap.min.css" />
+    <link rel="stylesheet" href="{{ .Site.BaseURL }}css/font-awesome.min.css" />
+    <link rel="stylesheet" href="{{ .Site.BaseURL }}css/academicons.min.css" />
+    <link rel="stylesheet" href="{{ .Site.BaseURL }}css/hugo-academic.css" />
+    <link rel="shortcut icon" href="{{ .Site.BaseURL }}img/favicon.ico" type="image/x-icon">
+    <link rel="canonical" href="{{ .Permalink }}">
 
     <title>{{ if not .IsHome }}{{ .Title }} | {{ end }}{{ .Site.Title }}</title>
 
diff --git a/layouts/partials/navbar.html b/layouts/partials/navbar.html
index a7981a63..f76b5fbf 100644
--- a/layouts/partials/navbar.html
+++ b/layouts/partials/navbar.html
@@ -19,7 +19,7 @@
             <!-- Left Nav Bar -->
             <ul class="nav navbar-nav navbar-right">
                 {{ range .Site.Menus.main }}
-                <li class="nav-item"><a href="{{ .URL }}">{{ .Name }}</a></li>
+                <li class="nav-item"><a href="{{ $baseUrl }}{{ .URL }}">{{ .Name }}</a></li>
                 {{ end }}
             </ul>