Merge pull request #574 from gethinode/develop

Fix section menu initialization

exampleSite/content/fr/blog/bootstrap-elements.md

@@ -404,11 +404,11 @@ H{{</* sub 2 */>}}O est un liquide.
 <!-- markdownlint-disable MD037 -->
 {{< example lang="hugo" >}}
 {{</* button toast="toast-example-1" */>}}
-    Affiche la notifiaction #1
+    Affiche la notification #1
 {{</* /button */>}}
 
 {{</* button toast="toast-example-2" */>}}
-    Affiche la notifiaction #1
+    Affiche la notification #1
 {{</* /button */>}}
 
 {{</* toast id="toast-example-1" header="Premier titre" */>}}

exampleSite/go.sum

@@ -33,6 +33,8 @@ github.com/gethinode/mod-katex v1.0.2 h1:pIG4n3qLl/IVe7BEiwn+GL8r5lOCtF6FDxlcrPK
 github.com/gethinode/mod-katex v1.0.2/go.mod h1:byAfpI3wuqNJIooTGVEGc1cjBhhCy4+CcK1H6495MYg=
 github.com/gethinode/mod-katex v1.0.3 h1:fvlUWqcUQqv2zRNM2kfmJ6GhXA816Tl1nfVrUkmBStI=
 github.com/gethinode/mod-katex v1.0.3/go.mod h1:byAfpI3wuqNJIooTGVEGc1cjBhhCy4+CcK1H6495MYg=
+github.com/gethinode/mod-katex v1.0.4 h1:NozgWPFnHhx1W+E9DnwMTRpvxPbdqdANEtwp9N3/mj8=
+github.com/gethinode/mod-katex v1.0.4/go.mod h1:byAfpI3wuqNJIooTGVEGc1cjBhhCy4+CcK1H6495MYg=
 github.com/gethinode/mod-leaflet v0.3.4 h1:oY+YQ0JiJuhFQNrk9XgFdg0NMsTUQPXNfnILp4ia4r4=
 github.com/gethinode/mod-leaflet v0.3.4/go.mod h1:uGggt87x4Fw7wBoJpSiUvNkYg+s/Ujne7klAX2rxMRk=
 github.com/gethinode/mod-leaflet v0.3.5 h1:69Bv/6zRXhbcTzo7TMr58h3ry47srHRpM1k81LrLbYU=

exampleSite/hugo_stats.json

@@ -54,7 +54,6 @@
       "alert",
       "alert-danger",
       "alert-dismissible",
-      "align-content-center",
       "align-items-center",
       "align-items-end",
       "align-items-start",
@@ -203,13 +202,11 @@
       "fab",
       "fade",
       "fas",
-      "feature",
       "figure-caption",
       "fixed-top",
       "flex-column",
       "flex-fill",
       "flex-grow-1",
-      "flex-wrap",
       "font-monospace",
       "footer",
       "form-control",

go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/gethinode/mod-bootstrap v1.2.1 // indirect
 	github.com/gethinode/mod-flexsearch v1.5.1 // indirect
 	github.com/gethinode/mod-fontawesome v1.5.0 // indirect
-	github.com/gethinode/mod-katex v1.0.3 // indirect
+	github.com/gethinode/mod-katex v1.0.4 // indirect
 	github.com/gethinode/mod-leaflet v0.3.5 // indirect
 	github.com/gethinode/mod-lottie v1.3.0 // indirect
 )

go.sum

@@ -64,6 +64,8 @@ github.com/gethinode/mod-katex v1.0.2 h1:pIG4n3qLl/IVe7BEiwn+GL8r5lOCtF6FDxlcrPK
 github.com/gethinode/mod-katex v1.0.2/go.mod h1:byAfpI3wuqNJIooTGVEGc1cjBhhCy4+CcK1H6495MYg=
 github.com/gethinode/mod-katex v1.0.3 h1:fvlUWqcUQqv2zRNM2kfmJ6GhXA816Tl1nfVrUkmBStI=
 github.com/gethinode/mod-katex v1.0.3/go.mod h1:byAfpI3wuqNJIooTGVEGc1cjBhhCy4+CcK1H6495MYg=
+github.com/gethinode/mod-katex v1.0.4 h1:NozgWPFnHhx1W+E9DnwMTRpvxPbdqdANEtwp9N3/mj8=
+github.com/gethinode/mod-katex v1.0.4/go.mod h1:byAfpI3wuqNJIooTGVEGc1cjBhhCy4+CcK1H6495MYg=
 github.com/gethinode/mod-leaflet v0.2.3 h1:QQI4h+IH0jZ7fx4q0um2YIEiYBoW3OAfW8qHzbRCDPk=
 github.com/gethinode/mod-leaflet v0.2.3/go.mod h1:uGggt87x4Fw7wBoJpSiUvNkYg+s/Ujne7klAX2rxMRk=
 github.com/gethinode/mod-leaflet v0.3.1 h1:H5MaOa+BB1KuVw7abTqfIn/SNzzRsAyx/WQoSe+2Ykc=

hugo_stats.json

@@ -27,7 +27,6 @@
     ],
     "classes": [
       "active",
-      "align-content-center",
       "align-items-center",
       "align-self-center",
       "bg-body",
@@ -78,12 +77,10 @@
       "fa-sun",
       "fab",
       "fas",
-      "feature",
       "fixed-top",
       "flex-column",
       "flex-fill",
       "flex-grow-1",
-      "flex-wrap",
       "footer",
       "form-control",
       "fs-3",
@@ -168,8 +165,7 @@
       "toast-container",
       "toast-header",
       "toggler-icon",
-      "top-bar",
-      "w-100"
+      "top-bar"
     ],
     "ids": [
       "-theme",

layouts/404.html

@@ -1,13 +1,15 @@
 {{ define "main"}}
-    <div class="container-xxl flex-fill d-flex align-content-center flex-wrap feature">
-        <div class="w-100 text-center">
-            <span class="text-secondary fw-bold">
-                {{ partial "assets/icon.html" (dict "icon" "fa face-frown fa-10x") }}
-                <p class="display-1 mt-3 fw-bold">404</p>
-                <p class="fs-3">{{ T "pageNotFoundTitle" }}</p>
-            </span>
-            {{- $home := printf "<a href=\"%s\">%s</a>" ("/" | relLangURL) (T "pageNotFoundHome") -}}
-            <p>{{ T "pageNotFound" $home | safeHTML }}</p>
+    <div class="d-flex flex-fill">
+        <div class="container-xxl my-auto">
+            <div class="text-center">
+                <span class="text-secondary fw-bold">
+                    {{ partial "assets/icon.html" (dict "icon" "fa face-frown fa-10x") }}
+                    <p class="display-1 mt-3 fw-bold">404</p>
+                    <p class="fs-3">{{ T "pageNotFoundTitle" }}</p>
+                </span>
+                {{- $home := printf "<a href=\"%s\">%s</a>" ("/" | relLangURL) (T "pageNotFoundHome") -}}
+                <p>{{ T "pageNotFound" $home | safeHTML }}</p>
+            </div>
         </div>
     </div>
 {{ end }}

layouts/_default/baseof.html

@@ -40,18 +40,9 @@
 {{- end -}}
 
 {{- /* Define section headings */ -}}
-{{- $headings := slice -}}
-{{ if .Fragments }}
-    {{ $headings = $headings | append .Title }}
-    {{- range .Fragments.Headings }}
-        {{- range .Headings }}
-            {{- $headings = $headings | append .Title -}}
-        {{- end -}}
-    {{- end -}}
-{{ end }}
-{{- $.Scratch.Set "headings" $headings -}}
+{{ $sections := partial "utilities/GetSections.html" . }}
+{{- $.Scratch.Set "sections" $sections -}}
 
-{{- $section := .Section }}
 {{- $fullCover := or (or (and .IsHome .Site.Params.home.fullCover) .Page.Params.fullCover) .Site.Params.main.footerBelowFold }}
 
 <!doctype html>
@@ -63,7 +54,7 @@
     <body>
         {{- partial "footer/scripts.html" (dict "filename" "js/critical.bundle.js" "match" "js/critical/**.js" "header" true "page" .) -}}
         <div class="d-flex flex-column min-vh-100">
-            <div class="{{ if $fullCover }} fullscreen{{ end }}{{ if .IsHome }} {{ .Site.Params.home.style }}{{ end }}">
+            <div class="d-flex flex-column {{ if $fullCover }} fullscreen{{ end }}{{ if .IsHome }} {{ .Site.Params.home.style }}{{ end }}">
                 {{- partial "assets/navbar.html" (dict
                     "page" .
                     "fixed" (string site.Params.navigation.fixed)
@@ -75,16 +66,12 @@
                     {{ block "featured" . }}{{ end -}}
                 </div>
                 {{ if .Site.Params.main.footerBelowFold }}
-                    <div class="flex-fill">
-                        {{ block "main" . }}{{ end -}}
-                    </div>
+                    {{ block "main" . }}{{ end -}}
                 {{ end }}
             </div>
 
             {{ if not .Site.Params.main.footerBelowFold }}
-                <div class="flex-fill">
-                    {{ block "main" . }}{{ end -}}
-                </div>
+                {{ block "main" . }}{{ end -}}
                 {{- partial "footer/social.html" . -}}
                 {{- partial "footer/footer.html" . -}}
             {{ end }}

layouts/_default/list.html

@@ -1,5 +1,11 @@
 {{- define "featured" }}
-    {{- $headings := $.Scratch.Get "headings" -}}
+    {{- $sections := $.Scratch.Get "sections" -}}
+    {{- $headings := slice }}
+    {{ if .Params.sectionMenu }}
+        {{ range $sections }}
+            {{ $headings = $headings | append .title }}
+        {{ end }}
+    {{ end }}
 
     {{- $page := . -}}
     {{- $orientation := site.Params.list.feature.orientation | default "horizontal" -}}
@@ -33,87 +39,10 @@
 
 {{- define "main" -}}
     {{- $page := . -}}
-    {{- $sections := slice -}}
-    {{- $sections = $sections | append $page.Type -}}
-    {{ with $page.Params.sections }}
-        {{ $sections = $sections | append . }}
-    {{ end }}
-    {{- $headings := slice -}}
+    {{- $sections := $.Scratch.Get "sections" -}}
     {{- $layout := $page.Params.layout -}}
 
-    {{ if $page.IsHome }}
-        {{- if not $page.Params.sections -}}
-            {{- with site.Params.home.sections }}
-                {{ $sections = $sections | append . }}
-            {{ else }}
-                {{ range $section := site.Sections }}
-                    {{ $sections = $sections | append $section.Type }}
-                {{ end }}
-            {{ end }}
-        {{- end -}}
-    {{ else }}
-        {{ $headings = $headings | append $page.Title }}
-        {{- range .Fragments.Headings }}
-            {{- range .Headings }}
-                {{- $headings = $headings | append .Title -}}
-            {{- end -}}
-        {{- end -}}
-    {{ end }}
-
-    {{/* Generate section content first to determine headings */}}
-    {{ $body := "" }}
-    {{- range $index, $section := $sections -}}
-        {{- $sectionPage := site.GetPage "section" $section -}}
-        {{- $sectionURL := $sectionPage.RelPermalink -}}
-        {{ with $sectionPage.Params.redirect}}
-            {{ $target := partial "utilities/GetPage.html" (dict "url" . "page" $page) }}
-            {{- if not $target -}}
-                {{ if eq (printf "%T" $page.File) "*hugolib.fileInfo"}}
-                    {{- errorf "Cannot find redirect target on page '%s': %s" $page.File . -}}
-                {{ else }}
-                    {{- errorf "Cannot find redirect target: %s" . -}}
-                {{ end }}
-            {{ else }}
-                {{- $sectionURL = $target.RelPermalink -}}
-            {{ end }}
-        {{ end }}
-        {{- $title := or $sectionPage.Title $sectionPage.Type -}}
-
-        {{- with (index site.Params.sections $section) -}}
-            {{- with index . "title" }}{{ $title = or . $title }}{{ end -}}
-        {{- end -}}
-    
-        {{- $thumbnail := (or (and (reflect.IsMap $sectionPage.Params.Thumbnail) $sectionPage.Params.Thumbnail.url) $sectionPage.Params.Thumbnail) -}}
-        {{- $icon := $sectionPage.Params.Icon -}}
-        {{- $content := $sectionPage.Content -}}
-        {{- $sectionTitle := strings.FirstUpper $sectionPage.Type -}}
-        {{- $moreTitle := "" -}}
-        {{- with (index site.Params.sections $section) -}}
-            {{- with index . "reference" }}{{ $moreTitle = . }}{{ end -}}
-        {{- end -}}
-        {{- $moreTitle = or $moreTitle (printf (T "more" (pluralize $sectionTitle))) -}}
-
-        {{- $sectionContent := trim (partial "assets/section-list.html" (dict 
-            "page" $page 
-            "section" $section 
-            "home" $page.IsHome
-            "simple" (eq (len $sections) 1)
-            "nested" (and $page.IsHome (eq $section $page.Section))
-            "thumbnail" $thumbnail
-            "icon" $icon
-            "content" $content
-            "moreTitle" $moreTitle
-            "sectionURL" $sectionURL)) " \r\n"
-        -}}
-
-        {{ if $sectionContent }}
-            {{- if not $page.IsHome }}{{ $headings = $headings | append $title }}{{ end -}}
-            {{- $body = printf "%s%s" $body $sectionContent }}
-        {{ end }}
-    {{- end -}}
-
-    {{/* Display main content */}}
-    <div class="container-xxl px-4 px-xxl-0">
+    <div class="container-xxl flex-fill px-4 px-xxl-0">
         {{- if ne $layout "featured" -}}
             {{ if and (not $page.IsHome) site.Params.navigation.breadcrumb }}
                 <div>{{ partial "assets/breadcrumb.html" $page }}</div>
@@ -130,7 +59,7 @@
                 {{- end -}}
                 {{- $content := partial "utilities/ProcessContent" (dict "page" $page "raw" $page.RawContent) -}}
                 {{ $content | safeHTML }}
-                {{ if and (and (and $sections (eq (len $sections) 1)) (not $body)) (not $content) }}
+                {{ if and (and $sections (eq (len $sections) 1)) (not $content) }}
                     <p class="pt-4">{{- T "emptyList" }}.</p>
                 {{ end }}
             </div>
@@ -153,5 +82,7 @@
     </div>
 
     {{/* Display generated sections */}}
-    {{ $body | safeHTML }}
+    {{ range $sections }}
+        {{ .content | safeHTML }}
+    {{ end }}
 {{- end -}}

layouts/_default/single.html

@@ -45,7 +45,7 @@
         </div>
     {{ end }}
 
-    <div class="container-xxl p-4 px-xxl-0">
+    <div class="container-xxl flex-fill p-4 px-xxl-0">
         {{ if and $menu $hasSidebar -}}
             <div class="row row-cols-md-2 row-cols-lg-3">
                 <div class="col col-md-3 col-lg-2 d-none pt-5 d-md-block sidebar-overflow sticky-top">

layouts/partials/utilities/GetSections.html

@@ -0,0 +1,76 @@
+{{- $page := . -}}
+
+{{/* Add title for current page */}}
+{{- $items := slice -}}
+{{ $items = $items | append (dict "title" .Title "content" "" )}}
+
+{{/* Identify page sections */}}
+{{- $sections := slice -}}
+{{- $sections = $sections | append $page.Type -}}
+{{ with $page.Params.sections }}
+    {{ $sections = $sections | append . }}
+{{ end }}
+
+{{ if $page.IsHome }}
+    {{- if not $page.Params.sections -}}
+        {{- with site.Params.home.sections }}
+            {{ $sections = $sections | append . }}
+        {{ else }}
+            {{ range $section := site.Sections }}
+                {{ $sections = $sections | append $section.Type }}
+            {{ end }}
+        {{ end }}
+    {{- end -}}
+{{ end }}
+
+{{/* Generate title and content for each section */}}
+{{- range $index, $section := $sections -}}
+    {{- $sectionPage := site.GetPage "section" $section -}}
+    {{- $sectionURL := $sectionPage.RelPermalink -}}
+    {{ with $sectionPage.Params.redirect}}
+        {{ $target := partial "utilities/GetPage.html" (dict "url" . "page" $page) }}
+        {{- if not $target -}}
+            {{ if eq (printf "%T" $page.File) "*hugolib.fileInfo"}}
+                {{- errorf "Cannot find redirect target on page '%s': %s" $page.File . -}}
+            {{ else }}
+                {{- errorf "Cannot find redirect target: %s" . -}}
+            {{ end }}
+        {{ else }}
+            {{- $sectionURL = $target.RelPermalink -}}
+        {{ end }}
+    {{ end }}
+    {{- $title := or $sectionPage.Title $sectionPage.Type -}}
+
+    {{- with (index site.Params.sections $section) -}}
+        {{- with index . "title" }}{{ $title = or . $title }}{{ end -}}
+    {{- end -}}
+
+    {{- $thumbnail := (or (and (reflect.IsMap $sectionPage.Params.Thumbnail) $sectionPage.Params.Thumbnail.url) $sectionPage.Params.Thumbnail) -}}
+    {{- $icon := $sectionPage.Params.Icon -}}
+    {{- $content := $sectionPage.Content -}}
+    {{- $sectionTitle := strings.FirstUpper $sectionPage.Type -}}
+    {{- $moreTitle := "" -}}
+    {{- with (index site.Params.sections $section) -}}
+        {{- with index . "reference" }}{{ $moreTitle = . }}{{ end -}}
+    {{- end -}}
+    {{- $moreTitle = or $moreTitle (printf (T "more" (pluralize $sectionTitle))) -}}
+
+    {{- $sectionContent := trim (partial "assets/section-list.html" (dict 
+        "page" $page 
+        "section" $section 
+        "home" $page.IsHome
+        "simple" (eq (len $sections) 1)
+        "nested" (and $page.IsHome (eq $section $page.Section))
+        "thumbnail" $thumbnail
+        "icon" $icon
+        "content" $content
+        "moreTitle" $moreTitle
+        "sectionURL" $sectionURL)) " \r\n"
+    -}}
+
+    {{ if $sectionContent }}
+        {{ $items = $items | append (dict "title" $title "content" $sectionContent)}}
+    {{ end }}
+{{- end -}}
+
+{{ return $items }}

layouts/tags/list.html

@@ -1,5 +1,5 @@
 {{ define "main" }}
-    <div class="container-xxl px-4 px-xxl-0">
+    <div class="container-xxl flex-fill px-4 px-xxl-0">
         <div class="row row-cols-1 row-cols-sm-3">
             <div class="col col-md-2 d-none d-md-block"></div>
             <div class="col col-sm-12 col-md-8">

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@gethinode/hinode",
-  "version": "0.21.0-beta2",
+  "version": "0.21.0-beta4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@gethinode/hinode",
-      "version": "0.21.0-beta2",
+      "version": "0.21.0-beta4",
       "license": "MIT",
       "devDependencies": {
         "@fullhuman/postcss-purgecss": "^5.0.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gethinode/hinode",
-  "version": "0.21.0-beta2",
+  "version": "0.21.0-beta4",
   "description": "Hinode is a clean documentation and blog theme for Hugo, an open-source static site generator",
   "keywords": [
     "hugo",