themes/default/layouts/partials/navigator-middle: Remove implicit paginator

Avoid spooky action, an implicit pager can generate unnecessary pages

8 files changed, 49 insertions, 72 deletions

diff --git a/themes/default/layouts/_default/home.archives.html b/themes/default/layouts/_default/home.archives.html
index 370bec0..dba19b6 100644
--- a/themes/default/layouts/_default/home.archives.html
+++ b/themes/default/layouts/_default/home.archives.html
@@ -10,13 +10,13 @@
 
   {{ partial "navigator-middle.html"
     (dict
-      "Title"      "Archives"
-      "Subtitle"   (partial "count-total-messages.html" .)
-      "Icon"       "arrow-left"
+      "Context"    .
       "IconLabel"  "Back"
-      "Href"       "/"
       "Id"         "back"
-      "Context"    .
+      "Title"      "Archives"
+      "Icon"       "arrow-left"
+      "Subtitle"   (partial "count-total-messages.html" .)
+      "Href"       (or (and (gt .Paginator.PageNumber 1) (.Paginator.Prev.URL | absURL)) "/")
     )
   }}
 
diff --git a/themes/default/layouts/_default/index.html b/themes/default/layouts/_default/index.html
index cc361b6..5e78371 100644
--- a/themes/default/layouts/_default/index.html
+++ b/themes/default/layouts/_default/index.html
@@ -6,26 +6,17 @@
 
 {{ define "middle" }}
 
-  {{- if gt .Paginator.PageNumber 1 -}}
-    {{- partial "navigator-middle.html"
-      (dict
-        "Context"   .
-        "Icon"      "arrow-left"
-        "IconLabel" "Back"
-        "Id"        "back"
-        "Title"     "Home"
-        "Subtitle"  (partial "count-total-messages.html" .)
-      )
-    -}}
-  {{- else -}}
-    {{- partial "navigator-middle.html"
-      (dict
-        "Context" .
-        "Subtitle" (partial "count-total-messages.html" .)
-        "Title" "Home"
-      )
-    -}}
-  {{- end -}}
+  {{- partial "navigator-middle.html"
+    (dict
+      "Context"   .
+      "Title"     "Home"
+      "Subtitle"  (partial "count-total-messages.html" .)
+      "IconLabel" (and (gt .Paginator.PageNumber 1) "Back")
+      "Id"        (and (gt .Paginator.PageNumber 1) "back")
+      "Icon"      (and (gt .Paginator.PageNumber 1) "arrow-left")
+      "Href"      (and (gt .Paginator.PageNumber 1) (.Paginator.Prev.URL | absURL))
+    )
+  -}}
 
   {{ range .Paginator.Pages }}
     {{ .Render "summary" }}
diff --git a/themes/default/layouts/_default/section.feeds.html b/themes/default/layouts/_default/section.feeds.html
index 20566df..f315c32 100644
--- a/themes/default/layouts/_default/section.feeds.html
+++ b/themes/default/layouts/_default/section.feeds.html
@@ -20,13 +20,13 @@
 
   {{ partial "navigator-middle.html"
     (dict
-      "Title"      "Feeds"
-      "Subtitle"   (partial "count-feeds.html" .)
-      "Icon"       "arrow-left"
+      "Context"    .
       "IconLabel"  "Back"
-      "Href"       "/"
       "Id"         "back"
-      "Context"    .
+      "Title"      "Feeds"
+      "Icon"       "arrow-left"
+      "Subtitle"   (partial "count-feeds.html" .)
+      "Href"       (or (and (gt .Paginator.PageNumber 1) (.Paginator.Prev.URL | absURL)) "/")
     )
   }}
 
diff --git a/themes/default/layouts/_default/section.html b/themes/default/layouts/_default/section.html
index 9d32210..d678039 100644
--- a/themes/default/layouts/_default/section.html
+++ b/themes/default/layouts/_default/section.html
@@ -17,23 +17,17 @@
 
 {{ define "middle" }}
 
-  {{- $messages := print
-    (lang.FormatNumberCustom 0 .Paginator.TotalNumberOfElements)
-    " "
-    "Messages"
-  -}}
-
   {{- $author := partial "function-authors-data.html" . -}}
 
   {{ partial "navigator-middle.html"
     (dict
-      "Title"      $author.name
-      "Subtitle"   $messages
-      "Icon"       "arrow-left"
+      "Context"    .
       "IconLabel"  "Back"
-      "Href"       "/"
       "Id"         "back"
-      "Context"    .
+      "Title"      $author.name
+      "Icon"       "arrow-left"
+      "Href"       (or (and (gt .Paginator.PageNumber 1) (.Paginator.Prev.URL | absURL)) "/")
+      "Subtitle"   (print (lang.FormatNumberCustom 0 .Paginator.TotalNumberOfElements) " " "Messages")
     )
   }}
 
diff --git a/themes/default/layouts/_default/section.likes.html b/themes/default/layouts/_default/section.likes.html
index 650c326..c91de2e 100644
--- a/themes/default/layouts/_default/section.likes.html
+++ b/themes/default/layouts/_default/section.likes.html
@@ -20,13 +20,13 @@
 
   {{ partial "navigator-middle.html"
     (dict
-      "Title"      "Likes"
-      "Subtitle"   (partial "count-likes.html" .)
-      "Icon"       "arrow-left"
+      "Context"    .
       "IconLabel"  "Back"
-      "Href"       "/"
       "Id"         "back"
-      "Context"    .
+      "Title"      "Likes"
+      "Icon"       "arrow-left"
+      "Subtitle"   (partial "count-likes.html" .)
+      "Href"       (or (and (gt .Paginator.PageNumber 1) (.Paginator.Prev.URL | absURL)) "/")
     )
   }}
 
diff --git a/themes/default/layouts/_default/taxonomy.html b/themes/default/layouts/_default/taxonomy.html
index c0b0fe7..a56b408 100644
--- a/themes/default/layouts/_default/taxonomy.html
+++ b/themes/default/layouts/_default/taxonomy.html
@@ -8,13 +8,13 @@
 
   {{- partial "navigator-middle.html"
     (dict
-      "Title"      "Tags"
-      "Subtitle"   (partial "count-tags.html" .)
-      "Icon"       "arrow-left"
+      "Context"    .
       "IconLabel"  "Back"
-      "Href"       "/"
       "Id"         "back"
-      "Context"    .
+      "Title"      "Tags"
+      "Icon"       "arrow-left"
+      "Subtitle"   (partial "count-tags.html" .)
+      "Href"       (or (and (gt .Paginator.PageNumber 1) (.Paginator.Prev.URL | absURL)) "/")
     )
   -}}
 
diff --git a/themes/default/layouts/_default/term.html b/themes/default/layouts/_default/term.html
index f8fc983..0371a9e 100644
--- a/themes/default/layouts/_default/term.html
+++ b/themes/default/layouts/_default/term.html
@@ -6,17 +6,15 @@
 
 {{ define "middle" }}
 
-  {{- $terms := print (lang.FormatNumberCustom 0 (len .Data.Pages)) " " "Messages" -}}
-
   {{ partial "navigator-middle.html"
     (dict
-      "Title"      (print "#" .Title)
-      "Subtitle"   $terms
-      "Icon"       "arrow-left"
+      "Context"    .
       "IconLabel"  "Back"
-      "Href"       "/"
       "Id"         "back"
-      "Context"    .
+      "Icon"       "arrow-left"
+      "Title"      (print "#" .Title)
+      "Subtitle"   (print (lang.FormatNumberCustom 0 (len .Data.Pages)) " " "Messages")
+      "Href"       (or (and (gt .Paginator.PageNumber 1) (.Paginator.Prev.URL | absURL)) "/")
     )
   }}
 
diff --git a/themes/default/layouts/partials/navigator-middle.html b/themes/default/layouts/partials/navigator-middle.html
index 2c72120..4bdda81 100644
--- a/themes/default/layouts/partials/navigator-middle.html
+++ b/themes/default/layouts/partials/navigator-middle.html
@@ -1,16 +1,9 @@
-{{- $href := .Href -}}
+{{- $href := or .Href "#" -}}
 {{- $id := or .Id "top" -}}
 {{- $label := title $id -}}
 {{- $icon := readFile (print (partial "function-paths.html").static "/icons/feather/arrow-up.svg") -}}
 {{- $refresh := readFile (print (partial "function-paths.html").static "/icons/feather/refresh-cw.svg") -}}
 
-{{- with $paginator := .Context.Paginator -}}
-  {{- $href = or (and (eq $paginator.PageNumber 1) $href)
-                 (and (gt $paginator.PageNumber 1) ($paginator.Prev.URL | absURL))
-                 "#"
-  -}}
-{{- end -}}
-
 {{- with .Icon -}}
   {{- $icon = readFile (print (partial "function-paths.html").static "/icons/feather/" . ".svg") -}}
 {{- end -}}
@@ -63,15 +56,16 @@
       id="search-form"
       action="https://lite.duckduckgo.com/lite/"
     >
-      <input required
+      <input
+        aria-autocomplete="list"
+        aria-label="search input"
+        autocomplete="off"
         id="search-input"
         name="q"
-        value=""
-        type="search"
-        autocomplete="off"
+        required=""
         spellcheck="false"
-        aria-autocomplete="list"
-        aria-label="search input"
+        type="search"
+        value=""
       />
       <button id="search-submit">
         {{ safeHTML (readFile (print (partial "function-paths.html").static "/icons/feather/search.svg")) }}