eclipsefdn-hugo-solstice-theme 0.0.211 → 0.0.213

package/exampleSite/content/faq/_index.fr.md

@@ -2,6 +2,9 @@
 title: "Questions fréquemment posées"
 date: 2019-04-01T13:30:00-00:00
 description: "Questions fréquemment posées - FR"
+metadata:
+  - path: "fr/faq"
+    type: "ld+json"
 ---
 
 {{< faq >}}

package/exampleSite/content/faq/_index.md

@@ -2,6 +2,9 @@
 title: "FAQ"
 date: 2019-04-01T13:30:00-00:00
 description: "Frequently Asked Questions"
+metadata:
+  - path: "en/faq"
+    type: "ld+json"
 ---
 
 {{< faq >}}

package/layouts/partials/head.html

@@ -81,3 +81,19 @@
 {{- end }}
 {{- partial "google_tag_manager.html" . }}
 {{- partial "head_variables.html" . }}
+
+{{ $metadata := .Page.Params.metadata | default slice }}
+{{ range $metadata }}
+    {{ $path_parts := split .path "/" }}
+    {{ $data := $.Site.Data }}
+    {{ range $path_parts }}
+    {{ $data = index $data . }}
+  {{ end }}
+  {{ if eq .type "ld+json" }}
+    <script type="application/ld+json">
+      {{ with $data }} 
+        {{ . }}
+      {{ end }}
+    </script>
+  {{ end }}
+{{ end }}

package/layouts/partials/head_suffix.html

@@ -1,4 +1,4 @@
-<!-- 
+{{/* 
   Copyright (c) 2018 Eclipse Foundation, Inc.
 
   This program and the accompanying materials are made available under the
@@ -9,4 +9,4 @@
     Christopher Guindon <chris.guindon@eclipse-foundation.org>
 
   SPDX-License-Identifier: EPL-2.0
--->
+*/}}

package/layouts/partials/main_suffix.html

@@ -1,5 +1,5 @@
 <!-- 
-  Copyright (c) 2019 Eclipse Foundation, Inc.
+  Copyright (c) 2019, 2024 Eclipse Foundation, Inc.
 
   This program and the accompanying materials are made available under the
   terms of the Eclipse Public License v. 2.0 which is available at
@@ -11,6 +11,8 @@
   SPDX-License-Identifier: EPL-2.0
 -->
 
+    {{ partial "related_links.html" .}}
+
     {{ if ne .Page.Params.hide_sidebar true }} 
       {{ $sidebarLayout := .Page.Params.sidebar_layout | default .Site.Params.sidebar_layout | default "default" }}
       </div>

package/layouts/partials/related_links.html

@@ -0,0 +1,27 @@
+<!--
+  Copyright (c) 2024 Eclipse Foundation, Inc.
+
+  This program and the accompanying materials are made available under the
+  terms of the Eclipse Public License v. 2.0 which is available at
+  http://www.eclipse.org/legal/epl-2.0.
+
+  SPDX-License-Identifier: EPL-2.0
+-->
+{{ with $related := .Page.Params.related }}
+  <aside class="sideitem margin-top-30" role="complementary" aria-labelledby="related-links">
+    {{ with $related.links }}
+      <p class="h4" id="related-links">Related Links</p>
+      <hr>
+      <nav>
+        <ul>
+          {{ range . }}
+            <li><a href="{{ .url }}">{{ .text | markdownify }}</a></li>
+          {{ end }}
+        </ul>
+      </nav>
+    {{ end }}
+    {{ with $related.content }}
+      {{ . | safeHTML }}
+    {{ end }}
+  </aside>
+{{ end }}

package/layouts/shortcodes/faq.html

@@ -1,13 +1,23 @@
+{{/*
+  Copyright (c) 2024 Eclipse Foundation, Inc.
+
+  This program and the accompanying materials are made available under the
+  terms of the Eclipse Public License v. 2.0 which is available at
+  http://www.eclipse.org/legal/epl-2.0.
+
+  SPDX-License-Identifier: EPL-2.0
+*/}}
+
 {{ $data := index .Site.Data .Site.Language.Lang }}
-  <h2>{{ i18n "faq-list-heading" }}</h2>
-  <ul>
-    {{ range $data.faq.mainEntity }}
-      <li><a href="#{{ replace .name " " "_" }}">{{ .name | safeHTML }}</a></li>
-    {{ end }}
-  </ul>
-  <hr>
+<h2>{{ i18n "faq-list-heading" }}</h2>
+<ul>
   {{ range $data.faq.mainEntity }}
-    <h2 class="h4" id="{{ replace .name " " "_" }}">{{ .name | safeHTML }}</h2>
-    {{ .acceptedAnswer.text  | safeHTML }}
-    <hr>
-  {{ end }}
+    <li><a href="#{{ replace .name " " "-" }}">{{ .name | safeHTML }}</a></li>
+  {{ end }}
+</ul>
+<hr>
+{{ range $data.faq.mainEntity }}
+  <h2 class="h4" id="{{ replace .name " " "-" }}">{{ .name | safeHTML }}</h2>
+  {{ .acceptedAnswer.text  | safeHTML }}
+  <hr>
+{{ end }}

package/package.json

@@ -4,7 +4,7 @@
   "main": "webpack.min.js",
   "author": "Christopher Guindon",
   "license": "EPL-2.0",
-  "version": "0.0.211",
+  "version": "0.0.213",
   "bugs": {
     "url": "https://gitlab.eclipse.org/eclipsefdn/it/webdev/hugo-solstice-theme/-/issues"
   },
@@ -23,7 +23,7 @@
   "readmeFilename": "README.md",
   "dependencies": {
     "axios": "^1.6.0",
-    "eclipsefdn-solstice-assets": "0.0.261",
+    "eclipsefdn-solstice-assets": "0.0.264",
     "json2yaml": "^1.1.0",
     "toml": "^3.0.0"
   },

package/layouts/faq/section.html

@@ -1,8 +0,0 @@
-{{ define "head-suffix" }}
-{{ $data := index .Site.Data .Site.Language.Lang }}
-  {{ with $data.faq }}
-    <script type="application/ld+json">
-    {{ . }}
-    </script>
-  {{ end }}
-{{ end }}