Split out article pagination and close #8

2 files changed, 35 insertions, 38 deletions

diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index ea0bda4..37aebe2 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -3,17 +3,38 @@
 
 <!-- Footer content -->
     <div id="footer">
-        {{ partial "social.html" . }}
-        <p class="copyright">
-            &copy; {{ dateFormat "2006" now }} {{ .Site.Params.CopyrightOwner }}
-        </p>
-        <p class="h-card">
-          <img class="u-photo" src="{{ .Site.BaseURL }}{{ .Site.Params.Avatar }}" />
-          <a class="p-name u-url" href="{{ .Site.Home }}" rel="me">{{ .Site.Params.AuthorName }}</a>
-          <a class="u-email" href="mailto:{{ .Site.Params.IndieWeb.EmailAddress }}">{{ .Site.Params.IndieWeb.EmailAddress }}</a>, 
-          <span class="p-locality">{{ .Site.Params.IndieWeb.City }}</span>
-          <span class="p-country-name">{{ .Site.Params.IndieWeb.Country }}</span>
-        </p>
+      {{ if or (.Prev) (.Next) }}
+      <nav id="article-skip">
+        <div class="prev">
+          {{ if and (.Prev) (not .Params.Menu) }}
+          <a alt="Newer article" href="{{ .Prev.Permalink }}">&larr; Newer</a>
+          {{ else }}
+          <p>&nbsp;</p>
+          {{ end }}
+        </div>
+        <div class="top">
+          <a alt="Top of page" href="#">Top</a>
+        </div>
+        <div class="next">
+          {{ if and (.Next) (not .Params.Menu) }}
+          <a alt="Older article" href="{{ .Next.Permalink }}">Older &rarr;</a>
+          {{ else }}
+          <p>&nbsp;</p>
+          {{ end }}
+        </div>
+      </nav>
+      {{ end }}
+      {{ partial "social.html" . }}
+      <p class="copyright">
+          &copy; {{ dateFormat "2006" now }} {{ .Site.Params.CopyrightOwner }}
+      </p>
+      <p class="h-card">
+        <img class="u-photo" src="{{ .Site.BaseURL }}{{ .Site.Params.Avatar }}" />
+        <a class="p-name u-url" href="{{ .Site.Home }}" rel="me">{{ .Site.Params.AuthorName }}</a>
+        <a class="u-email" href="mailto:{{ .Site.Params.IndieWeb.EmailAddress }}">{{ .Site.Params.IndieWeb.EmailAddress }}</a>, 
+        <span class="p-locality">{{ .Site.Params.IndieWeb.City }}</span>
+        <span class="p-country-name">{{ .Site.Params.IndieWeb.Country }}</span>
+      </p>
     </div>
 
 <!-- Close the body/html document -->
diff --git a/layouts/partials/pagenav.html b/layouts/partials/pagenav.html
index 8adeb8f..7c90183 100644
--- a/layouts/partials/pagenav.html
+++ b/layouts/partials/pagenav.html
@@ -1,40 +1,16 @@
 <nav>
     {{ $currentPage := . }}
     <div id="page-nav">
-        <!--
-            Left-most entry is a link to the next-newest article, if we're
-            looking at posts, or a spacer if we're either on the home page or a
-            menu-content page.
-        -->
-        {{ if and (.Prev) (not .Params.Menu) }}
-        <div class="static-page-nav-item">
-            <a alt="Newer article" href="{{ .Prev.Permalink }}">&larr; Newer</a>
+        <div class="page-nav-item">
+            <a href="{{ .Site.BaseURL }}">Home</a>
         </div>
-        {{ else }}
-        <div class="static-page-nav-spacer">&nbsp;</div>
-        {{ end }}
-
-        <!-- Next, the menu of static content pages (e.g., about, now). -->
         {{ range .Site.Menus.main }}
-            <div class="static-page-nav-item">
+            <div class="page-nav-item">
                 <a href="{{ .URL }}">
                     {{ .Pre }}
                     <span>{{ .Name }}</span>
                 </a>
             </div>
         {{ end }}
-
-        <!--
-            Right-most entry is a link to the next-oldest article if we're
-            looking at posts, or a spacer if we're either on the home page or a
-            menu-content page.
-        -->
-        {{ if and (.Next) (not .Params.Menu) }}
-        <div class="static-page-nav-item">
-            <a alt="Older article" href="{{ .Next.Permalink }}">Older &rarr;</a>
-        </div>
-        {{ else }}
-        <div class="static-page-nav-spacer">&nbsp;</div>
-        {{ end }}
     </div>
 </nav>
\ No newline at end of file