From cf1caf267660e7561f3de440fb700ae8dfac056a Mon Sep 17 00:00:00 2001
From: David Kebler <d@kebler.net>
Date: Sat, 22 Apr 2017 20:56:30 -0700
Subject: [PATCH] make disqus use https, force https when sites like github
 don't do it automatically.  Add favorite icon load from /images

---
 layouts/partials/head/fonts.html |  3 ++-
 layouts/partials/head/meta.html  | 10 ++++++++++
 layouts/shortcodes/disqus.html   |  6 +++---
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/layouts/partials/head/fonts.html b/layouts/partials/head/fonts.html
index e4258b6..9499fbd 100644
--- a/layouts/partials/head/fonts.html
+++ b/layouts/partials/head/fonts.html
@@ -1,6 +1,7 @@
 <!-- icon fonts -->
 <link href="https://cdn.jsdelivr.net/fontawesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" type="text/css">
-
+ <!-- favorite icon -->
+<link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon" />
 <!-- base font -->
 <link href="//fonts.googleapis.com/css?family=Roboto" rel="stylesheet" type="text/css">
  <!-- monospaced for code -->
diff --git a/layouts/partials/head/meta.html b/layouts/partials/head/meta.html
index 3eec4eb..da0c7a7 100644
--- a/layouts/partials/head/meta.html
+++ b/layouts/partials/head/meta.html
@@ -5,3 +5,13 @@
     <meta name="author" content="">
     <meta http-equiv="Cache-Control" content="max-age= {{ .Params.cache_timeout | default "3600"}}" />
     <base href="{{ .Site.BaseURL }}">
+
+     <!-- force https if turned on.  Do this early in the head  -->
+    {{ if isset .Site.Params "force_https" }}
+    <script>
+    if (!(window.location.host.startsWith("127.0.0.1") || window.location.host.startsWith("localhost")) && (window.location.protocol != "https:")) {
+      window.location.protocol = "https";
+      document.location = "https:" + window.location.href.substring(window.location.protocol.length, window.location.href.length);
+    }
+    </script>
+    {{ end }}
diff --git a/layouts/shortcodes/disqus.html b/layouts/shortcodes/disqus.html
index 830761d..a66871a 100644
--- a/layouts/shortcodes/disqus.html
+++ b/layouts/shortcodes/disqus.html
@@ -13,14 +13,14 @@
 
     var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
     var disqus_shortname = '{{ .Get 0 | default .Site.DisqusShortname }}';
-    dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
+    dsq.src = 'https://' + disqus_shortname + '.disqus.com/embed.js';
     (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
 })();
 </script>
 
-<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
+<noscript>Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
 
-<a href="http://disqus.com/" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
+<a href="https://disqus.com/" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
 
 
 <!-- from disqus