From c8d40bec3a5ea681f3197ce0f3e2b9b238bfa8b9 Mon Sep 17 00:00:00 2001
From: uPagge <git@upagge.ru>
Date: Fri, 12 Mar 2021 00:43:31 +0300
Subject: add tag nav (release-2.0.1)

---
 layouts/partials/breadcrumbs.html | 24 ++++++++++++----------
 layouts/partials/header.html      | 43 ++++++++++++++++++++++++---------------
 layouts/partials/init.html        |  2 +-
 3 files changed, 41 insertions(+), 28 deletions(-)

(limited to 'layouts/partials')

diff --git a/layouts/partials/breadcrumbs.html b/layouts/partials/breadcrumbs.html
index f6c9b4c..742f7da 100644
--- a/layouts/partials/breadcrumbs.html
+++ b/layouts/partials/breadcrumbs.html
@@ -1,11 +1,13 @@
-<div class="breadcrumbs">
-    <a href="{{ .Site.Home.RelPermalink }}">{{ T "home" }} </a>
-    {{- with $.Params.categories -}}
-    {{- $category := index . 0 -}}
-    {{- with $category -}}
-    {{- $category = partialCached "function/path.html" . . | printf "/categories/%v" | $.Site.GetPage -}}
-    / <a href="{{ $category.RelPermalink }}">{{ $category.Title }} </a>
-    {{- end -}}
-    {{- end -}}
-    / <a href="/"> {{ .Title }} </a>
-</div>
\ No newline at end of file
+<nav class="breadcrumbs">
+    <ol>
+        <li><a href="{{ .Site.Home.RelPermalink }}">{{ T "home" }} </a></li>
+        {{- with $.Params.categories -}}
+        {{- $category := index . 0 -}}
+        {{- with $category -}}
+        {{- $category = partialCached "function/path.html" . . | printf "/categories/%v" | $.Site.GetPage -}}
+        <li><a href="{{ $category.RelPermalink }}">{{ $category.Title }} </a></li>
+        {{- end -}}
+        {{- end -}}
+        <li>{{ .Title }}</li>
+    </ol>
+</nav>
\ No newline at end of file
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 4087190..fa6337f 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -28,16 +28,21 @@
             </a>
         </div>
         <div class="menu">
-            <div class="menu-inner">
-                {{- range .Site.Menus.main -}}
+            <nav>
+                <ul class="menu-inner">
+                    {{- range .Site.Menus.main -}}
                     {{- $url := .URL | relLangURL -}}
                     {{- with .Page -}}
-                        {{- $url = .RelPermalink -}}
+                    {{- $url = .RelPermalink -}}
                     {{- end -}}
-                    <a class="menu-item{{ if $.IsMenuCurrent `main` . | or ($.HasMenuCurrent `main` .) | or (eq $.RelPermalink $url) }} active{{ end }}" href="{{ $url }}"{{ with .Title }} title="{{ . }}"{{ end }}{{ if (urls.Parse $url).Host }} rel="noopener noreffer" target="_blank"{{ end }}>
-                        {{- .Pre | safeHTML }} {{ .Name }} {{ .Post | safeHTML -}}
-                    </a>
-                {{- end -}}
+                    <li>
+                        <a class="menu-item{{ if $.IsMenuCurrent `main` . | or ($.HasMenuCurrent `main` .) | or (eq $.RelPermalink $url) }} active{{ end }}" href="{{ $url }}"{{ with .Title }} title="{{ . }}"{{ end }}{{ if (urls.Parse $url).Host }} rel="noopener noreffer" target="_blank"{{ end }}>
+                            {{- .Pre | safeHTML }} {{ .Name }} {{ .Post | safeHTML -}}
+                        </a>
+                    </li>
+                    {{- end -}}
+                </ul>
+            </nav>
                 {{- if .Site.Menus.main -}}
                     <span class="menu-item delimiter"></span>
                 {{- end -}}
@@ -80,7 +85,7 @@
                     <span class="svg-icon icon-moon"></span>
                 </a>
             </div>
-        </div>
+        </nav>
     </div>
 </header>
 
@@ -139,15 +144,21 @@
                 </div>
             {{- end -}}
             {{- $currentPage := . -}}
-            {{- range .Site.Menus.main -}}
-                {{- $url := .URL | relLangURL -}}
-                {{- with .Page -}}
+            <nav>
+                <ul>
+                    {{- range .Site.Menus.main -}}
+                    {{- $url := .URL | relLangURL -}}
+                    {{- with .Page -}}
                     {{- $url = .RelPermalink -}}
-                {{- end -}}
-                <a class="menu-item" href="{{ $url }}" title="{{ .Title }}"{{ if (urls.Parse $url).Host }} rel="noopener noreffer" target="_blank"{{ end }}>
-                    {{- .Pre | safeHTML }}{{ .Name }}{{ .Post | safeHTML -}}
-                </a>
-            {{- end -}}
+                    {{- end -}}
+                    <li>
+                        <a class="menu-item" href="{{ $url }}" title="{{ .Title }}"{{ if (urls.Parse $url).Host }} rel="noopener noreffer" target="_blank"{{ end }}>
+                            {{- .Pre | safeHTML }}{{ .Name }}{{ .Post | safeHTML -}}
+                        </a>
+                    </li>
+                    {{- end -}}
+                </ul>
+            </nav>
             <a href="javascript:void(0);" class="menu-item theme-switch" title="{{ T "switchTheme" }}">
                 <span class="svg-icon icon-moon"></span>
             </a>
diff --git a/layouts/partials/init.html b/layouts/partials/init.html
index cb7f167..c1fe61c 100644
--- a/layouts/partials/init.html
+++ b/layouts/partials/init.html
@@ -1,4 +1,4 @@
-{{- .Scratch.Set "version" "2.0.0" -}}
+{{- .Scratch.Set "version" "2.0.1" -}}
 
 {{- /* uBlogger theme version detection */ -}}
 {{- $VERSION := "2.0.X" -}}
-- 
cgit v1.2.3