From fce8e1d3284eec6c87dc407957e632c5f3ee3b46 Mon Sep 17 00:00:00 2001
From: Alexander Neonxp Kiryukhin <i@neonxp.ru>
Date: Sun, 1 Feb 2026 18:08:34 +0300
Subject: =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D1=88=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 themes/neonxp/assets/css/main.css          |  1 -
 themes/neonxp/layouts/_partials/terms.html | 31 ++++--------
 themes/neonxp/layouts/page.html            | 75 +++++++++++++++++-------------
 3 files changed, 53 insertions(+), 54 deletions(-)

(limited to 'themes/neonxp')

diff --git a/themes/neonxp/assets/css/main.css b/themes/neonxp/assets/css/main.css
index 6778acd..8402203 100644
--- a/themes/neonxp/assets/css/main.css
+++ b/themes/neonxp/assets/css/main.css
@@ -150,7 +150,6 @@ ul.pagination li:first-child a {
 pre {
   border-radius: var(--border-radius);
   border: 0.1px solid var(--border);
-  box-shadow: var(--shadow);
   padding: 0.5rem;
 }
 
diff --git a/themes/neonxp/layouts/_partials/terms.html b/themes/neonxp/layouts/_partials/terms.html
index f826abb..ec607ca 100644
--- a/themes/neonxp/layouts/_partials/terms.html
+++ b/themes/neonxp/layouts/_partials/terms.html
@@ -1,27 +1,16 @@
-{{- /*
-For a given taxonomy, renders a list of terms assigned to the page.
-
-@context {page} page The current page.
-@context {string} taxonomy The taxonomy.
-
-@example: {{ partial "terms.html" (dict "taxonomy" "tags" "page" .) }}
-*/}}
-
 {{- $page := .page }}
 {{- $taxonomy := .taxonomy }}
 
 {{- with $page.GetTerms $taxonomy }}
 {{- if . }}
-<article>
-  {{- $label := (index . 0).Parent.LinkTitle }}
-  <div>
-    <h3>{{ $label }}:</h3>
-    <ul class="taxonomy">
-      {{- range . }}
-      <li><a href="{{ .RelPermalink }}">{{ .LinkTitle }}</a></li>
-      {{- end }}
-    </ul>
-  </div>
-  {{- end }}
-</article>
+{{- $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 }}
\ No newline at end of file
diff --git a/themes/neonxp/layouts/page.html b/themes/neonxp/layouts/page.html
index 506b56a..6bc6380 100644
--- a/themes/neonxp/layouts/page.html
+++ b/themes/neonxp/layouts/page.html
@@ -1,37 +1,48 @@
 {{ define "main" }}
-<div class="h-entry">
-  <article>
-    <h1 class="p-name">{{ .Title }}</h1>
-    {{if .Date }}
-    {{ $dateMachine := .Date | time.Format "2006-01-02T15:04:05-07:00" }}
-    {{ $dateHuman := .Date | time.Format ":date_long" }}
-    <time class="dt-published" datetime="{{ $dateMachine }}">{{ $dateHuman }}</time>
-    {{end}}
-  </article>
-  <article class="e-content">
+<article class="h-entry">
+  <h1 class="p-name">{{ .Title }}</h1>
+  {{if .Date }}
+  {{ $dateMachine := .Date | time.Format "2006-01-02T15:04:05-07:00" }}
+  {{ $dateHuman := .Date | time.Format ":date_long" }}
+  <time class="dt-published" datetime="{{ $dateMachine }}">{{ $dateHuman }}</time>
+  {{end}}
+  <div class="e-content">
     {{ .Content }}
-  </article>
+  </div>
   {{ partial "terms.html" (dict "taxonomy" "tags" "page" .) }}
-  {{if .Param "comments"}}
-  <h2>Комментарии</h2>
-  {{ range $key, $comment := where .Site.Data.comments "url" "eq" .Page.Path }}
-  <article>
-    <b>{{$comment.from}}:</b>
-    <p>{{$comment.comment}}</p>
-  </article>
-  {{ else }}
-  <article>Комментариев пока нет.</article>
-  {{ end }}
-
-  <article>
-    {{ $comment := (print "mailto:blog@neonxp.ru?subject=" .Page.Permalink | safeHTML) }}
-    Для отправки комментария достаточно отправить e-mail со своим комментарием
-    на адрес
-    <a href={{$comment}}>blog@neonxp.ru</a>, в теме нужно указать ссылку на
-    пост.<br />
-    Или просто нажать кнопку ниже. Всё очень просто :)<br />
-    <a class="btn-primary" href={{$comment}}>Написать комментарий</a>
-  </article>
+</article>
+{{if .Param "comments"}}
+<h2>Комментарии</h2>
+{{ range $key, $comment := where .Site.Data.comments "subject" "eq" .Page.Permalink }}
+<article>
+  <b>{{$comment.from_name}}:</b>
+  <p>
+    {{if $comment.date }}
+    {{ $dateMachine := $comment.date | time.Format "2006-01-02T15:04:05-07:00" }}
+    {{ $dateHuman := $comment.date | time.Format ":date_long" }}
+    <time class="dt-published" datetime="{{ $dateMachine }}">{{ $dateHuman }}</time>
+    {{end}}
+  </p>
+  <pre>{{$comment.body | safeHTML}}</pre>
+  {{if $comment.body_signature}}
+  <details>
+    <summary>Подпись</summary>
+    <pre>{{$comment.body_signature| safeHTML}}</pre>
+  </details>
   {{end}}
-</div>
+</article>
+{{ else }}
+<article>Комментариев пока нет.</article>
+{{ end }}
+
+<article>
+  {{ $comment := (print "mailto:blog@neonxp.ru?subject=" .Page.Permalink | safeHTML) }}
+  Для отправки комментария достаточно отправить e-mail со своим комментарием
+  на адрес
+  <a href={{$comment}}>blog@neonxp.ru</a>, в теме нужно указать ссылку на
+  пост.<br />
+  Или просто нажать кнопку ниже. Всё очень просто :)<br />
+  <a class="btn-primary" href={{$comment}}>Написать комментарий</a>
+</article>
+{{end}}
 {{ end }}
\ No newline at end of file
-- 
cgit v1.2.3