4 files changed, 54 insertions, 2 deletions
diff --git a/themes/neonxp/layouts/_default/taxonomy.html b/themes/neonxp/layouts/_default/taxonomy.html
new file mode 100644
index 0000000..ac5fc7d
--- /dev/null
+++ b/themes/neonxp/layouts/_default/taxonomy.html
@@ -0,0 +1,20 @@
+{{ define "main" }}
+<article>
+  <h1>{{ .Title }}</h1>
+  {{ .Content }}
+</article>
+{{ range .Data.Pages }}
+<article class="h-entry">
+  <h2 class="p-name"><a class="u-url" href="{{ .RelPermalink }}">{{ .LinkTitle }}</a></h2>
+  {{if .Date }}
+  {{ $dateMachine := .Date | time.Format "2006-01-02 15:04:05-07:00" }}
+  {{ $dateHuman := .Date | time.Format ":date_long" }}
+  <time class="dt-published" datetime="{{ $dateMachine }}">{{ $dateHuman }}</time>
+  {{end}}
+  <div class="p-summary">
+    {{ .Summary }}
+  </div>
+  <a class="btn-primary" href="{{ .RelPermalink }}">Читать дальше...</a>
+</article>
+{{ end }}
+{{ end }}
+\ No newline at end of file
diff --git a/themes/neonxp/layouts/_default/terms.html b/themes/neonxp/layouts/_default/terms.html
new file mode 100644
index 0000000..49d993f
--- /dev/null
+++ b/themes/neonxp/layouts/_default/terms.html
@@ -0,0 +1,17 @@
+{{ define "main" }}
+<article>
+    <h1>{{ i18n .Title }}</h1>
+    {{ .Content }}
+</article>
+<article>
+    <ul class="terms">
+        {{ range $key, $value := .Data.Terms }}
+        {{ $postCount := len $value.Pages -}}
+
+        <li><a href="
+             /{{ $.Data.Plural | urlize }}/{{ $key | urlize }}">{{ $key
+                }}</a>&nbsp;({{$postCount}})</li>
+        {{ end }}
+    </ul>
+</article>
+{{ end }}
+\ No newline at end of file
diff --git a/themes/neonxp/layouts/_partials/terms.html b/themes/neonxp/layouts/_partials/terms.html
index ec607ca..b666922 100644
--- a/themes/neonxp/layouts/_partials/terms.html
+++ b/themes/neonxp/layouts/_partials/terms.html
@@ -1,7 +1,20 @@
 {{- $page := .page }}
-{{- $taxonomy := .taxonomy }}
 
-{{- with $page.GetTerms $taxonomy }}
+{{- with $page.GetTerms "categories" }}
+{{- if . }}
+{{- $label := (index . 0).Parent.LinkTitle }}
+<div>
+  <h3>{{ i18n $label }}:</h3>
+  <ul class="taxonomy">
+    {{- range . }}
+    <li><a href="{{ .RelPermalink }}">{{ .LinkTitle }}</a></li>
+    {{- end }}
+  </ul>
+</div>
+{{- end }}
+{{- end }}
+
+{{- with $page.GetTerms "tags" }}
 {{- if . }}
 {{- $label := (index . 0).Parent.LinkTitle }}
 <div>
diff --git a/themes/neonxp/layouts/page.html b/themes/neonxp/layouts/page.html
index 98ddec9..c28ab39 100644
--- a/themes/neonxp/layouts/page.html
+++ b/themes/neonxp/layouts/page.html
@@ -9,6 +9,8 @@
   <div class="e-content">
     {{ .Content }}
   </div>
+</article>
+<article>
   {{ partial "terms.html" (dict "taxonomy" "tags" "page" .) }}
 </article>
 {{if .Param "comments"}}