print: enable print for pages with _build options matcornic#522

maxatome · May 17, 2023 · f38878f · f38878f
1 parent 754b5c8
commit f38878f
Show file tree

Hide file tree

Showing 11 changed files with 40 additions and 59 deletions.
diff --git a/exampleSite/config.toml b/exampleSite/config.toml
@@ -100,7 +100,7 @@ disableHugoGeneratorInject = true
 
   [[languages.en.menu.shortcuts]]
     name = "<i class='fas fa-fw fa-camera'></i> Showcases"
-    url = "more/showcase/"
+    url = "showcase/"
     weight = 11
 
   [[languages.en.menu.shortcuts]]
@@ -140,7 +140,7 @@ disableHugoGeneratorInject = true
 
   [[languages.pir.menu.shortcuts]]
     name = "<i class='fas fa-fw fa-camera'></i> Showcases"
-    url = "more/showcase/"
+    url = "showcase/"
     weight = 11
 
   [[languages.pir.menu.shortcuts]]

diff --git a/exampleSite/content/cont/menushortcuts.en.md b/exampleSite/content/cont/menushortcuts.en.md
@@ -20,7 +20,7 @@ weight = 10
 
 [[menu.shortcuts]]
 name = "<i class='fas fa-fw fa-camera'></i> Showcases"
-url = "more/showcase/"
+url = "showcase/"
 weight = 11
 
 [[menu.shortcuts]]
@@ -75,7 +75,7 @@ Example from the current website:
 
   [[languages.en.menu.shortcuts]]
     name = "<i class='fas fa-fw fa-camera'></i> Showcases"
-    url = "more/showcase/"
+    url = "showcase/"
     weight = 11
 
   [[languages.en.menu.shortcuts]]
@@ -109,7 +109,7 @@ Example from the current website:
 
   [[languages.pir.menu.shortcuts]]
     name = "<i class='fas fa-fw fa-camera'></i> Showcases"
-    url = "more/showcase/"
+    url = "showcase/"
     weight = 11
 
   [[languages.pir.menu.shortcuts]]

diff --git a/exampleSite/content/more/credits/_index.en.md b/exampleSite/content/more/credits/_index.en.md
@@ -1,5 +1,4 @@
 +++
-disableToc = true
 title = "Credits"
 +++
 

diff --git a/exampleSite/content/more/credits/_index.pir.md b/exampleSite/content/more/credits/_index.pir.md
@@ -1,5 +1,4 @@
 +++
-disableToc = true
 title = "Crrredits"
 +++
 {{< piratify >}}
diff --git a/exampleSite/content/more/showcase/_index.pir.md b/exampleSite/content/more/showcase/_index.pir.md
diff --git a/...leSite/content/more/showcase/_index.en.md → exampleSite/content/showcase/_index.en.md b/...leSite/content/more/showcase/_index.en.md → exampleSite/content/showcase/_index.en.md
@@ -1,5 +1,9 @@
 +++
 title = "Showcase"
+[_build]
+  render = "always"
+  list = "never"
+  publishResources = true
 +++
 
 ## [GoboLinux Wiki](https://wiki.gobolinux.org/) by NEONsys.org
@@ -10,6 +14,6 @@ title = "Showcase"
 
 ![BITS image](bits-train.png?width=60pc&classes=shadow)
 
-## [Pamasol Electrics](https://pamasol.github.io/de/) by Pamasol – Swiss Aerosol Solutions
+## [Pamasol Electrics](https://pamasol.github.io/de/) by Pamasol
 
 ![Pamasol Electrics](pamasol-electrics-portal.png?width=60pc&classes=shadow)
diff --git a/exampleSite/content/showcase/_index.pir.md b/exampleSite/content/showcase/_index.pir.md
@@ -0,0 +1,8 @@
++++
+title = "Showcase"
+[_build]
+  render = "always"
+  list = "never"
+  publishResources = true
++++
+{{< piratify >}}
diff --git a/...Site/content/more/showcase/bits-train.png → exampleSite/content/showcase/bits-train.png b/...Site/content/more/showcase/bits-train.png → exampleSite/content/showcase/bits-train.png
diff --git a/...eSite/content/more/showcase/gobolinux.png → exampleSite/content/showcase/gobolinux.png b/...eSite/content/more/showcase/gobolinux.png → exampleSite/content/showcase/gobolinux.png
diff --git a/...ore/showcase/pamasol-electrics-portal.png → ...ent/showcase/pamasol-electrics-portal.png b/...ore/showcase/pamasol-electrics-portal.png → ...ent/showcase/pamasol-electrics-portal.png
diff --git a/layouts/partials/nested-article.hugo b/layouts/partials/nested-article.hugo
@@ -3,82 +3,57 @@
 {{- $page.Page.Store.Set (printf "%sIsNested" $outputFormat) true }}
 {{- with $page }}
   {{- $currentNode := . }}
-  {{- $isActive := .IsHome }}
-  {{- $isShortcut := false }}
-  {{- with .Site.Menus.shortcuts }}
-    {{- range sort . "Weight" }}
-      {{- $shortcut := . }}
-      {{- $shortcutPage := $page.Site.GetPage (printf "%s" $shortcut.URL ) }}
-      {{- if and $shortcutPage (eq $shortcutPage.RelPermalink $page.RelPermalink) }}
-        {{- $isShortcut = true }}
-      {{- end }}
-    {{- end }}
-  {{- end }}
-  {{- $pages := .Site.Home.Pages }}
+  {{- $pages := .Pages }}
   {{- $defaultOrdersectionsby := .Site.Params.ordersectionsby | default "weight" }}
-  {{- $currentOrdersectionsby := .Site.Home.Params.ordersectionsby | default $defaultOrdersectionsby }}
-  {{- if $isShortcut }}
-    {{- template "section-print" dict "sect" . "currentnode" $currentNode "outputFormat" $outputFormat }}
-  {{- else }}
-    {{- if $isActive }}
-      {{- template "section-print" dict "sect" . "currentnode" $currentNode "outputFormat" $outputFormat }}
-      {{- if $pages }}
-              <section>
-                <h1 class="a11y-only">{{ T "Subsections" .Title }}</h1>
-      {{- end }}
-    {{- end }}
-    {{- if eq $currentOrdersectionsby "title" }}
-      {{- range $pages.ByTitle }}
-        {{- template "section-tree-print" dict "sect" . "currentnode" $currentNode "outputFormat" $outputFormat "isActive" $isActive }}
-      {{- end }}
-    {{- else }}
-      {{- range $pages.ByWeight }}
-        {{- template "section-tree-print" dict "sect" . "currentnode" $currentNode "outputFormat" $outputFormat "isActive" $isActive }}
-      {{- end }}
+  {{- $currentOrdersectionsby := .Params.ordersectionsby | default $defaultOrdersectionsby }}
+  {{- template "section-print" dict "sect" . "currentnode" $currentNode "outputFormat" $outputFormat }}
+  {{- if $pages }}
+          <section>
+            <h1 class="a11y-only">{{ T "Subsections" .Title }}</h1>
+  {{- end }}
+  {{- if eq $currentOrdersectionsby "title" }}
+    {{- range $pages.ByTitle }}
+      {{- template "section-tree-print" dict "sect" . "currentnode" $currentNode "outputFormat" $outputFormat }}
     {{- end }}
-    {{- if $isActive }}
-      {{- if $pages }}
-              </section>
-      {{- end }}
+  {{- else }}
+    {{- range $pages.ByWeight }}
+      {{- template "section-tree-print" dict "sect" . "currentnode" $currentNode "outputFormat" $outputFormat }}
     {{- end }}
   {{- end }}
+  {{- if $pages }}
+          </section>
+  {{- end }}
 {{- end }}
 {{- define "section-tree-print" }}
   {{- $currentNode := .currentnode }}
   {{- $outputFormat := .outputFormat }}
-  {{- $isActive := .isActive }}
   {{- $currentFileRelPermalink := .currentnode.RelPermalink }}
   {{- with .sect }}
     {{- $isSelf := eq .RelPermalink $currentFileRelPermalink }}
     {{- $isAncestor := and (not $isSelf) (.IsAncestor $currentNode) }}
-    {{- $isActive = or $isSelf $isActive }}
     {{- $pages := .Pages }}
     {{- $relearnIsHiddenFrom := index ($currentNode.Scratch.Get "relearnIsHiddenFrom") .RelPermalink }}
     {{- $hidden := and $relearnIsHiddenFrom (not $.showhidden) (not $isSelf) (not $isAncestor) }}
     {{- if $hidden }}
     {{- else }}
       {{- $defaultOrdersectionsby := .Site.Params.ordersectionsby | default "weight" }}
       {{- $currentOrdersectionsby := .Params.ordersectionsby | default $defaultOrdersectionsby }}
-      {{- if $isActive }}
-        {{- template "section-print" dict "sect" . "currentnode" $currentNode "outputFormat" $outputFormat }}
-        {{- if $pages }}
+      {{- template "section-print" dict "sect" . "currentnode" $currentNode "outputFormat" $outputFormat }}
+      {{- if $pages }}
           <section>
             <h1 class="a11y-only">{{ T "Subsections" .Title }}</h1>
-        {{- end }}
       {{- end }}
       {{- if eq $currentOrdersectionsby "title" }}
         {{- range $pages.ByTitle }}
-          {{- template "section-tree-print" dict "sect" . "currentnode" $currentNode "outputFormat" $outputFormat "isActive" $isActive }}
+          {{- template "section-tree-print" dict "sect" . "currentnode" $currentNode "outputFormat" $outputFormat }}
         {{- end }}
       {{- else }}
         {{- range $pages.ByWeight }}
-          {{- template "section-tree-print" dict "sect" . "currentnode" $currentNode "outputFormat" $outputFormat "isActive" $isActive }}
+          {{- template "section-tree-print" dict "sect" . "currentnode" $currentNode "outputFormat" $outputFormat }}
         {{- end }}
       {{- end }}
-      {{- if $isActive }}
-        {{- if $pages }}
+      {{- if $pages }}
           </section>
-        {{- end }}
       {{- end }}
     {{- end }}
   {{- end }}
@@ -93,4 +68,4 @@
     {{- $currentNode.Page.Store.Set "nestedHasMermaid" (or ($currentNode.Page.Store.Get "nestedHasMermaid") (.Page.Store.Get "hasMermaid")) }}
     {{- $currentNode.Page.Store.Set "nestedHasOpenapi" (or ($currentNode.Page.Store.Get "nestedHasOpenapi") (.Page.Store.Get "hasOpenapi")) }}
   {{- end }}
-{{- end }}
+{{- end }}