From 81fa0a45dc01d438cba8f9aeb4db049e4f21a291 Mon Sep 17 00:00:00 2001
From: Ryan Watters <watters.ryan@gmail.com>
Date: Wed, 12 Apr 2017 13:08:56 -0500
Subject: [PATCH] Adjust all metadata partials to use absURL and relURL

---
 .../layouts/partials/head/metadata-favicons.html | 16 ++++++++--------
 .../partials/head/metadata-opengraph.html        |  3 ++-
 .../layouts/partials/head/metadata-prefetch.html |  2 +-
 .../partials/head/metadata-refreshredirect.html  |  1 +
 .../partials/head/metadata-schemaorg.html        |  3 ++-
 .../layouts/partials/head/metadata-twitter.html  |  7 +++++--
 .../layouts/partials/head/site-style.html        | 12 +++++-------
 7 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/themes/hugo-docs-concept/layouts/partials/head/metadata-favicons.html b/themes/hugo-docs-concept/layouts/partials/head/metadata-favicons.html
index 8e7047f87..214197d07 100644
--- a/themes/hugo-docs-concept/layouts/partials/head/metadata-favicons.html
+++ b/themes/hugo-docs-concept/layouts/partials/head/metadata-favicons.html
@@ -1,11 +1,11 @@
 <!-- Favicons - go to http://realfavicongenerator.net/ for easy generation after you've designed your logo.-->
-<link rel="apple-touch-icon" sizes="180x180" href="/images/favicons/apple-touch-icon.png">
-<link rel="icon" type="image/png" href="/images/favicons/favicon-32x32.png" sizes="32x32">
-<link rel="icon" type="image/png" href="/images/favicons/favicon-16x16.png" sizes="16x16">
-<link rel="manifest" href="/images/favicons/manifest.json">
-<link rel="mask-icon" href="/images/favicons/safari-pinned-tab.svg" color="#5bbad5">
-<link rel="shortcut icon" href="/images/favicons/favicon.ico">
+<link rel="apple-touch-icon" sizes="180x180" href="{{ "images/favicons/apple-touch-icon.png" | absURL }}">
+<link rel="icon" type="image/png" href="{{ "images/favicons/favicon-32x32.png" | absURL }}" sizes="32x32">
+<link rel="icon" type="image/png" href="{{ "images/favicons/favicon-16x16.png" | absURL }}" sizes="16x16">
+<link rel="manifest" href="{{ "images/favicons/manifest.json" | absURL }}">
+<link rel="mask-icon" href="{{ "images/favicons/safari-pinned-tab.svg" | absURL}}" color="#5bbad5">
+<link rel="shortcut icon" href="{{ "images/favicons/favicon.ico" | absURL }}">
 <meta name="msapplication-TileColor" content="#2d89ef">
-<meta name="msapplication-TileImage" content="/images/favicons/mstile-144x144.png">
-<meta name="msapplication-config" content="/images/favicons/browserconfig.xml">
+<meta name="msapplication-TileImage" content="{{ "images/favicons/mstile-144x144.png" | absURL}}">
+<meta name="msapplication-config" content="{{ "images/favicons/browserconfig.xml" | absURL }}">
 <meta name="theme-color" content="#ffffff">
\ No newline at end of file
diff --git a/themes/hugo-docs-concept/layouts/partials/head/metadata-opengraph.html b/themes/hugo-docs-concept/layouts/partials/head/metadata-opengraph.html
index 24fc97f75..e0fc38861 100644
--- a/themes/hugo-docs-concept/layouts/partials/head/metadata-opengraph.html
+++ b/themes/hugo-docs-concept/layouts/partials/head/metadata-opengraph.html
@@ -9,7 +9,8 @@
 {{- end -}}
 <meta property="og:locale" content="en_US">
 <meta property="og:title" content="{{ .Title }}">
-<meta property="og:image" content="/images/{{ .Site.Params.defaultsocialimage }}">
+{{$socialimg := add "images/" .Site.Params.defaultsocialimage }}
+<meta property="og:image" content="{{ $socialimg | absURL }}">
 <meta property="og:image:type" content="image/jpeg" />
 <meta property="og:image:width" content="1500" />
 <meta property="og:image:height" content="800" />
diff --git a/themes/hugo-docs-concept/layouts/partials/head/metadata-prefetch.html b/themes/hugo-docs-concept/layouts/partials/head/metadata-prefetch.html
index 7daca8ef1..df9c48893 100644
--- a/themes/hugo-docs-concept/layouts/partials/head/metadata-prefetch.html
+++ b/themes/hugo-docs-concept/layouts/partials/head/metadata-prefetch.html
@@ -1,7 +1,7 @@
 <link rel="dns-prefetch" href="{{ .Site.BaseURL }}">
 <!-- Preconnect API. For browser compatibility, check http://caniuse.com/#feat=link-rel-preconnect -->
 <link rel="preconnect" href="{{ .Site.Params.siteaddress }}">
-<link rel="canonical" href="{{ .Site.Params.siteaddress }}{{.URL}}">
+<link rel="canonical" href="{{ .Permalink }}">
 {{with .NextInSection }}
 <link rel="prefetch" href="{{.Permalink}}">
 <link rel="prerender" href="{{.Permalink}}">
diff --git a/themes/hugo-docs-concept/layouts/partials/head/metadata-refreshredirect.html b/themes/hugo-docs-concept/layouts/partials/head/metadata-refreshredirect.html
index 951a1c960..c3b05b3c4 100644
--- a/themes/hugo-docs-concept/layouts/partials/head/metadata-refreshredirect.html
+++ b/themes/hugo-docs-concept/layouts/partials/head/metadata-refreshredirect.html
@@ -1,3 +1,4 @@
+<!-- looks for a sitelink field and front matter - creates redirects - useful for things like showcase additions -->
 {{if and (eq .Kind "page") ( .Params.sitelink )}}
 <link rel="canonical" href="{{.Permalink}}"/>
 <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
diff --git a/themes/hugo-docs-concept/layouts/partials/head/metadata-schemaorg.html b/themes/hugo-docs-concept/layouts/partials/head/metadata-schemaorg.html
index 68560549d..fe1bb34f7 100644
--- a/themes/hugo-docs-concept/layouts/partials/head/metadata-schemaorg.html
+++ b/themes/hugo-docs-concept/layouts/partials/head/metadata-schemaorg.html
@@ -1,3 +1,4 @@
+{{$socialimg := add "images/" .Site.Params.defaultsocialimage }}
 <script type="application/ld+json">
 {
     "@context": "http://schema.org",
@@ -15,7 +16,7 @@
     "wordCount": {{.WordCount}},
     "image": {
         "@type": "ImageObject",
-        "url": "{{.Site.Params.siteaddress}}/images/{{.Site.Params.defaultsocialimage }}",
+        "url": "{{ $socialimg | absURL }}",
         "height": 800,
         "width": 1500
     }
diff --git a/themes/hugo-docs-concept/layouts/partials/head/metadata-twitter.html b/themes/hugo-docs-concept/layouts/partials/head/metadata-twitter.html
index 2ae5acebe..371c5fdbe 100644
--- a/themes/hugo-docs-concept/layouts/partials/head/metadata-twitter.html
+++ b/themes/hugo-docs-concept/layouts/partials/head/metadata-twitter.html
@@ -1,6 +1,9 @@
 <!-- Twitter Cards summary card with large image https://dev.twitter.com/cards/types/summary-large-image-->
 <meta property="twitter:card" content="summary_large_image">
-<meta property="twitter:site" content="@{{.Site.Params.TwitterHandle}}">
+{{ with .Site.Params.TwitterHandle }}
+<meta property="twitter:site" content="@{{.}}">
+{{ end }}
 <meta property="twitter:title" content="{{if not .IsHome }}{{.Title }} |{{end}} {{.Site.Title }}">
-<meta property="twitter:image" content="/images/{{ .Site.Params.defaultsocialimage }}">
+{{$socialimg := add "images/" .Site.Params.defaultsocialimage }}
+<meta property="twitter:image" content="{{ $socialimg | absURL }}">
 <meta property="twitter:description" content="{{ .Description }}">
\ No newline at end of file
diff --git a/themes/hugo-docs-concept/layouts/partials/head/site-style.html b/themes/hugo-docs-concept/layouts/partials/head/site-style.html
index 0c4ef7070..a991431e7 100644
--- a/themes/hugo-docs-concept/layouts/partials/head/site-style.html
+++ b/themes/hugo-docs-concept/layouts/partials/head/site-style.html
@@ -1,7 +1,5 @@
-<!-- <script src="https://use.typekit.net/bmc1jgv.js"></script>
-<script>try{Typekit.load({ async: false });}catch(e){}</script> -->
-{{if .Site.Params.usefontawesome}}
-<link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous">
-{{end}}
-{{- if .Site.Params.usecrp -}}<style>{{- print (partial "style-embed.html" .) | safeCSS -}}</style>
-{{- else -}}<link rel="stylesheet" href="{{ "css/style.min.css" | relURL}}">{{- end -}}
+{{- if .Site.Params.usecrp -}}
+	<style>{{- print (partial "style-embed.html" .) | safeCSS -}}</style>
+{{- else -}}
+	<link rel="stylesheet" href="{{ "css/style.min.css" | relURL}}">
+{{- end -}}