Merge pull request #105 from gpospelov/master

Bug fix in sidebar menu and children description generation

Author: matcornic

layouts/partials/menu.html

@@ -111,11 +111,11 @@ <h3>{{ if not $disableShortcutsTitle}}{{ T "Shortcuts-Title"}}{{ end }}</h3>
       {{ $numberOfPages := (add (len .Pages) (len .Sections)) }}
       {{ if ne $numberOfPages 0 }}
         <ul>
-          {{ .Scratch.Set "pages" .Pages }}
+          {{ $currentNode.Scratch.Set "pages" .Pages }}
           {{ if .Sections}}
-            {{ .Scratch.Set "pages" (.Pages | union .Sections) }}
+            {{ $currentNode.Scratch.Set "pages" (.Pages | union .Sections) }}
           {{end}}
-          {{ $pages := (.Scratch.Get "pages") }}
+          {{ $pages := ($currentNode.Scratch.Get "pages") }}
 
         {{if eq .Site.Params.ordersectionsby "title"}}  
           {{ range $pages.ByTitle }}

layouts/shortcodes/children.html

@@ -67,11 +67,11 @@
 {{if eq $.style "li"}}
 <ul>
 {{end}}
-	{{ .Scratch.Set "pages" .Pages }}
+	{{ $.Page.Scratch.Set "pages" .Pages }}
     {{ if .Sections}}
-	    {{ .Scratch.Set "pages" (.Pages | union .Sections) }}
+	    {{ $.Page.Scratch.Set "pages" (.Pages | union .Sections) }}
     {{end}}
-    {{ $pages := (.Scratch.Get "pages") }}
+    {{ $pages := ($.Page.Scratch.Get "pages") }}
 
 	{{if eq $.sortTerm "Weight"}}
 		{{template "childs" dict "menu" $pages.ByWeight  "style" $.style "showhidden" $.showhidden "count" (add $.count 1) "depth" $.depth "pages" $.pages "description" $.description "sortTerm" $.sortTerm}}