Merge pull request #574 from gethinode/develop

Fix section menu initialization
Merge branch 'main' into develop
2025-10-15 14:03:19 +00:00 · 2023-10-21 15:14:40 +02:00 · 2023-10-21 14:56:17 +02:00 · 2023-10-21 14:55:38 +02:00 · 2023-10-21 14:53:39 +02:00
7 changed files with 96 additions and 103 deletions
--- a/exampleSite/content/fr/blog/bootstrap-elements.md
+++ b/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" */>}}
--- a/hugo_stats.json
+++ b/hugo_stats.json
@@ -30,7 +30,6 @@
      "align-items-center",
      "align-self-center",
      "bg-body",
-      "bg-info",
      "bg-opacity-10",
      "bg-primary",
      "bottom-0",
@@ -82,15 +81,12 @@
      "flex-column",
      "flex-fill",
      "flex-grow-1",
-      "flex-row",
      "footer",
      "form-control",
      "fs-3",
      "fs-5",
-      "fullscreen",
      "fw-30",
      "fw-bold",
-      "h-100",
      "hstack",
      "img-fluid",
      "img-wrap",
@@ -169,8 +165,7 @@
      "toast-container",
      "toast-header",
      "toggler-icon",
-      "top-bar",
-      "w-100"
+      "top-bar"
    ],
    "ids": [
      "-theme",
--- a/layouts/_default/baseof.html
+++ b/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>
--- a/layouts/_default/list.html
+++ b/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,86 +39,9 @@

 {{- 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 flex-fill px-4 px-xxl-0">
        {{- if ne $layout "featured" -}}
            {{ if and (not $page.IsHome) site.Params.navigation.breadcrumb }}
@@ -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 -}}
--- a/layouts/partials/utilities/GetSections.html
+++ b/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 }}
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "@gethinode/hinode",
-  "version": "0.21.0-beta3",
+  "version": "0.21.0-beta4",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "@gethinode/hinode",
-      "version": "0.21.0-beta3",
+      "version": "0.21.0-beta4",
      "license": "MIT",
      "devDependencies": {
        "@fullhuman/postcss-purgecss": "^5.0.0",
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@gethinode/hinode",
-  "version": "0.21.0-beta3",
+  "version": "0.21.0-beta4",
  "description": "Hinode is a clean documentation and blog theme for Hugo, an open-source static site generator",
  "keywords": [
    "hugo",
Author	SHA1	Message	Date
Mark Dumay	e00ad4498b	Merge pull request #574 from gethinode/develop Fix section menu initialization	2023-10-21 15:14:40 +02:00
Mark Dumay	a0f7e62616	Merge branch 'main' into develop	2023-10-21 14:56:17 +02:00
mark	11653015ab	Fix section menu initialization	2023-10-21 14:55:38 +02:00
mark	e6a37cab0f	Fix typos	2023-10-21 14:53:39 +02:00