themes/default/layouts/partials/navigator-right: Don't split

Use page kind to keep logic sane.

8 files changed, 32 insertions, 14 deletions

diff --git a/themes/default/layouts/_default/home.archive-messages.html b/themes/default/layouts/_default/home.archive-messages.html
index 3ca1673..03afa5c 100644
--- a/themes/default/layouts/_default/home.archive-messages.html
+++ b/themes/default/layouts/_default/home.archive-messages.html
@@ -44,5 +44,5 @@
 {{ end }}
 
 {{ define "right" }}
-  {{- partial "navigator-right-default.html" . -}}
+  {{- partial "navigator-right.html" . -}}
 {{ end }}
diff --git a/themes/default/layouts/_default/home.archive-tags.html b/themes/default/layouts/_default/home.archive-tags.html
index 9e915ba..4161392 100644
--- a/themes/default/layouts/_default/home.archive-tags.html
+++ b/themes/default/layouts/_default/home.archive-tags.html
@@ -52,5 +52,5 @@
 {{ end }}
 
 {{ define "right" }}
-  {{- partial "navigator-right-default.html" . -}}
+  {{- partial "navigator-right.html" . -}}
 {{ end }}
diff --git a/themes/default/layouts/_default/home.authors.html b/themes/default/layouts/_default/home.authors.html
index c5e60e6..6eb6617 100644
--- a/themes/default/layouts/_default/home.authors.html
+++ b/themes/default/layouts/_default/home.authors.html
@@ -30,5 +30,5 @@
 {{ end }}
 
 {{ define "right" }}
-  {{- partial "navigator-right-default.html" . -}}
+  {{- partial "navigator-right.html" . -}}
 {{ end }}
diff --git a/themes/default/layouts/_default/home.sources.html b/themes/default/layouts/_default/home.sources.html
index 9328920..55f3d0c 100644
--- a/themes/default/layouts/_default/home.sources.html
+++ b/themes/default/layouts/_default/home.sources.html
@@ -108,5 +108,5 @@
 {{ end }}
 
 {{ define "right" }}
-  {{- partial "navigator-right-default.html" . -}}
+  {{- partial "navigator-right.html" . -}}
 {{ end }}
diff --git a/themes/default/layouts/_default/taxonomy.html b/themes/default/layouts/_default/taxonomy.html
index 47a771a..011acac 100644
--- a/themes/default/layouts/_default/taxonomy.html
+++ b/themes/default/layouts/_default/taxonomy.html
@@ -58,5 +58,5 @@
 {{ end }}
 
 {{ define "right" }}
-  {{- partial "navigator-right-default.html" . -}}
+  {{- partial "navigator-right.html" . -}}
 {{ end }}
diff --git a/themes/default/layouts/_default/term.html b/themes/default/layouts/_default/term.html
index 8f31575..f8fc983 100644
--- a/themes/default/layouts/_default/term.html
+++ b/themes/default/layouts/_default/term.html
@@ -29,5 +29,5 @@
 {{ end }}
 
 {{ define "right" }}
-  {{- partial "navigator-right-default.html" . -}}
+  {{- partial "navigator-right.html" . -}}
 {{ end }}
diff --git a/themes/default/layouts/partials/navigator-right-default.html b/themes/default/layouts/partials/navigator-right-default.html
deleted file mode 100644
index 44b4bbd..0000000
--- a/themes/default/layouts/partials/navigator-right-default.html
+++ /dev/null
@@ -1,4 +0,0 @@
-{{- partial "author-list.html" . -}}
-{{- range first 1 (where .Site.Pages "Params.Author" .Site.Author.default.webring) -}}
-  {{- partial "web-ring.html" . -}}
-{{- end -}}
diff --git a/themes/default/layouts/partials/navigator-right.html b/themes/default/layouts/partials/navigator-right.html
index fc598c2..01506eb 100644
--- a/themes/default/layouts/partials/navigator-right.html
+++ b/themes/default/layouts/partials/navigator-right.html
@@ -1,4 +1,26 @@
-{{- partial "author-list.html"    . -}}
-{{- partial "gallery-images.html" . -}}
-{{- partial "following-list.html" . -}}
-{{- partial "web-ring.html"       . -}}
+{{- partial "author-list.html" . -}}
+
+{{- if or
+  (eq .Page.Kind "page")
+  (eq .Page.Kind "section")
+-}}
+
+  {{- partial "gallery-images.html" . -}}
+  {{- partial "following-list.html" . -}}
+
+{{- end -}}
+
+{{- if or
+  (eq .Page.Kind "page")
+  (eq .Page.Kind "section")
+-}}
+
+  {{- partial "web-ring.html" . -}}
+
+{{- else -}}
+
+  {{- range first 1 (where .Site.Pages "Params.Author" .Site.Author.default.webring) -}}
+    {{- partial "web-ring.html" . -}}
+  {{- end -}}
+
+{{- end -}}