update topbar

layouts/partials/topbar.html

@@ -5,18 +5,32 @@
       {{ $page := . }}
       {{ $url := .RelPermalink }}
       {{ $paths := split (trim $url "/") "/" }}
+      {{ $is_home := or (eq $url "/") (eq $url (relLangURL "/")) }}
 
-      {{ if or (eq $url "/") (eq $url (relLangURL "/")) }}
+      {{ if $is_home }}
         <!-- index page -->
         <span>{{ T "tabs.home" | title }}</span>
       {{else}}
-        {{ range $index, $item := $paths }}
-          {{ if eq $index 0 }}
         <span>
           <a href="{{ "/" | relLangURL }}">
             {{- T "tabs.home" | title -}}
           </a>
         </span>
+        {{ if eq $page.Type "tags" }}
+          {{ if .Data.Term}}
+            <span><a href="{{ "/tags/" | relLangURL }}">{{i18n "tabs.tags"}}</a></span>
+            <span>{{ .Data.Term }}</span>
+          {{ else }}
+            <span>{{i18n "tabs.tags"}}</span>
+          {{ end }}
+        {{ else if eq $page.Type "categories" }}
+          {{ if .Data.Term}}
+            <span><a href="{{ "/categories/" | relLangURL }}">{{i18n "tabs.categories"}}</a></span>
+            <span>{{ .Data.Term }}</span>
+          {{ else }}
+            <span>{{i18n "tabs.categories"}}</span>
+          {{ end }}
+        {{ else }}
         
           {{ $currentMenuEntry := "" }}
           {{ range site.Menus.main }}
@@ -33,7 +47,6 @@
           {{ end }}
 
 
-          {{ end }}
         {{ end }}
       {{ end }}
     </nav>