themes/default/layouts/_default/baseof: More granularity with header

15 files changed, 195 insertions, 176 deletions

diff --git a/themes/default/layouts/_default/baseof.html b/themes/default/layouts/_default/baseof.html
index e9f8550..a582805 100644
--- a/themes/default/layouts/_default/baseof.html
+++ b/themes/default/layouts/_default/baseof.html
@@ -34,12 +34,13 @@
     </column-base>
 
     <column-base position="middle">
-      <main id="main">
-        {{- block "middle" . -}}
-          <footer>Silence is golden.</footer>
-        {{- end -}}
-        {{- partial "base-footer.html" . -}}
-      </main>
+      {{- block "header" . -}}{{- end -}}
+        <main id="main">
+          {{- block "middle" . -}}
+            <footer>Silence is golden.</footer>
+          {{- end -}}
+        </main>
+      {{- partial "base-footer.html" . -}}
     </column-base>
 
     <column-base position="right">
diff --git a/themes/default/layouts/_default/home.archives.html b/themes/default/layouts/_default/home.archives.html
index 7fb5a78..0a04d41 100644
--- a/themes/default/layouts/_default/home.archives.html
+++ b/themes/default/layouts/_default/home.archives.html
@@ -1,14 +1,13 @@
-{{ define "title" }}Message Archive &mdash; {{ end }}
-{{ define "description" }}This page contains an archive of all messages &mdash; {{ end }}
-{{ define "styles" }}
+{{- define "title" -}}Message Archive &mdash; {{- end -}}
+{{- define "description" -}}This page contains an archive of all messages &mdash; {{- end -}}
+{{- define "styles" -}}
 <style>
   {{ partial "navigator.css.html" (dict "Link" "/archives/messages/") | safeCSS }}
 </style>
-{{ end }}
+{{- end -}}
 
-{{ define "middle" }}
-
-  {{ partial "navigator-middle.html"
+{{- define "header" -}}
+  {{- partial "navigator-middle.html"
     (dict
       "Context"    .
       "IconLabel"  "Back"
@@ -18,8 +17,10 @@
       "Subtitle"   (partial "count-total-messages.html" .)
       "Href"       (or (and (gt .Paginator.PageNumber 1) (.Paginator.Prev.URL | absURL)) "/")
     )
-  }}
+  -}}
+{{- end -}}
 
+{{- define "middle" -}}
   <archive-list>
     <item-list>
     {{ range (.Paginator.Pages.GroupByDate "2006") }}
@@ -47,10 +48,9 @@
     </item-list>
   </archive-list>
 
-  {{ partial "pagination.html" . }}
-
-{{ end }}
+  {{- partial "pagination.html" . -}}
+{{- end -}}
 
-{{ define "right" }}
+{{- define "right" -}}
   {{- partial "navigator-right.html" . -}}
-{{ end }}
+{{- end -}}
diff --git a/themes/default/layouts/_default/home.authors.html b/themes/default/layouts/_default/home.authors.html
index 17dcf59..ee24585 100644
--- a/themes/default/layouts/_default/home.authors.html
+++ b/themes/default/layouts/_default/home.authors.html
@@ -1,16 +1,13 @@
-{{ define "title" }}Authors &mdash; {{ end }}
-{{ define "description" }}This page contains a list of all authors &mdash; {{ end }}
-{{ define "styles" }}
+{{- define "title" -}}Authors &mdash; {{- end -}}
+{{- define "description" -}}This page contains a list of all authors &mdash; {{- end -}}
+{{- define "styles" -}}
 <style>
   {{ partial "navigator.css.html" (dict "Link" "/authors/") | safeCSS }}
 </style>
-{{ end }}
+{{- end -}}
 
-{{ define "middle" }}
-
-  {{- partial "generate-authors" . -}}
-
-  {{ partial "navigator-middle.html"
+{{- define "header" -}}
+  {{- partial "navigator-middle.html"
     (dict
       "Title"      "Authors"
       "Subtitle"   (partial "count-authors.html" .)
@@ -20,22 +17,25 @@
       "Id"         "back"
       "Context"    .
     )
-  }}
+  -}}
+{{- end -}}
 
-  {{ $authors := partial "function-authors-slice.html" . }}
+{{- define "middle" -}}
+  {{- partial "generate-authors" . -}}
+
+  {{- $authors := partial "function-authors-slice.html" . -}}
 
   {{- range $author := $authors -}}
-    {{ $data := index $.Site.Data $author | default "default" }}
+    {{- $data := index $.Site.Data $author | default "default" -}}
     {{- $date := (index (first 1 (where $.Site.Pages.ByDate.Reverse "Section" $author)) 0).Date -}}
     {{- partial "author-card.html" (dict
         "Data" $data
         "Date" $date
       )
     -}}
-  {{ end }}
-
-{{ end }}
+  {{- end -}}
+{{- end -}}
 
-{{ define "right" }}
+{{- define "right" -}}
   {{- partial "navigator-right.html" . -}}
-{{ end }}
+{{- end -}}
diff --git a/themes/default/layouts/_default/home.sources.html b/themes/default/layouts/_default/home.sources.html
index b498f4a..cea3826 100644
--- a/themes/default/layouts/_default/home.sources.html
+++ b/themes/default/layouts/_default/home.sources.html
@@ -1,28 +1,27 @@
-{{ define "title" }}Sources &mdash; {{ end }}
-{{ define "description" }}This page contains a list of all source files &mdash; {{ end }}
-{{ define "styles" }}
+{{- define "title" -}}Sources &mdash; {{- end -}}
+{{- define "description" -}}This page contains a list of all source files &mdash; {{- end -}}
+{{- define "styles" -}}
 <style>
   {{ partial "navigator.css.html" (dict "Link" "/sources/") | safeCSS }}
 </style>
-{{ end }}
+{{- end -}}
 
-{{ define "middle" }}
+{{- define "header" -}}
+  {{- $_default   := readDir (print "/themes/default/layouts/_default")         -}}
+  {{- $_markup    := readDir (print "/themes/default/layouts/_default/_markup") -}}
+  {{- $partials   := readDir (print "/themes/default/layouts/partials")         -}}
+  {{- $shortcodes := readDir (print "/themes/default/layouts/shortcodes")       -}}
 
-  {{ $_default   := readDir (print "/themes/default/layouts/_default")         }}
-  {{ $_markup    := readDir (print "/themes/default/layouts/_default/_markup") }}
-  {{ $partials   := readDir (print "/themes/default/layouts/partials")         }}
-  {{ $shortcodes := readDir (print "/themes/default/layouts/shortcodes")       }}
-
-  {{ $fileCount  := add
+  {{- $fileCount  := add
     (add
       (sub (len $_default) 1)
       (len $_markup))
     (add
       (len $partials)
       (len $shortcodes))
-  }}
+  -}}
 
-  {{ partial "navigator-middle.html"
+  {{- partial "navigator-middle.html"
     (dict
       "Title"      "Sources"
       "Subtitle"   (print $fileCount " " "Files")
@@ -32,11 +31,17 @@
       "Id"         "back"
       "Context"    .
     )
-  }}
+  -}}
+{{- end -}}
+
+{{- define "middle" -}}
+  {{- $_default   := readDir (print "/themes/default/layouts/_default")         -}}
+  {{- $_markup    := readDir (print "/themes/default/layouts/_default/_markup") -}}
+  {{- $partials   := readDir (print "/themes/default/layouts/partials")         -}}
+  {{- $shortcodes := readDir (print "/themes/default/layouts/shortcodes")       -}}
 
   <source-files>
     <item-list>
-
       <h1>Defaults</h1>
       <ul>
         {{ range sort $_default ".ModTime" "desc" }}
@@ -109,11 +114,9 @@
         &middot; Fuzzy Sort by Stephen Kamenar: <a href="https://github.com/farzher/fuzzysort/blob/e7f484a124f09bf3cb9a4db366a95457d962dbed/LICENSE">MIT License</a>
       </p>
     </footer>
-
   </source-files>
+{{- end -}}
 
-{{ end }}
-
-{{ define "right" }}
+{{- define "right" -}}
   {{- partial "navigator-right.html" . -}}
-{{ end }}
+{{- end -}}
diff --git a/themes/default/layouts/_default/home.xslt.rss.xsl b/themes/default/layouts/_default/home.xslt.rss.xsl
index d345af9..9d5e8ee 100644
--- a/themes/default/layouts/_default/home.xslt.rss.xsl
+++ b/themes/default/layouts/_default/home.xslt.rss.xsl
@@ -18,88 +18,87 @@
       <body>
         <column-base position="left"></column-base>
         <column-base position="middle">
-          <main>
-            <nav>
-              <icon-button>
-                <a onclick="window.history.go(-1); return false;">
-                  <xsl:choose>
-                    <xsl:when test="/rss/channel/atom:link[@rel='previous']/@href">
-                      <xsl:attribute name="href">
-                        <xsl:value-of select="/rss/channel/atom:link[@rel='previous']/@href" />
-                      </xsl:attribute>
-                    </xsl:when>
-                    <xsl:otherwise>
-                      <xsl:attribute name="href">/</xsl:attribute>
-                    </xsl:otherwise>
-                  </xsl:choose>
-                  {{ safeHTML (readFile (print (partial "function-paths.html").static "/icons/feather/arrow-left.svg")) }}
-                  <small>Back</small>
-                </a>
-              </icon-button>
-              <section>
-                <h2><xsl:value-of select="/rss/channel/title" />'s Feed</h2>
-                <small>Web Feed Preview</small>
-              </section>
-              <xsl:if test="/rss/channel/atom:link[@rel='next']/@href">
+          <nav>
+            <icon-button>
+              <a onclick="window.history.go(-1); return false;">
+                <xsl:choose>
+                 <xsl:when test="/rss/channel/atom:link[@rel='previous']/@href">
+                   <xsl:attribute name="href">
+                     <xsl:value-of select="/rss/channel/atom:link[@rel='previous']/@href" />
+                   </xsl:attribute>
+                 </xsl:when>
+                 <xsl:otherwise>
+                   <xsl:attribute name="href">/</xsl:attribute>
+                 </xsl:otherwise>
+                </xsl:choose>
+                {{ safeHTML (readFile (print (partial "function-paths.html").static "/icons/feather/arrow-left.svg")) }}
+                <small>Back</small>
+              </a>
+            </icon-button>
+            <section>
+             <h2><xsl:value-of select="/rss/channel/title" />'s Feed</h2>
+             <small>Web Feed Preview</small>
+            </section>
+            <xsl:if test="/rss/channel/atom:link[@rel='next']/@href">
               <icon-button>
-                <a>
-                  <xsl:attribute name="href">
-                    <xsl:value-of select="/rss/channel/atom:link[@rel='next']/@href" />
-                  </xsl:attribute>
-                  {{ safeHTML (readFile (print (partial "function-paths.html").static "/icons/feather/arrow-right.svg")) }}
-                  <small>Next</small>
-                </a>
+               <a>
+                 <xsl:attribute name="href">
+                   <xsl:value-of select="/rss/channel/atom:link[@rel='next']/@href" />
+                 </xsl:attribute>
+                 {{ safeHTML (readFile (print (partial "function-paths.html").static "/icons/feather/arrow-right.svg")) }}
+                 <small>Next</small>
+               </a>
               </icon-button>
-              </xsl:if>
-              {{ if .Site.Menus.main }}
-                {{ range .Site.Menus.main }}
+            </xsl:if>
+            {{ if .Site.Menus.main }}
+              {{ range .Site.Menus.main }}
                 <icon-navigator hidden="">
                   <icon-button>
-                      <a id="nav-middle-{{ path.Base .Identifier }}" href="{{ .URL | absURL }}">
-                        {{ with .Identifier }}
-                          {{ $icon := print (partial "function-paths.html").static "/icons/" . ".svg" }}
-                          {{ safeHTML (readFile $icon) }}
-                        {{ end }}
-                        <small>{{ delimit (first 1 (split .Name " ")) " " }}</small>
-                      </a>
+                    <a id="nav-middle-{{ path.Base .Identifier }}" href="{{ .URL | absURL }}">
+                     {{ with .Identifier }}
+                       {{ $icon := print (partial "function-paths.html").static "/icons/" . ".svg" }}
+                       {{ safeHTML (readFile $icon) }}
+                     {{ end }}
+                     <small>{{ delimit (first 1 (split .Name " ")) " " }}</small>
+                    </a>
                   </icon-button>
                 </icon-navigator>
-                {{ end }}
               {{ end }}
-            </nav>
-            <navigation-separator><hr hidden=""></hr></navigation-separator>
+            {{ end }}
+          </nav>
+          <main>
             <xsl:for-each select="/rss/channel/item">
-            <micro-card>
-              <micro-summary>
-                <micro-thumbnail>
-                  <figure>
-                    <a>
-                      <xsl:attribute name="href"><xsl:value-of select="link" /></xsl:attribute>
-                      <span>
-                        <object>
-                          <xsl:attribute name="title"><xsl:value-of select="atom:author/atom:name" /></xsl:attribute>
-                          <xsl:attribute name="data"><xsl:value-of select="atom:author/atom:uri" /></xsl:attribute>
-                          <xsl:value-of select="substring(atom:author/atom:name, 1, 1)" />
-                        </object>
-                      </span>
-                    </a>
-                  </figure>
-                </micro-thumbnail>
-                <article>
-                  <h2>
-                    <a>
-                      <xsl:attribute name="href"><xsl:value-of select="link" /></xsl:attribute>
-                      <xsl:value-of select="title" />
-                    </a>
-                  </h2>
-                  <small>Published: <xsl:value-of select="pubDate" /></small>
-                </article>
-              </micro-summary>
-            </micro-card>
+              <micro-card>
+                <micro-summary>
+                  <micro-thumbnail>
+                    <figure>
+                      <a>
+                        <xsl:attribute name="href"><xsl:value-of select="link" /></xsl:attribute>
+                        <span>
+                          <object>
+                            <xsl:attribute name="title"><xsl:value-of select="atom:author/atom:name" /></xsl:attribute>
+                            <xsl:attribute name="data"><xsl:value-of select="atom:author/atom:uri" /></xsl:attribute>
+                            <xsl:value-of select="substring(atom:author/atom:name, 1, 1)" />
+                          </object>
+                        </span>
+                      </a>
+                    </figure>
+                  </micro-thumbnail>
+                  <article>
+                    <h2>
+                      <a>
+                        <xsl:attribute name="href"><xsl:value-of select="link" /></xsl:attribute>
+                        <xsl:value-of select="title" />
+                      </a>
+                    </h2>
+                    <small>Published: <xsl:value-of select="pubDate" /></small>
+                  </article>
+                </micro-summary>
+              </micro-card>
             </xsl:for-each>
           </main>
-        </column-base>
-        <column-base position="right"></column-base>
+       </column-base>
+       <column-base position="right"></column-base>
       </body>
     </html>
   </xsl:template>
diff --git a/themes/default/layouts/_default/home.xslt.sitemap.xsl b/themes/default/layouts/_default/home.xslt.sitemap.xsl
index 4833a22..67a4459 100644
--- a/themes/default/layouts/_default/home.xslt.sitemap.xsl
+++ b/themes/default/layouts/_default/home.xslt.sitemap.xsl
@@ -16,37 +16,37 @@
       <body>
         <column-base position="left"></column-base>
         <column-base position="middle">
-          <main>
-            <nav>
-              <icon-button>
-                <a onclick="window.history.go(-1); return false;" href="/">
-                  {{ safeHTML (readFile (print (partial "function-paths.html").static "/icons/feather/arrow-left.svg")) }}
-                  <small>Back</small>
-                </a>
-              </icon-button>
-              <section>
-                <h2>{{ $.Site.Title }} Site Map</h2>
-                <small>Site Map Preview</small>
-              </section>
-              {{ if .Site.Menus.main }}
-                {{ range .Site.Menus.main }}
-                  <icon-navigator hidden="">
-                    <icon-button>
-                      <a
-                        id="nav-middle-{{ path.Base .Identifier }}"
-                        href="{{ .URL | absURL }}"
-                      >
-                        {{ with .Identifier }}
-                          {{ $icon := print (partial "function-paths.html").static "/icons/" . ".svg" }}
-                          {{ safeHTML (readFile $icon) }}
-                        {{ end }}
-                        <small>{{ delimit (first 1 (split .Name " ")) " " }}</small>
-                      </a>
-                    </icon-button>
-                  </icon-navigator>
-                {{ end }}
+          <nav>
+            <icon-button>
+              <a onclick="window.history.go(-1); return false;" href="/">
+                {{ safeHTML (readFile (print (partial "function-paths.html").static "/icons/feather/arrow-left.svg")) }}
+                <small>Back</small>
+              </a>
+            </icon-button>
+            <section>
+              <h2>{{ $.Site.Title }} Site Map</h2>
+              <small>Site Map Preview</small>
+            </section>
+            {{ if .Site.Menus.main }}
+              {{ range .Site.Menus.main }}
+                <icon-navigator hidden="">
+                  <icon-button>
+                    <a
+                      id="nav-middle-{{ path.Base .Identifier }}"
+                      href="{{ .URL | absURL }}"
+                    >
+                      {{ with .Identifier }}
+                        {{ $icon := print (partial "function-paths.html").static "/icons/" . ".svg" }}
+                        {{ safeHTML (readFile $icon) }}
+                      {{ end }}
+                      <small>{{ delimit (first 1 (split .Name " ")) " " }}</small>
+                    </a>
+                  </icon-button>
+                </icon-navigator>
               {{ end }}
-            </nav>
+            {{ end }}
+          </nav>
+          <main>
             <navigation-separator><hr hidden=""></hr></navigation-separator>
             <section>
               <table>
@@ -68,10 +68,9 @@
                           <xsl:attribute name="href">
                             <xsl:value-of select="sitemap:loc" />
                           </xsl:attribute>
-                          <xsl:attribute name="title">
-  Last Modified: <xsl:value-of select="sitemap:lastmod" />
-  Frequency: <xsl:value-of select="sitemap:changefreq" />
-  Priority: <xsl:value-of select="sitemap:priority" />
+<xsl:attribute name="title">Last Modified: <xsl:value-of select="sitemap:lastmod" />
+Frequency: <xsl:value-of select="sitemap:changefreq" />
+Priority: <xsl:value-of select="sitemap:priority" />
                           </xsl:attribute>
                           <xsl:value-of select="sitemap:loc" />
                         </a>
diff --git a/themes/default/layouts/_default/index.html b/themes/default/layouts/_default/index.html
index caa9cff..651873a 100644
--- a/themes/default/layouts/_default/index.html
+++ b/themes/default/layouts/_default/index.html
@@ -4,7 +4,7 @@
 </style>
 {{- end -}}
 
-{{- define "middle" -}}
+{{- define "header" -}}
   {{- partial "navigator-middle.html"
     (dict
       "Context"   .
@@ -16,7 +16,9 @@
       "Href"      (and (gt .Paginator.PageNumber 1) (.Paginator.Prev.URL | absURL))
     )
   -}}
+{{- end -}}
 
+{{- define "middle" -}}
   {{- range .Paginator.Pages -}}
     {{- partial "render-embed.html" . -}}
   {{- end -}}
diff --git a/themes/default/layouts/_default/section.drafts.html b/themes/default/layouts/_default/section.drafts.html
index 0da61a3..4267a2a 100644
--- a/themes/default/layouts/_default/section.drafts.html
+++ b/themes/default/layouts/_default/section.drafts.html
@@ -16,7 +16,7 @@
 </style>
 {{- end -}}
 
-{{- define "middle" -}}
+{{- define "header" -}}
   {{- $author := partial "function-authors-data.html" . -}}
   {{- $authors := where .Site.RegularPages "Section" $author.user -}}
   {{- $drafts := where .Site.RegularPages "Draft" true -}}
@@ -31,13 +31,15 @@
       "Title"      "Drafts"
       "Icon"       "arrow-left"
       "Subtitle"   (partial "count-drafts.html" .)
-      "Href"       (or (and (gt $paginator.PageNumber 1) ($paginator.Prev.URL | absURL)) "/")
+      "Href"       (or (and (gt $paginator.PageNumber 1) ($paginator.Paginator.Prev.URL | absURL)) "/")
     )
   -}}
 
   {{- partial "profile.html" . -}}
+{{- end -}}
 
-  {{- range $paginator.Pages -}}
+{{- define "middle" -}}
+  {{- range .Paginator.Pages -}}
     {{- partial "render-embed.html" . -}}
   {{- else -}}
     <footer>
diff --git a/themes/default/layouts/_default/section.feeds.html b/themes/default/layouts/_default/section.feeds.html
index 2bebe2b..1cbdf71 100644
--- a/themes/default/layouts/_default/section.feeds.html
+++ b/themes/default/layouts/_default/section.feeds.html
@@ -16,7 +16,7 @@
 </style>
 {{- end -}}
 
-{{- define "middle" -}}
+{{- define "header" -}}
   {{- partial "navigator-middle.html"
     (dict
       "Context"    .
@@ -30,7 +30,9 @@
   -}}
 
   {{- partial "profile.html" . -}}
+{{- end -}}
 
+{{- define "middle" -}}
   {{- range .Paginator.Pages -}}
     {{- partial "render-embed.html" . -}}
   {{- else -}}
diff --git a/themes/default/layouts/_default/section.html b/themes/default/layouts/_default/section.html
index c926839..6691a57 100644
--- a/themes/default/layouts/_default/section.html
+++ b/themes/default/layouts/_default/section.html
@@ -15,7 +15,7 @@
 </style>
 {{- end -}}
 
-{{- define "middle" -}}
+{{- define "header" -}}
   {{- $author := partial "function-authors-data.html" . -}}
 
   {{- partial "navigator-middle.html"
@@ -33,7 +33,9 @@
   {{- partial "author-section-picture.html" . -}}
 
   {{- partial "profile.html" . -}}
+{{- end -}}
 
+{{- define "middle" -}}
   {{- range .Paginator.Pages -}}
     {{- partial "render-embed.html" . -}}
   {{- else -}}
diff --git a/themes/default/layouts/_default/section.likes.html b/themes/default/layouts/_default/section.likes.html
index 13320a2..ba6a33e 100644
--- a/themes/default/layouts/_default/section.likes.html
+++ b/themes/default/layouts/_default/section.likes.html
@@ -16,7 +16,7 @@
 </style>
 {{- end -}}
 
-{{- define "middle" -}}
+{{- define "header" -}}
   {{- $author := partial "function-authors-data.html" . -}}
   {{- $authors := where .Site.RegularPages "Section" $author.user -}}
   {{- $likes := where .Site.RegularPages ".Params.liked" true -}}
@@ -36,8 +36,10 @@
   -}}
 
   {{- partial "profile.html" . -}}
+{{- end -}}
 
-  {{- range $paginator.Pages -}}
+{{- define "middle" -}}
+  {{- range .Paginator.Pages -}}
     {{- partial "render-embed.html" . -}}
   {{- else -}}
     <footer>
diff --git a/themes/default/layouts/_default/section.media.html b/themes/default/layouts/_default/section.media.html
index 475fc81..4063f83 100644
--- a/themes/default/layouts/_default/section.media.html
+++ b/themes/default/layouts/_default/section.media.html
@@ -16,7 +16,7 @@
 </style>
 {{- end -}}
 
-{{- define "middle" -}}
+{{- define "header" -}}
   {{- partial "navigator-middle.html"
     (dict
       "Title"      "Media"
@@ -30,7 +30,9 @@
   -}}
 
   {{- partial "profile.html" . -}}
+{{- end -}}
 
+{{- define "middle" -}}
   {{- $author := partial "function-authors-data.html" . -}}
   {{- $notFeeds := where .Site.RegularPages "Params.feed" "eq" nil -}}
   {{- $authors := where .Site.RegularPages "Section" $author.user -}}
diff --git a/themes/default/layouts/_default/single.html b/themes/default/layouts/_default/single.html
index 71953d7..892a55f 100644
--- a/themes/default/layouts/_default/single.html
+++ b/themes/default/layouts/_default/single.html
@@ -4,7 +4,7 @@
 </style>
 {{- end -}}
 
-{{- define "middle" -}}
+{{- define "header" -}}
   {{- partial "navigator-middle.html"
     (dict
       "Title"      "Message"
@@ -16,7 +16,9 @@
       "Context"    .
     )
   -}}
+{{- end -}}
 
+{{- define "middle" -}}
   <micro-thread>
     {{- partial "render-embed.html" . -}}
 
diff --git a/themes/default/layouts/_default/taxonomy.html b/themes/default/layouts/_default/taxonomy.html
index 8c5cdbe..eec38ea 100644
--- a/themes/default/layouts/_default/taxonomy.html
+++ b/themes/default/layouts/_default/taxonomy.html
@@ -4,8 +4,7 @@
 </style>
 {{- end -}}
 
-{{- define "middle" -}}
-
+{{- define "header" -}}
   {{- partial "navigator-middle.html"
     (dict
       "Context"    .
@@ -17,7 +16,9 @@
       "Href"       (or (and (gt .Paginator.PageNumber 1) (.Paginator.Prev.URL | absURL)) "/")
     )
   -}}
+{{- end -}}
 
+{{- define "middle" -}}
   <tag-deck>
     {{- range .Paginator.Pages -}}
       {{- $count := len .Data.Pages -}}
@@ -59,7 +60,7 @@
     {{- end -}}
   </tag-deck>
 
-  {{ partial "pagination.html" . }}
+  {{- partial "pagination.html" . -}}
 {{- end -}}
 
 {{- define "right" -}}
diff --git a/themes/default/layouts/_default/term.html b/themes/default/layouts/_default/term.html
index 699178e..e68753b 100644
--- a/themes/default/layouts/_default/term.html
+++ b/themes/default/layouts/_default/term.html
@@ -4,7 +4,7 @@
 </style>
 {{- end -}}
 
-{{- define "middle" -}}
+{{- define "header" -}}
   {{- partial "navigator-middle.html"
     (dict
       "Context"    .
@@ -16,7 +16,9 @@
       "Href"       (or (and (gt .Paginator.PageNumber 1) (.Paginator.Prev.URL | absURL)) "/")
     )
   -}}
+{{- end -}}
 
+{{- define "middle" -}}
   {{- range .Paginator.Pages -}}
     {{- partial "render-embed.html" . -}}
   {{- end -}}