1 files changed, 29 insertions, 46 deletions
diff --git a/themes/default/layouts/_default/index.html b/themes/default/layouts/_default/index.html
index 37c9855..f25cabf 100644
--- a/themes/default/layouts/_default/index.html
+++ b/themes/default/layouts/_default/index.html
@@ -1,51 +1,34 @@
-{{ define "styles" }}
+{{- define "styles" -}}
 <style>
-  {{ partial "styles-navigator.html" (dict "Link" "/") | safeCSS }}
+  {{ partial "navigator.css.html" (dict "Link" "/") | safeCSS }}
 </style>
-{{ end }}
-
-{{ define "middle" }}
-
-  {{- if gt .Paginator.PageNumber 1 -}}
-    {{- partial "navigator-middle.html"
-      (dict
-        "Context"   .
-        "Href"      "/"
-        "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 -}}
+
+{{- define "header" -}}
+  {{- partial "navigator-middle.html"
+    (dict
+      "Context"   .
+      "Title"     "Home"
+      "Subtitle"  (print (partial "count.html" .) " " "Total")
+      "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))
+    )
+  -}}
+{{- end -}}
+
+{{- define "middle" -}}
+  {{- range .Paginator.Pages -}}
+    {{- partial "render-embed.html" . -}}
   {{- end -}}
+{{- end -}}
 
-  {{ range .Paginator.Pages }}
-    {{ .Render "summary" }}
-  {{ end }}
-
-  {{ partial "pagination.html" . }}
-
-{{ end }}
-
-{{ define "right" }}
-  {{- partial "author-list.html" . -}}
-
-  {{ range first 1 (where .Site.Pages "Params.Author" .Site.Author.default.gallery) }}
-    {{- partial "gallery.html" . -}}
-  {{ end }}
-
-  {{ range first 1 (where .Site.Pages "Params.Author" .Site.Author.default.webring) }}
-    {{- partial "following-list.html" . -}}
-    {{- partial "webring.html"        . -}}
-  {{ end }}
+{{- define "footer" -}}
+  {{- partial "pagination.html" . -}}
+  {{- partial "footer.html" . -}}
+{{- end -}}
 
-{{ end }}
+{{- define "right" -}}
+  {{- partial "navigator-right.html" . -}}
+{{- end -}}