From 347c9b6a9c487b1851314a45db81442f338cb380 Mon Sep 17 00:00:00 2001
From: Morgan McMillian <gilag@monkeystew.com>
Date: Sat, 7 Sep 2019 11:01:24 -0700
Subject: [PATCH] theme update

---
 themes/blackburn/archetypes/default.md        |  2 +-
 themes/blackburn/layouts/partials/head.html   |  7 +-
 themes/blackburn/layouts/partials/social.html | 79 ++++++++-----------
 3 files changed, 39 insertions(+), 49 deletions(-)

diff --git a/themes/blackburn/archetypes/default.md b/themes/blackburn/archetypes/default.md
index d41ff85..35f1a6b 100644
--- a/themes/blackburn/archetypes/default.md
+++ b/themes/blackburn/archetypes/default.md
@@ -1,5 +1,5 @@
 +++
-title = "{{ replace .TranslationBaseName "-" " " | title }}"
+title = "{{ replace .Name "-" " " | title }}"
 date = "{{ .Date }}"
 draft = true
 tags = []
diff --git a/themes/blackburn/layouts/partials/head.html b/themes/blackburn/layouts/partials/head.html
index f31a14b..9e1e4ce 100644
--- a/themes/blackburn/layouts/partials/head.html
+++ b/themes/blackburn/layouts/partials/head.html
@@ -2,7 +2,7 @@
   <meta http-equiv="content-type" content="text/html; charset=utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta name="description" content="{{ if .IsNode }}{{ with .Site.Params.description }}{{ . }}{{ end }}{{ else }}{{ with .Description }}{{ . }}{{ end }}{{ end }}">
-  {{.Hugo.Generator}}
+  {{hugo.Generator}}
 
   <title>{{ if .IsHome }}{{ .Title }}{{ else }}{{ .Title }} &middot; {{ .Site.Title }}{{ end }}</title>
 
@@ -36,8 +36,9 @@
   <script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
 
  <!-- RSS -->
-  {{ if .RSSLink }}
-  <link rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" href="{{ .RSSLink }}" />
+  {{ if .OutputFormats.Get "RSS" }}
+  <link rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}"
+    href='{{ with .OutputFormats.Get "RSS" }}{{ .RelPermalink }}{{ end }}' />
   {{ end }}
 
   {{ with .Site.Params.highlightjs }}
diff --git a/themes/blackburn/layouts/partials/social.html b/themes/blackburn/layouts/partials/social.html
index 504ee69..2d6234a 100644
--- a/themes/blackburn/layouts/partials/social.html
+++ b/themes/blackburn/layouts/partials/social.html
@@ -1,65 +1,54 @@
 <div class="pure-menu social">
   <ul class="pure-menu-list">
 
-    {{ if .RSSLink }}
+    {{ if .OutputFormats.Get "RSS" }}
     <li class="pure-menu-item">
-      <a class="pure-menu-link" href="{{ .RSSLink }}"><i class="fa fa-rss fa-fw"></i>RSS</a>
+      <a class="pure-menu-link" href='{{ with .OutputFormats.Get "RSS" }}{{ .RelPermalink }}{{ end }}'><i
+          class="fa fa-rss fa-fw"></i>RSS</a>
     </li>
     {{ end }}
 
     <!-- SNS microblogging -->
 
-    {{ with .Site.Social.diaspora }}
-    <li class="pure-menu-item">
-      <a class="pure-menu-link" rel="me" href="{{ . }}" target="_blank"><i class="fa fa-square fa-fw"></i>diaspora*</a>
-    </li>
-    {{ end }}
-
-    {{ with .Site.Social.mastodon }}
-    <li class="pure-menu-item">
-      <a class="pure-menu-link" rel="me" href="{{ . }}" target="_blank"><i class="fa fa-square fa-fw"></i>mastodon</a>
-    </li>
-    {{ end }}
-
     {{ with .Site.Social.twitter }}
     <li class="pure-menu-item">
-      <a class="pure-menu-link" href="https://twitter.com/{{ . }}" target="_blank"><i class="fa fa-twitter-square fa-fw"></i>Twitter</a>
+      <a class="pure-menu-link" href="https://twitter.com/{{ . }}" rel="me" target="_blank"><i class="fa fa-twitter-square fa-fw"></i>Twitter</a>
     </li>
     {{ end }}
 
     {{ with .Site.Social.gnusocial }}
     <li class="pure-menu-item">
-      <a class="pure-menu-link" href="{{ . }}" target="_blank"><i class="fa fa-comment fa-fw"></i>social</a>
+      <a class="pure-menu-link" href="{{ . }}" rel="me" target="_blank"><i class="fa fa-comment fa-fw"></i>Social</a>
     </li>
     {{ end }}
 
     {{ with .Site.Social.pnut }}
     <li class="pure-menu-item">
-      <a class="pure-menu-link" rel="me" href="https://pnut.io/@{{ . }}" target="_blank"><i class="fa fa-square fa-fw"></i>pnut.io</a>
+      <a class="pure-menu-link" href="https://pnut.io/@{{ . }}" rel="me" target="_blank"><i class="fa fa-square fa-fw"></i>pnut.io</a>
     </li>
     {{ end }}
 
     {{ with .Site.Social.facebook }}
     <li class="pure-menu-item">
-      <a class="pure-menu-link" href="https://facebook.com/{{ . }}" target="_blank"><i class="fa fa-facebook-square fa-fw"></i>Facebook</a>
+      <a class="pure-menu-link" href="https://facebook.com/{{ . }}" rel="me" target="_blank"><i class="fa fa-facebook-square fa-fw"></i>Facebook</a>
     </li>
     {{ end }}
 
     {{ with .Site.Social.googleplus }}
     <li class="pure-menu-item">
-      <a class="pure-menu-link" href="https://plus.google.com/+{{ . }}" target="_blank"><i class="fa fa-google-plus-square fa-fw"></i>Google+</a>
+      <a class="pure-menu-link" href="https://plus.google.com/+{{ . }}" rel="me" target="_blank"><i class="fa fa-google-plus-square fa-fw"></i>Google+</a>
     </li>
     {{ end }}
 
     {{ with .Site.Social.weibo }}
     <li class="pure-menu-item">
-      <a class="pure-menu-link" href="http://weibo.com/{{ . }}" target="_blank"><i class="fa fa-weibo fa-fw"></i>Weibo</a>
+      <a class="pure-menu-link" href="http://weibo.com/{{ . }}" rel="me" target="_blank"><i class="fa fa-weibo fa-fw"></i>Weibo</a>
     </li>
     {{ end }}
 
     {{ with .Site.Social.tumblr }}
     <li class="pure-menu-item">
-      <a class="pure-menu-link" href="https://{{ . }}.tumblr.com/" target="_blank"><i class="fa fa-tumblr-square fa-fw"></i>Tumblr</a>
+      <a class="pure-menu-link" href="https://{{ . }}.tumblr.com/" rel="me" target="_blank"><i class="fa fa-tumblr-square fa-fw"></i>Tumblr</a>
     </li>
     {{ end }}
 
@@ -67,49 +56,49 @@
 
     {{ with .Site.Social.instagram }}
     <li class="pure-menu-item">
-      <a class="pure-menu-link" href="https://instagram.com/{{ . }}" target="_blank"><i class="fa fa-instagram fa-fw"></i>Instagram</a>
+      <a class="pure-menu-link" href="https://instagram.com/{{ . }}" rel="me" target="_blank"><i class="fa fa-instagram fa-fw"></i>Instagram</a>
     </li>
     {{ end }}
 
     {{ with .Site.Social.flickr }}
     <li class="pure-menu-item">
-      <a class="pure-menu-link" href="https://flickr.com/photos/{{ . }}" target="_blank"><i class="fa fa-flickr fa-fw"></i>Flickr</a>
+      <a class="pure-menu-link" href="https://flickr.com/photos/{{ . }}" rel="me" target="_blank"><i class="fa fa-flickr fa-fw"></i>Flickr</a>
     </li>
     {{ end }}
 
     {{ with .Site.Social.photo500px }}
     <li class="pure-menu-item">
-      <a class="pure-menu-link" href="https://500px.com/{{ . }}" target="_blank"><i class="fa fa-500px fa-fw"></i>500px</a>
+      <a class="pure-menu-link" href="https://500px.com/{{ . }}" rel="me" target="_blank"><i class="fa fa-500px fa-fw"></i>500px</a>
     </li>
     {{ end }}
 
     {{ with .Site.Social.pinterest }}
     <li class="pure-menu-item">
-      <a class="pure-menu-link" href="https://pinterest.com/{{ . }}" target="_blank"><i class="fa fa-pinterest-square fa-fw"></i>Pinterest</a>
+      <a class="pure-menu-link" href="https://pinterest.com/{{ . }}" rel="me" target="_blank"><i class="fa fa-pinterest-square fa-fw"></i>Pinterest</a>
     </li>
     {{ end }}
 
     {{ with .Site.Social.youtube }}
     <li class="pure-menu-item">
-      <a class="pure-menu-link" href="https://youtube.com/user/{{ . }}" target="_blank"><i class="fa fa-youtube-square fa-fw"></i>YouTube</a>
+      <a class="pure-menu-link" href="https://youtube.com/user/{{ . }}" rel="me" target="_blank"><i class="fa fa-youtube-square fa-fw"></i>YouTube</a>
     </li>
     {{ end }}
 
     {{ with .Site.Social.vimeo }}
     <li class="pure-menu-item">
-      <a class="pure-menu-link" href="https://vimeo.com/{{ . }}" target="_blank"><i class="fa fa-vimeo-square fa-fw"></i>Vimeo</a>
+      <a class="pure-menu-link" href="https://vimeo.com/{{ . }}" rel="me" target="_blank"><i class="fa fa-vimeo-square fa-fw"></i>Vimeo</a>
     </li>
     {{ end }}
 
     {{ with .Site.Social.vine }}
     <li class="pure-menu-item">
-      <a class="pure-menu-link" href="https://vine.co/{{ . }}" target="_blank"><i class="fa fa-vine fa-fw"></i>Vine</a>
+      <a class="pure-menu-link" href="https://vine.co/{{ . }}" rel="me" target="_blank"><i class="fa fa-vine fa-fw"></i>Vine</a>
     </li>
     {{ end }}
 
     {{ with .Site.Social.slideshare }}
     <li class="pure-menu-item">
-      <a class="pure-menu-link" href="http://slideshare.net/{{ . }}" target="_blank"><i class="fa fa-slideshare fa-fw"></i>SlideShare</a>
+      <a class="pure-menu-link" href="http://slideshare.net/{{ . }}" rel="me" target="_blank"><i class="fa fa-slideshare fa-fw"></i>SlideShare</a>
     </li>
     {{ end }}
 
@@ -117,13 +106,13 @@
 
     {{ with .Site.Social.linkedin }}
     <li class="pure-menu-item">
-      <a class="pure-menu-link" href="https://linkedin.com/in/{{ . }}" target="_blank"><i class="fa fa-linkedin-square fa-fw"></i>LinkedIn</a>
+      <a class="pure-menu-link" href="https://linkedin.com/in/{{ . }}" rel="me" target="_blank"><i class="fa fa-linkedin-square fa-fw"></i>LinkedIn</a>
     </li>
     {{ end }}
 
     {{ with .Site.Social.xing }}
     <li class="pure-menu-item">
-      <a class="pure-menu-link" href="https://xing.com/profile/{{ . }}" target="_blank"><i class="fa fa-xing-square fa-fw"></i>Xing</a>
+      <a class="pure-menu-link" href="https://xing.com/profile/{{ . }}" rel="me" target="_blank"><i class="fa fa-xing-square fa-fw"></i>Xing</a>
     </li>
     {{ end }}
 
@@ -131,45 +120,45 @@
 
     {{ with .Site.Social.reddit }}
     <li class="pure-menu-item">
-      <a class="pure-menu-link" href="https://reddit.com/user/{{ . }}" target="_blank"><i class="fa fa-reddit-square fa-fw"></i>Reddit</a>
+      <a class="pure-menu-link" href="https://reddit.com/user/{{ . }}" rel="me" target="_blank"><i class="fa fa-reddit-square fa-fw"></i>Reddit</a>
     </li>
     {{ end }}
 
     {{ with .Site.Social.hackernews }}
     <li class="pure-menu-item">
-      <a class="pure-menu-link" href="https://news.ycombinator.com/user?id={{ . }}" target="_blank"><i class="fa fa-hacker-news fa-fw"></i>Hacker News</a>
+      <a class="pure-menu-link" href="https://news.ycombinator.com/user?id={{ . }}" rel="me" target="_blank"><i class="fa fa-hacker-news fa-fw"></i>Hacker News</a>
     </li>
     {{ end }}
 
     <!-- Techie -->
 
-    {{ with .Site.Social.gitlab }}
+    {{ with .Site.Social.github }}
     <li class="pure-menu-item">
-      <a class="pure-menu-link" href="{{ . }}" target="_blank"><i class="fa fa-gitlab fa-fw"></i>GitLab</a>
+      <a class="pure-menu-link" href="https://github.com/{{ . }}" rel="me" target="_blank"><i class="fa fa-github-square fa-fw"></i>GitHub</a>
     </li>
     {{ end }}
 
-    {{ with .Site.Social.github }}
+    {{ with .Site.Social.gitlab }}
     <li class="pure-menu-item">
-      <a class="pure-menu-link" href="https://github.com/{{ . }}" target="_blank"><i class="fa fa-github-square fa-fw"></i>GitHub</a>
+      <a class="pure-menu-link" href="{{ . }}" rel="me" target="_blank"><i class="fa fa-gitlab fa-fw"></i>GitLab</a>
     </li>
     {{ end }}
 
     {{ with .Site.Social.bitbucket }}
     <li class="pure-menu-item">
-      <a class="pure-menu-link" href="https://bitbucket.org/{{ . }}" target="_blank"><i class="fa fa-bitbucket-square fa-fw"></i>Bitbucket</a>
+      <a class="pure-menu-link" href="https://bitbucket.org/{{ . }}" rel="me" target="_blank"><i class="fa fa-bitbucket-square fa-fw"></i>Bitbucket</a>
     </li>
     {{ end }}
 
     {{ with .Site.Social.stackoverflow }}
     <li class="pure-menu-item">
-      <a class="pure-menu-link" href="https://stackoverflow.com/users/{{ . }}" target="_blank"><i class="fa fa-stack-overflow fa-fw"></i>Stack Overflow</a>
+      <a class="pure-menu-link" href="https://stackoverflow.com/users/{{ . }}" rel="me" target="_blank"><i class="fa fa-stack-overflow fa-fw"></i>Stack Overflow</a>
     </li>
     {{ end }}
 
     {{ with .Site.Social.serverfault }}
     <li class="pure-menu-item">
-      <a class="pure-menu-link" href="https://serverfault.com/users/{{ . }}" target="_blank"><i class="fa fa-server fa-fw"></i>Server Fault</a>
+      <a class="pure-menu-link" href="https://serverfault.com/users/{{ . }}" rel="me" target="_blank"><i class="fa fa-server fa-fw"></i>Server Fault</a>
     </li>
     {{ end }}
 
@@ -177,13 +166,13 @@
 
     {{ with .Site.Social.steam }}
     <li class="pure-menu-item">
-      <a class="pure-menu-link" href="https://steamcommunity.com/id/{{ . }}" target="_blank"><i class="fa fa-steam-square fa-fw"></i>Steam</a>
+      <a class="pure-menu-link" href="https://steamcommunity.com/id/{{ . }}" rel="me" target="_blank"><i class="fa fa-steam-square fa-fw"></i>Steam</a>
     </li>
     {{ end }}
 
     {{ with .Site.Social.mobygames }}
     <li class="pure-menu-item">
-      <a class="pure-menu-link" href="https://www.mobygames.com/developer/sheet/view/developerId,{{ . }}" target="_blank"><i class="fa fa-gamepad fa-fw"></i>MobyGames</a>
+      <a class="pure-menu-link" href="https://www.mobygames.com/developer/sheet/view/developerId,{{ . }}" rel="me" target="_blank"><i class="fa fa-gamepad fa-fw"></i>MobyGames</a>
     </li>
     {{ end }}
 
@@ -191,13 +180,13 @@
 
     {{ with .Site.Social.lastfm }}
     <li class="pure-menu-item">
-      <a class="pure-menu-link" href="http://last.fm/user/{{ . }}" target="_blank"><i class="fa fa-lastfm-square fa-fw"></i>Last.fm</a>
+      <a class="pure-menu-link" href="http://last.fm/user/{{ . }}" rel="me" target="_blank"><i class="fa fa-lastfm-square fa-fw"></i>Last.fm</a>
     </li>
     {{ end }}
 
     {{ with .Site.Social.discogs }}
     <li class="pure-menu-item">
-      <a class="pure-menu-link" href="https://www.discogs.com/user/{{ . }}" target="_blank"><i class="fa fa-music fa-fw"></i>Discogs</a>
+      <a class="pure-menu-link" href="https://www.discogs.com/user/{{ . }}" rel="me" target="_blank"><i class="fa fa-music fa-fw"></i>Discogs</a>
     </li>
     {{ end }}
 
@@ -205,7 +194,7 @@
 
     {{ with .Site.Social.keybase }}
     <li class="pure-menu-item">
-      <a class="pure-menu-link" href="https://keybase.io/{{ . }}" target="_blank"><i class="fa fa-key fa-fw"></i>Keybase</a>
+      <a class="pure-menu-link" href="https://keybase.io/{{ . }}" rel="me" target="_blank"><i class="fa fa-key fa-fw"></i>Keybase</a>
     </li>
     {{ end }}