From 126a1e53994437a02cbe458aa7dcd6a4f0241c8e Mon Sep 17 00:00:00 2001
From: Angelo Stavrow <angelo@fogcreek.com>
Date: Fri, 21 Sep 2018 08:25:10 -0400
Subject: Closes #14

---
 layouts/_default/single.html | 6 +++++-
 layouts/partials/footer.html | 4 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'layouts')

diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 258e068..9e022e3 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,12 +1,16 @@
 {{ partial "header.html" . }}
 {{ $baseurl := .Site.BaseURL | sanitizeurl }}
+{{ $author := .Site.Params.Author }}
+{{ if .Params.Author }}
+    {{ $author = .Params.Author }}
+{{ end }}
 <article class="h-entry">
     <header>
         <h1 class="post-title p-name">{{ .Title }}</h1>
         <p class="post-date">Posted on
             <time class="dt-published" datetime="{{ .Date.Format "2006-01-02T15:04:05Z07:00" | safeHTML }}">
               {{ .PublishDate.Format "2 January, 2006 at 15:04 MST" }}
-            </time> {{ if .Params.Author }} by <a href="{{ .Site.BaseURL }}" class="p-author h-card" rel="author">{{ . }}</a>{{ end }}
+            </time> {{ if $author }} by <a href="{{ .Site.BaseURL }}" class="p-author h-card" rel="author">{{ $author }}</a>{{ end }}
         </p>
         {{ if .Params.categories }}
         <p class="post-tag">Category: 
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 64caab0..ff1233a 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -25,9 +25,11 @@
       </nav>
       {{ end }}
       {{ partial "social.html" . }}
+      {{ with .Site.Copyright }}
       <p class="copyright">
-          &copy; {{ dateFormat "2006" now }} {{ .Site.Params.CopyrightOwner }}
+          {{ . }}
       </p>
+      {{ end }}
       <p class="h-card">
         <img class="u-photo" src="{{ .Site.BaseURL }}{{ .Site.Params.Avatar }}" />
         <a class="p-name u-url" href="{{ .Site.BaseURL }}" rel="me">{{ .Site.Params.AuthorName }}</a>
-- 
cgit v1.2.3