fixing category and tag lists

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"

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,6 +13,13 @@
             </div>
             {{end}}
           </div>
+    </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>

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>

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>