Marker-Klassen für die Submenü-Einträge korrigiert

diff --git a/layouts/_partials/menu/blog.html b/layouts/_partials/menu/blog.html
index 6aa433f0da559e944b6c26988987fb94c3786aa9..ff6fdc2bdff0c890f7bca7fc99f73a317290f7e9 100644 (file)
--- a/layouts/_partials/menu/blog.html
+++ b/layouts/_partials/menu/blog.html
@@ -15,7 +15,7 @@
   <h2 class="nav submenu">
     <a class="s selected" href="{{ site.Home.RelPermalink }}">Home</a>
   </h2>
-  <ul id="submenu" class="submenu selected">
+  <ul id="submenu" class="s active">
     {{- range $page.Site.MainSections }}
     {{- with site.GetPage "section" . }}
     {{- if eq .Path "/blog" }}

diff --git a/layouts/_partials/menu/default.html b/layouts/_partials/menu/default.html
index cbe98f810fce085ac31cd579f0eb11f552d9a91b..10c72c761eedde82002507f0666acaba624f00f2 100644 (file)
--- a/layouts/_partials/menu/default.html
+++ b/layouts/_partials/menu/default.html
@@ -15,7 +15,7 @@
   <h2 class="nav submenu">
     <a class="s selected" href="{{ site.Home.RelPermalink }}">Home</a>
   </h2>
-  <ul id="submenu" class="submenu selected">
+  <ul id="submenu" class="s active">
   {{- partial "menu/tree.html" (dict "pages" $page.Site.Sections "page" $page) }}
   </ul>
   <hr class="n"/>

diff --git a/layouts/blog/archive/page.html b/layouts/blog/archive/page.html
index 2fe89e4af82d323fe83e19b07cdd66b69e046c51..bf88f382c491ee2df616bcbe020ca16327f62803 100644 (file)
--- a/layouts/blog/archive/page.html
+++ b/layouts/blog/archive/page.html
@@ -32,17 +32,17 @@
   <h2 class="nav submenu">
     <a class="s selected" href="{{ site.Home.RelPermalink }}">Home</a>
   </h2>
-  <ul id="submenu" class="submenu selected">
+  <ul id="submenu" class="s active">
     {{- range $page.Site.MainSections }}
     {{- with site.GetPage "section" . }}
     {{- if eq .Path "/blog" }}
     <li class="s sub">
       <a  href="{{ .RelPermalink }}" class="s selected">{{ .LinkTitle }}</a>
-      <ul class="s">
+      <ul class="s active">
         {{- range .Pages -}}
         <li class="s sub">
           <a href="{{ .RelPermalink }}" class="s selected">{{ .LinkTitle }}</a>
-          <ul class="s">
+          <ul class="s active">
             {{- range .Pages -}}
             <li class="s">
               <a href="{{ .RelPermalink }}" class="s{{ if or (eq . $page) (eq .LinkTitle ($page.Date | time.Format "2006")) }} selected{{ end }}">{{ .LinkTitle }}</a>

diff --git a/layouts/blog/archive/section.html b/layouts/blog/archive/section.html
index b50e04ad16898193724057a17b23cff3d5560bc9..938d5f021abe7eb8f116efed65ed7d55134e35b6 100644 (file)
--- a/layouts/blog/archive/section.html
+++ b/layouts/blog/archive/section.html
@@ -34,3 +34,67 @@
       </div>
 {{- end }}
 {{- end }}{{/* end main */}}
+
+{{- define "menu" }}
+{{- $page := $ }}
+<nav id="nav">
+  <hr class="n"/>
+  <a class="hide" href="#top" title="Show Content">Jump back to the top of the page</a>
+  <h1 class="nav">Navigation</h1>
+  <h2 class="nav menu">Section-Menu</h2>
+  <ul id="menu" class="cf">
+    {{- range $page.Site.MainSections }}
+    {{- $section := site.GetPage "section" . }}
+    <li class="m {{ . }}">
+      <a href="{{ $section.RelPermalink }}" class="{{ cond (eq $page.Section .) "m selected" "m" }}">{{ $section.LinkTitle }}</a>
+    </li>
+    {{- end }}
+  </ul>
+  <h2 class="nav submenu">
+    <a class="s selected" href="{{ site.Home.RelPermalink }}">Home</a>
+  </h2>
+  <ul id="submenu" class="s active">
+    {{- range $page.Site.MainSections }}
+    {{- with site.GetPage "section" . }}
+    {{- if eq .Path "/blog" }}
+    <li class="s sub">
+      <a  href="{{ .RelPermalink }}" class="s selected">{{ .LinkTitle }}</a>
+      <ul class="s active">
+        {{- range .Pages -}}
+        <li class="s sub">
+          <a href="{{ .RelPermalink }}" class="s selected">{{ .LinkTitle }}</a>
+          <ul class="s active">
+            {{- range .Pages -}}
+            <li class="s">
+              <a href="{{ .RelPermalink }}" class="s">{{ .LinkTitle }}</a>
+            </li>
+            {{ end }}
+          </ul>
+        </li>
+        <li class="s off">
+          {{- with $.Site.GetPage "/categories" -}}
+          <a href="{{ .RelPermalink }}" class="s">{{ .LinkTitle }}</a>
+          {{- end -}}
+        </li>
+        <li class="s off">
+          {{- with $.Site.GetPage "/tags" -}}
+          <a href="{{ .RelPermalink }}" class="s">{{ .LinkTitle }}</a>
+          {{- end -}}
+        </li>
+        {{ end }}
+      </ul>
+    </li>
+    {{- else }}
+    <li class="s{{ if or .Pages .Sections}} sub{{ end }} off">
+      <a  href="{{ .RelPermalink }}" class="s">{{ .LinkTitle }}</a>
+      <ul class="s">
+      {{- partial "menu/tree.html" (dict "pages" .Pages "page" $page) }}
+      </ul>
+    </li>
+    {{- end }}{{/* if */}}
+    {{- end }}{{/* with */}}
+    {{- end }}{{/* range */}}
+  </ul>
+  <hr class="n"/>
+</nav>
+{{- end }}{{/* end menu */}}

diff --git a/layouts/blog/archive/year.html b/layouts/blog/archive/year.html
index 54167c6a08f74885bcbe48dbcf0eaa6c24f4fd73..6c8900c6dfe56a128e2002d81833a9d02655b176 100644 (file)
--- a/layouts/blog/archive/year.html
+++ b/layouts/blog/archive/year.html
@@ -64,17 +64,17 @@
   <h2 class="nav submenu">
     <a class="s selected" href="{{ site.Home.RelPermalink }}">Home</a>
   </h2>
-  <ul id="submenu" class="submenu selected">
+  <ul id="submenu" class="s active">
     {{- range $page.Site.MainSections }}
     {{- with site.GetPage "section" . }}
     {{- if eq .Path "/blog" }}
     <li class="s sub">
       <a  href="{{ .RelPermalink }}" class="s selected">{{ .LinkTitle }}</a>
-      <ul class="s">
+      <ul class="s active">
         {{- range .Pages -}}
         <li class="s sub">
           <a href="{{ .RelPermalink }}" class="s selected">{{ .LinkTitle }}</a>
-          <ul class="s">
+          <ul class="s active">
             {{- range .Pages -}}
             <li class="s">
               <a href="{{ .RelPermalink }}" class="s{{ if or (eq . $page) (eq .LinkTitle ($page.Date | time.Format "2006")) }} selected{{ end }}">{{ .LinkTitle }}</a>

diff --git a/layouts/blog/section.html b/layouts/blog/section.html
index 2f7b25092cb073656a1f15ab0b249f9d94394bb8..ff9c3cb609c4dd8fd8e8fe33e0d965914615060e 100644 (file)
--- a/layouts/blog/section.html
+++ b/layouts/blog/section.html
@@ -16,15 +16,15 @@
   <h2 class="nav submenu">
     <a class="s selected" href="{{ site.Home.RelPermalink }}">Home</a>
   </h2>
-  <ul id="submenu" class="submenu selected">
+  <ul id="submenu" class="s active">
     {{- range $page.Site.MainSections }}
     {{- with site.GetPage "section" . }}
     {{- if eq .Path "/blog" }}
     <li class="s sub">
       <a  href="{{ .RelPermalink }}" class="s selected">{{ .LinkTitle }}</a>
-      <ul class="s">
+      <ul class="s active">
         {{- range .Pages -}}
-        <li class="s">
+        <li class="s sub">
           <a href="{{ .RelPermalink }}" class="s">{{ .LinkTitle }}</a>
         </li>
         <li class="s">

diff --git a/layouts/categories/taxonomy.html b/layouts/categories/taxonomy.html
index 8afdd174b24c151a87d9ef4c29d1324da6d1fa51..117a048c39a58516c91484e57dd6c3e8249e9d8e 100644 (file)
--- a/layouts/categories/taxonomy.html
+++ b/layouts/categories/taxonomy.html
@@ -32,15 +32,15 @@
   <h2 class="nav submenu">
     <a class="s selected" href="{{ site.Home.RelPermalink }}">Home</a>
   </h2>
-  <ul id="submenu" class="submenu selected">
+  <ul id="submenu" class="s active">
     {{- range $page.Site.MainSections }}
     {{- with site.GetPage "section" . }}
     {{- if eq .Path "/blog" }}
     <li class="s sub">
       <a  href="{{ .RelPermalink }}" class="s selected">{{ .LinkTitle }}</a>
-      <ul class="s">
+      <ul class="s active">
         {{- range .Pages -}}
-        <li class="s">
+        <li class="s sub">
           <a href="{{ .RelPermalink }}" class="s">{{ .LinkTitle }}</a>
         </li>
         <li class="s">

diff --git a/layouts/categories/term.html b/layouts/categories/term.html
index 3df28692faa939446e8a504feddcdc03f4114025..7f6f1a8e5f613aa60bdc0b852cf627dcb7a08f3f 100644 (file)
--- a/layouts/categories/term.html
+++ b/layouts/categories/term.html
@@ -32,13 +32,13 @@
   <h2 class="nav submenu">
     <a class="s selected" href="{{ site.Home.RelPermalink }}">Home</a>
   </h2>
-  <ul id="submenu" class="submenu selected">
+  <ul id="submenu" class="s active">
     {{- range $page.Site.MainSections }}
     {{- with site.GetPage "section" . }}
     {{- if eq .Path "/blog" }}
     <li class="s sub">
       <a  href="{{ .RelPermalink }}" class="s selected">{{ .LinkTitle }}</a>
-      <ul class="s">
+      <ul class="s active">
         {{- range .Pages -}}
         <li class="s off">
           <a href="{{ .RelPermalink }}" class="s">{{ .LinkTitle }}</a>
@@ -46,7 +46,7 @@
         <li class="s sub">
           {{- with $.Site.GetPage "/categories" -}}
           <a href="{{ .RelPermalink }}" class="s selected">{{ .LinkTitle }}</a>
-          <ul class="s">
+          <ul class="s active">
             {{- range .Pages -}}
             <li class="s">
               <a  href="{{ .RelPermalink }}" class="s {{ if eq . $ }} selected{{ end }}">{{ .LinkTitle }}</a>
@@ -66,7 +66,7 @@
     {{- else }}
     <li class="s{{ if or .Pages .Sections}} sub{{ end }} off">
       <a  href="{{ .RelPermalink }}" class="s">{{ .LinkTitle }}</a>
-      <ul class="s">
+      <ul class="s active">
       {{- partial "menu/tree.html" (dict "pages" .Pages "page" $page) }}
       </ul>
     </li>

diff --git a/layouts/tags/taxonomy.html b/layouts/tags/taxonomy.html
index 3c8a37bc0e93f902e6326805c677dbdcec94c154..4c0b6304a450f1894063d44340b73d09e3d120e8 100644 (file)
--- a/layouts/tags/taxonomy.html
+++ b/layouts/tags/taxonomy.html
@@ -32,15 +32,15 @@
   <h2 class="nav submenu">
     <a class="s selected" href="{{ site.Home.RelPermalink }}">Home</a>
   </h2>
-  <ul id="submenu" class="submenu selected">
+  <ul id="submenu" class="s active">
     {{- range $page.Site.MainSections }}
     {{- with site.GetPage "section" . }}
     {{- if eq .Path "/blog" }}
     <li class="s sub">
       <a  href="{{ .RelPermalink }}" class="s selected">{{ .LinkTitle }}</a>
-      <ul class="s">
+      <ul class="s active">
         {{- range .Pages -}}
-        <li class="s">
+        <li class="s sub">
           <a href="{{ .RelPermalink }}" class="s">{{ .LinkTitle }}</a>
         </li>
         <li class="s">