eclipsefdn-hugo-solstice-theme 0.0.181 → 0.0.183

package/Jenkinsfile

@@ -4,7 +4,7 @@ hugo (
   appName: 'webdev.eclipse.org-docs-hugo',
   productionDomain: 'webdev.eclipse.org',
   build: [
-    containerImage: 'eclipsefdn/hugo-node:h0.76.5-n12.22.1',
+    containerImage: 'eclipsefdn/hugo-node:h0.110.0-n18.13.0',
     script: 'bin/build.sh'
   ],
   deployment: [

package/README.md

@@ -9,9 +9,9 @@ Dependencies:
 
 | Program | Version |
 |---------|---------|
-| node.js | ~ 12.22.0 |
-| npm | ~ 7.11 |
-| Hugo | > 0.76 |
+| node.js | 18.13.0 |
+| npm | 8.19 |
+| Hugo | 0.110 |
 | Git | > 2.31 |
 | Make | > 4.3 |
 

package/exampleSite/config/_default/menus.en.toml

@@ -354,3 +354,14 @@
     weight = 2
     parent = "membership"
     pre = "<i class=\"fa fa-chevron-right fa-fw\"></i>"
+
+[[main_menu_demo]]
+    identifier = "custom-menu"
+    name = "Custom Menu"
+    weight = 1
+
+[[main_menu_demo]]
+    parent = "custom-menu"
+    name = "Go Home"
+    url = "/"
+    weight = 1

package/exampleSite/config/_default/menus.es.toml

@@ -342,3 +342,14 @@
     weight = 2
     parent = "membership"
     pre = "<i class=\"fa fa-chevron-right fa-fw\"></i>"
+
+[[main_menu_demo]]
+    identifier = "custom-menu"
+    name = "Custom Menu"
+    weight = 1
+
+[[main_menu_demo]]
+    parent = "custom-menu"
+    name = "Go Home"
+    url = "/"
+    weight = 1

package/exampleSite/config/_default/menus.fr.toml

@@ -345,3 +345,13 @@
     parent = "membership"
     pre = "<i class=\"fa fa-chevron-right fa-fw\"></i>"
 
+[[main_menu_demo]]
+    identifier = "custom-menu"
+    name = "Custom Menu"
+    weight = 1
+
+[[main_menu_demo]]
+    parent = "custom-menu"
+    name = "Go Home"
+    url = "/"
+    weight = 1

package/exampleSite/config/_default/menus.jp.toml

@@ -342,3 +342,14 @@
     weight = 2
     parent = "membership"
     pre = "<i class=\"fa fa-chevron-right fa-fw\"></i>"
+
+[[main_menu_demo]]
+    identifier = "custom-menu"
+    name = "Custom Menu"
+    weight = 1
+
+[[main_menu_demo]]
+    parent = "custom-menu"
+    name = "Go Home"
+    url = "/"
+    weight = 1

package/exampleSite/config/_default/menus.pt.toml

@@ -342,3 +342,14 @@
     weight = 2
     parent = "membership"
     pre = "<i class=\"fa fa-chevron-right fa-fw\"></i>"
+
+[[main_menu_demo]]
+    identifier = "custom-menu"
+    name = "Custom Menu"
+    weight = 1
+
+[[main_menu_demo]]
+    parent = "custom-menu"
+    name = "Go Home"
+    url = "/"
+    weight = 1

package/exampleSite/config/_default/menus.ru.toml

@@ -342,3 +342,14 @@
     weight = 2
     parent = "membership"
     pre = "<i class=\"fa fa-chevron-right fa-fw\"></i>"
+
+[[main_menu_demo]]
+    identifier = "custom-menu"
+    name = "Custom Menu"
+    weight = 1
+
+[[main_menu_demo]]
+    parent = "custom-menu"
+    name = "Go Home"
+    url = "/"
+    weight = 1

package/exampleSite/config/_default/menus.zh.toml

@@ -342,3 +342,14 @@
     weight = 2
     parent = "membership"
     pre = "<i class=\"fa fa-chevron-right fa-fw\"></i>"
+
+[[main_menu_demo]]
+    identifier = "custom-menu"
+    name = "Custom Menu"
+    weight = 1
+
+[[main_menu_demo]]
+    parent = "custom-menu"
+    name = "Go Home"
+    url = "/"
+    weight = 1

package/exampleSite/content/params/main-menu.md

@@ -0,0 +1,65 @@
+---
+title: Main Menu
+main_menu: main_menu_demo
+hide_sidebar: true
+---
+
+The `main_menu` parameter allows you to use a different navigation bar menu.
+This page uses the `main_menu` parameter to show the "Custom Menu" on the
+navigation bar above.
+
+If `main_menu` is not specified, it will use the default `main` menu from the
+config.toml, or menus.toml file.
+
+## Example
+
+Let's create an example which uses a menu named `my_custom_menu`.
+
+config.toml:
+
+```
+[[menu.my_custom_menu]]
+    name = "home"
+    url = "/awesome-event-2022"
+    weight = 1
+
+[[menu.my_custom_menu]]
+    name = "News"
+    url = "/awesome-event-2022/news"
+    weight = 2
+```
+
+We want this custom menu to appear on a section named "awesome-event-2022" whose
+url is located at "/awesome-event-2022". To do this, we need to add the front
+matter parameter `main_menu` in our markdown file for awesome-event-2022.
+
+awesome-event-2022/\_index.md:
+
+```
+---
+title: Awesome Event 2022
+main_menu: my_custom_menu
+layout: single
+---
+
+This is the home page for the Awesome Event 2022
+```
+
+### Front Matter Cascade
+
+You can use the `cascade` front matter parameter to make all subpages use the
+new menu as well:
+
+```
+---
+title: Awesome Event 2022
+layout: single
+cascade:
+    main_menu: my_custom_menu
+---
+
+This is the home page for the Awesome Event 2022
+```
+
+For more information about `cascade`, visit the
+[Hugo docs](https://gohugo.io/content-management/front-matter/#front-matter-cascade).

package/exampleSite/data/doc_params.yml

@@ -60,6 +60,13 @@ items:
       - Array of URL objects that each contain values for "text" and "href" 
     example: |
       [[href: "about/", text: "About"], [href: "news/", text: "News"]]
+  - 
+    name: main_menu
+    description: |
+      Replaces the default main menu for one defined in config.toml or menus.toml.
+      <a href="./params/main-menu">See more information here</a>.
+    values:
+      - Any string value
   - 
     name: redirect_url
     description: Set the redirect URL for client-side page forwarding. Used in the head.html layout file, and is used in the canonical URL, and in an instant refresh meta tag for page target. If set, it will also set the page to not be indexed in the future by robots.

package/layouts/partials/nav.html

@@ -1,5 +1,5 @@
-<!-- 
-  Copyright (c) 2018 Eclipse Foundation, Inc.
+{{/* 
+  Copyright (c) 2018, 2023 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
@@ -7,11 +7,15 @@
 
   Contributors:
     Christopher Guindon <chris.guindon@eclipse-foundation.org>
+    Olivier Goulet <olivier.goulet@eclipse-foundation.org>
 
   SPDX-License-Identifier: EPL-2.0
--->
+*/}}
+
+{{ $main_menu := .Page.Params.main_menu | default "main" }}
+
 {{ $currentNode := . }}
-{{ range .Site.Menus.main }}
+{{ range (index .Site.Menus $main_menu) }}
 {{ if .HasChildren }}
   {{ $multicol := false }}
   {{ range .Children }}
@@ -19,10 +23,9 @@
       {{ $multicol = true }}
     {{ end }}
   {{ end }}
-<li class="dropdown{{ if $multicol }} eclipse-more{{ end }}">
+<li class="dropdown {{ if $multicol -}} eclipse-more {{- end }}">
   <a href="#" data-toggle="dropdown" class="dropdown-toggle">
     {{ .Pre }}
-    <!--<i class="icon_desktop"></i>-->
     <span>{{ .Name }}</span>
     <b class="caret"></b>
   </a>
@@ -41,7 +44,7 @@
             <li><p><a href="{{.URL}}"><strong>{{ .Name }}</strong></a></p>
             </li>
             {{ range .Children }}
-            <li{{if $currentNode.IsMenuCurrent "main" . }} class="active"{{end}}><a href="{{.URL}}">{{ .Name }}</a> </li>
+            <li {{if $currentNode.IsMenuCurrent "{{ $main_menu }}" . }} class="active"{{end}}><a href="{{.URL}}">{{ .Name }}</a> </li>
             {{ end }}
           </ul>
           {{ end }}
@@ -50,7 +53,7 @@
     </li>
     {{ else }}
       {{ range .Children }}
-      <li{{if $currentNode.IsMenuCurrent "main" . }} class="active"{{end}}><a href="{{.URL}}">{{ .Name }}</a> </li>
+      <li {{if $currentNode.IsMenuCurrent "{{ $main_menu }}" . }} class="active"{{end}}><a href="{{.URL}}">{{ .Name }}</a> </li>
       {{ end }}
     {{ end }}
   </ul>

package/layouts/shortcodes/eclipsefdn_project_list.html

@@ -1,5 +1,5 @@
-<!-- 
-  Copyright (c) 2020 Eclipse Foundation, Inc.
+{{/*
+  Copyright (c) 2020, 2023 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
@@ -7,9 +7,11 @@
 
   Contributors:
     Martin Lowe <martin.lowe@eclipse-foundation.org>
+    Olivier Goulet <olivier.goulet@eclipse-foundation.org>
 
   SPDX-License-Identifier: EPL-2.0
--->
+*/}}
+
 {{ if $.Site.Data.eclipsefdn_projects }}
 <section wg-filter="{{$.Site.Params.projects_working_group}}">
   <style>
@@ -47,7 +49,7 @@
       <div class="col-xs-24 col-md-4 text-center margin-top-20 margin-bottom-20">
         <div class="btn-group">
           <a class="btn btn-primary" href="{{ .url }}/downloads">{{ i18n "project-list-downloads" }}</a>
-          <button type="button" class="btn btn-sm btn-warning dropdown-toggle details-link" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+          <button type="button" class="btn btn-primary dropdown-toggle details-link" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
             <span class="caret"></span>
             <span class="sr-only">{{ i18n "project-list-dropdown-sr" }}</span>
           </button>

package/package.json

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