From c2ef59eaa5bd31e1c44b24a91360ea1a78bdabe5 Mon Sep 17 00:00:00 2001
From: jk <jk@nipponalba.scot>
Date: Fri, 19 Jun 2020 21:50:27 +0100
Subject: [PATCH] fixing category and tag lists

---
 config.toml                                           |  4 ++--
 themes/nipponalba/layouts/_default/list.html          | 11 +++++++++--
 .../layouts/partials/taxonomy/categories.html         |  2 +-
 themes/nipponalba/layouts/partials/taxonomy/tags.html |  2 +-
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/config.toml b/config.toml
index acc5dd70..7497bc78 100644
--- a/config.toml
+++ b/config.toml
@@ -34,8 +34,8 @@ defaultContentLanguage="en"
 [taxonomies]
 blog = "blog"
 image = "image"
-tag = "tags"
-category = "categories"
+tag = "tag"
+category = "category"
 type = "type"
 likeof = "likeof"
 inreplyto = "inreplyto"
diff --git a/themes/nipponalba/layouts/_default/list.html b/themes/nipponalba/layouts/_default/list.html
index 87ff8484..74c0ddad 100644
--- a/themes/nipponalba/layouts/_default/list.html
+++ b/themes/nipponalba/layouts/_default/list.html
@@ -2,7 +2,7 @@
 <div class="archive">
    <div class="list-title">{{if not (eq .Name "Blog")}}{{ .Name }}{{ end }}{{if eq .Name "Blog"}}All Blogs{{ end }} <a href="{{ .Permalink }}/index.xml"><i class="fa fa-rss fa-2x fa-fw" aria-hidden="true" title="{{ .Name }} RSS feed"></i></a></div>
     <ul class="list-with-title">
-      {{ range .Data.Pages.GroupByDate "2006" }}
+      {{ if eq .Type "article" "blog"}}{{ range .Data.Pages.GroupByDate "2006" }}
       <div class="listing-title">{{ .Key }}</div>
       {{ range .Pages }}
       <ul class="listing">
@@ -13,7 +13,14 @@
             </div>
             {{end}}
           </div>
-    </ul>{{ end }}
+    </ul>{{ end }}{{end}}{{else}}
+    {{ range .Pages }}
+    <ul class="listing">
+      <div class="listing-item">
+          {{ if not (eq .Type "note" "photo") }}<div class="listing-post"><a href="{{ .Permalink }}" title="{{ .Title }}">{{ .Title }}</div>{{else}}
+            <div class="listing-post"><a href="{{ .Permalink }}" title="{{ .Summary }}"><b>{{ humanize .Type }}:</b> {{ .Summary }}</div>{{end}}
+        </div>
+  </ul>{{ end }}
     {{ end }}</ul>
   </div>
 {{ end }}
diff --git a/themes/nipponalba/layouts/partials/taxonomy/categories.html b/themes/nipponalba/layouts/partials/taxonomy/categories.html
index 08433616..bacd02b9 100644
--- a/themes/nipponalba/layouts/partials/taxonomy/categories.html
+++ b/themes/nipponalba/layouts/partials/taxonomy/categories.html
@@ -1,6 +1,6 @@
 
 <ul class="categories">
 {{- range $index, $el := . -}}
-    <li><a class="category p-category" href="{{ ( printf "categories/%s/" ( . | urlize ) ) | relLangURL }}">{{ . }}</a></li>
+    <li><a class="category p-category" href="{{ ( printf "category/%s/" ( . | urlize ) ) | relLangURL }}">{{ . }}</a></li>
 {{- end -}}
 </ul>
diff --git a/themes/nipponalba/layouts/partials/taxonomy/tags.html b/themes/nipponalba/layouts/partials/taxonomy/tags.html
index 5cb48a0b..976aecbc 100644
--- a/themes/nipponalba/layouts/partials/taxonomy/tags.html
+++ b/themes/nipponalba/layouts/partials/taxonomy/tags.html
@@ -1,6 +1,6 @@
 
     <ul class="tags">
         {{- range $index, $el := . -}}
-      <li><a class="tag" href="{{ ( printf "tags/%s/" ( . | urlize ) ) | relLangURL }}">{{ . }}</a></li>
+      <li><a class="tag" href="{{ ( printf "tag/%s/" ( . | urlize ) ) | relLangURL }}">{{ . }}</a></li>
       {{- end -}}
     </ul>