eclipsefdn-hugo-solstice-theme 2.1.0 → 3.0.1

package/layouts/partials/jumbotron.html

@@ -1,102 +1,90 @@
-{{/*
-  Copyright (c) 2023 Eclipse Foundation, Inc.
+<!-- 
+  Copyright (c) 2025 Eclipse Foundation AISBL
 
   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.
 
-  Contributors:
-    Olivier Goulet <olivier.goulet@eclipse-foundation.org>
-
   SPDX-License-Identifier: EPL-2.0
-*/}}
+-->
 
-{{ $show_featured_story := .Page.Params.show_featured_story | default false }}
-{{ $hide_jumbotron := .Page.Params.hide_jumbotron }}
 {{ $jumbotron_container := .Page.Params.jumbotron_container | default "container" }}
-{{ $custom_jumbotron_end := .Page.Params.custom_jumbotron_end }}
-
-{{/*
-    We need to keep track of whether or not a jumbotron is present on the
-    page to know where to render the featured story.
-*/}}
-{{ .Scratch.Set "has_jumbotron" false }}
+{{ $jumbotron_class := .Params.jumbotron_class | default .Site.Params.jumbotron_class | default "col-xs-24" }}
+{{ $headline := .Page.Params.headline }}
+{{ $preheadline := .Page.Params.preheadline }}
+{{ $tagline := .Page.Params.tagline }}
+{{ $links := .Page.Params.links }}
+{{ $default_btn_class := "btn btn-primary" }}
 
-{{ if or (isset .Page.Params "headline") (eq $hide_jumbotron false) }}
-    {{ .Scratch.Set "has_jumbotron" true }}
-
-    <div class="jumbotron featured-jumbotron featured-jumbotron-dark margin-bottom-0">
-      <div class="{{ $jumbotron_container }}">
-        <div class="row">
-          <div class="{{- .Params.jumbotron_class | default .Site.Params.jumbotron_class | default "col-md-20 col-md-offset-2 col-sm-18 col-sm-offset-3" }}">
-            {{ if and (.Page.Params.headline) (ne .Page.Params.headline "") }}
-              <h1 class="featured-jumbotron-headline">
-                {{ if eq (.Page.Params.format_title | default .Site.Params.format_title) false }}
-                  {{ .Page.Params.headline | safeHTML }}
-                {{ else }}
-                  {{ .Page.Params.headline | title | safeHTML }}
-                {{ end }}
-              </h1>
-            {{ end }}
-            {{ if isset .Page.Params "subtitle" }}
-              <div class="featured-jumbotron-subtitle">{{ .Page.Params.subtitle  | title | safeHTML }}</div>
-            {{ end }}
+{{ $jumbotron_background_class := .Page.Params.jumbotron_background_class | default .Site.Params.jumbotron_background_class | default "bg bg-hero-1" }}
 
-            {{ if isset .Page.Params "tagline" }}
-              <div class="row">
-                <div class="{{- .Params.jumbotron_tagline_class | default .Site.Params.jumbotron_tagline_class | default "col-md-16" }}">
-                  <p class="featured-jumbotron-tagline">{{ .Page.Params.tagline | safeHTML }}</p>
-                </div>
-              </div>
-            {{ end }}
+{{ .Store.Set "has_jumbotron" (or (isset .Page.Params "headline") (isset .Page.Params "custom_jumbotron")) }}
+{{ $has_jumbotron := .Store.Get "has_jumbotron" }}
 
-           {{ if isset .Page.Params "custom_jumbotron" }}
-              <div class="row">
-                <div class="{{- .Params.custom_jumbotron_class | default .Site.Params.custom_jumbotron_class | default "col-sm-18 col-sm-offset-3"}}">
-                  {{ .Page.Params.custom_jumbotron | safeHTML }}
-                </div>
-              </div>
+{{ if $has_jumbotron }}
+  <section class="featured-jumbotron fade-group {{ $jumbotron_background_class }}">
+    <div class="{{ $jumbotron_container }}">
+      <div class="{{ $jumbotron_class }}">
+        <div class="featured-jumbotron-heading-group">
+          {{ with $.Page.Params.preheadline }}
+            <p 
+              class="featured-jumbotron-preheadline fade-item"
+              data-fade-duration="0.5"
+              data-fade-direction="none"
+            >
+              {{- . | safeHTML -}}
+            </p>
           {{ end }}
-
-            {{ if isset .Page.Params "links" }}
-                {{- with .Params.jumbotron_btn_class | default .Site.Params.jumbotron_btn_class | default "btn btn-primary" }}
-                    {{ $.Scratch.Set "jumbotron_btn" . }}
-                {{ end }}
-                <ul class="featured-jumbotron-links list-inline">
-                    {{ range $key,$val := index .Page.Params.links}}
-                        {{ $btn_class := "" }}
-                        {{ with (index $val 2) }}
-                          {{ $btn_class = .class }}
-                        {{ else }}
-                          {{ $btn_class = $.Scratch.Get "jumbotron_btn" }}
-                        {{ end }}
-                        <li>
-                          <a class="{{ $btn_class }}" href="{{ (index $val 0).href}}" {{ with (index $val 3) -}} id="{{ .id | safeHTMLAttr }}" {{- end }}>
-                            {{ (index $val 1).text}}
-                          </a>
-                        </li>
-                    {{ end }}
-                </ul>
-            {{ end }}
-            <div class="featured-jumbotron-end">
-              {{ if (eq $show_featured_story true) }}
-                {{ $publish_target := .Page.Params.featured_content_publish_target | default .Site.Params.featured_content_publish_target | default "eclipse_org" }}
-                <div
-                  class="eclipsefdn-featured-story"
-                  data-template-id="template-featured-story-jumbotron"
-                  data-publish-target="{{ $publish_target }}"
-                >
-                  <div class="featured-container"></div>
-                </div>
-              {{ end }}
-              {{ if $custom_jumbotron_end }}
-                <div class="featured-jumbotron-end-custom">
-                  {{ $custom_jumbotron_end | safeHTML }}
-                </div>
-              {{ end }}
+          {{ with $headline }}
+            <h1 
+              class="featured-jumbotron-headline fade-item"
+              data-fade-duration="0.5"
+              data-fade-direction="none"
+            >
+              {{- . | safeHTML -}}
+            </h1>
+          {{ end }}
+        </div>
+        {{ with $tagline }}
+          <p 
+            class="featured-jumbotron-tagline fade-item"
+            data-fade-duration="0.5"
+            data-fade-direction="none"
+          >
+            {{- . -}}
+          </p>
+        {{ end }}
+       {{ if isset .Page.Params "custom_jumbotron" }}
+          <div class="row">
+            <div class="{{- .Params.custom_jumbotron_class | default .Site.Params.custom_jumbotron_class | default "col-xs-24" }}">
+              {{ .Page.Params.custom_jumbotron | safeHTML }}
             </div>
           </div>
-        </div>
+        {{ end }}
+        {{ with $links }}
+          <ul class="featured-jumbotron-links list-inline">
+            {{ range $key,$val := index . }}
+                {{ $btn_class := "" }}
+                {{ with (index $val 2) }}
+                  {{ $btn_class = .class }}
+                {{ else }}
+                  {{ $btn_class = $default_btn_class }}
+                {{ end }}
+                <li>
+                  <a 
+                    class="{{ $btn_class }} fade-item" 
+                    href="{{ (index $val 0).href }}"
+                    {{ with (index $val 3) -}} id="{{ .id | safeHTMLAttr }}" {{- end }}
+                    data-fade-duration="0.5"
+                    data-fade-direction="none"
+                  >
+                    {{ (index $val 1).text}}
+                  </a>
+                </li>
+              {{ end }}
+          </ul>
+        {{ end }}
       </div>
     </div>
+  </section>
 {{ end }}

package/layouts/partials/main_prefix.html

@@ -1,26 +1,25 @@
-{{/*
-  Copyright (c) 2019, 2023, 2024 Eclipse Foundation, Inc.
+<!-- 
+  Copyright (c) 2025 Eclipse Foundation AISBL
 
   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.
 
-  Contributors:
-    Eric Poirier <eric.poirier@eclipse-foundation.org></eric.poirier>
-    Olivier Goulet <olivier.goulet@eclipse-foundation.org>
-
   SPDX-License-Identifier: EPL-2.0
-*/}}
+-->
 
-<main>
+{{ $has_jumbotron := .Store.Get "has_jumbotron" }}
+<main id="main">
+  {{ partial "jumbotron.html" . }}
+  {{ partial "breadcrumbs.html" . }}
   <div class="{{- .Params.container | default .Site.Params.container | default "container padding-bottom-30"}}">
     {{ if ne .Page.Params.hide_sidebar true }}
       <div class="row">
+        <div class='{{- .Params.main_sidebar_class | default .Site.Params.main_sidebar_class | default "col-md-6" }}'>
+          {{ partial "sidebar.html" . }}
+        </div>
         <div class="{{- .Params.main_content_class | default .Site.Params.main_content_class | default "col-md-18"}}">
     {{ end }}
-    {{ if ne .Page.Params.hide_breadcrumb true }}
-      {{ partial "breadcrumbs.html" . }}
-    {{ end }}
     {{ if eq .Page.Params.is_deprecated true }}
       {{ $msg := .Page.Params.deprecation_msg | default "This page is deprecated and may contain some information that is no longer relevant or accurate." }}
       <div class="alert alert-danger margin-top-20" role="alert">
@@ -29,12 +28,11 @@
     {{ end }}
 
     {{ if ne .Page.Params.hide_page_title true }}
-      <h1>
-        {{ if eq (.Page.Params.format_title | default .Site.Params.format_title) false }}
-          {{ .Title | safeHTML }}
-        {{ else }}
-          {{ .Title | safeHTML | title }}
-        {{ end }}
-      </h1>
+      {{ if $has_jumbotron }}
+        <p class="h1">{{ .Title | safeHTML }}</p>
+      {{ else }}
+        <h1>{{ .Title | safeHTML }}</h1>
+      {{ end }}
     {{ end }}
 
+

package/layouts/partials/main_suffix.html

@@ -1,30 +1,13 @@
 <!-- 
-  Copyright (c) 2019, 2024 Eclipse Foundation, Inc.
+  Copyright (c) 2025 Eclipse Foundation AISBL
 
   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.
 
-  Contributors:
-    Eric Poirier <eric.poirier@eclipse-foundation.org>
-
   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>
-        <div class="{{- .Params.main_sidebar_class | default .Site.Params.main_sidebar_class | default "col-md-6  padding-bottom-30"}}">
-          {{ if eq $sidebarLayout "default" }}
-            {{ partial "sidebar.html" . }}
-          {{ else if eq $sidebarLayout "sidebar_block" }}
-            {{ partial "sidebar-block.html" . }}
-          {{ end }}
-        </div>
-      </div>
-    {{ end }}
   </div>
 </main>
-

package/layouts/partials/mega_menu.html

@@ -1,65 +1,61 @@
-{{/*
-  Copyright (c) 2023 Eclipse Foundation, Inc.
+<!-- 
+  Copyright (c) 2025 Eclipse Foundation AISBL
 
   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.
 
-  Contributors:
-    Olivier Goulet <olivier.goulet@eclipse-foundation.org>
-
   SPDX-License-Identifier: EPL-2.0
-*/}}
+-->
 
 {{ $main_menu := .Scratch.Get "main_menu" }}
-
 {{ $current_page := . }}
-{{ $hide_ad := $.Site.Params.hide_ad | default true }}
-{{ $header_ad_format := $.Site.Params.header_ad_format | default "ads_square" }}
-{{ $megaMenu := .Site.Data.mega_menu }}
-
-<div class="eclipsefdn-mega-menu">
-    {{ range (index .Site.Menus $main_menu) }}
-        {{ $menu_id := .Identifier | default (lower .Name) }}
-        {{ $menu_id = printf "%s-menu" $menu_id }}
 
-        <div class="mega-menu-submenu container hidden" data-menu-id="{{ $menu_id }}">
-            <div class="mega-menu-submenu-featured-story">
-
-              {{ if .Params.description }}
-                <p class="mega-menu-submenu-featured-story-heading">{{ .Params.heading | default .Name }}</p>
-                <p class="mega-menu-submenu-featured-story-text">{{ .Params.description }}</p>
-              {{ end }}
-
-              {{ with .Params.link }}
-                <a class="mega-menu-submenu-featured-story-btn btn btn-primary" href="{{ .url }}">{{ .text }}</a>
-              {{ end }}
+{{ $has_mega_menu := false }}
+{{/* Unless if any of the menus are 3-levels deep then we will show a mega menu. */}}
+{{ with (index .Site.Menus $main_menu) }}
+  {{ range . }}
+    {{ if .HasChildren }}
+      {{ range .Children }}
+        {{ if .HasChildren }}
+          {{ $has_mega_menu = true }}
+        {{ end }}
+      {{ end }}
+    {{ end }}
+  {{ end }}
+{{ end }}
 
-            </div>
-            <div class="mega-menu-submenu-links-section">
-                {{ range .Children }}
-                    <div class="mega-menu-submenu-links">
-                        <p class="menu-heading">{{ .Name }}</p>
-                        <ul>
-                            {{ range .Children }}
-                                <li>
-                                    <a href="{{ .URL }}">{{ .Name }}</a>
-                                </li>
-                            {{ end }}
-                        </ul>
-                    </div>
-                {{ end }}
-            </div>
-            <div class="mega-menu-submenu-ad-wrapper">
-              {{ if eq $hide_ad false }}
-                <div
-                  class="eclipsefdn-mega-menu-promo-content mega-menu-promo-content"
-                  data-ad-format="ads_square"
-                  data-ad-publish-to="eclipse_org_home"
-                >
+{{ if $has_mega_menu }}
+  <div class="mega-menu">
+    {{ range (index .Site.Menus $main_menu) }}
+      {{ $menu_id := .Identifier | default (lower .Name) }}
+      {{ $menu_id = printf "%s-menu" $menu_id }}
+      <div class="menu hidden" id="{{ $menu_id }}">
+        <div class="container">
+          <nav>
+            {{ range .Children }}
+              <div class="submenu" {{ with .Params.style -}} style="{{ . | safeCSS }}" {{- end }}>
+                <div class="menu-heading-group">
+                  {{ with .Pre }}
+                    <span class="menu-pre">
+                      {{ . | safeHTML }}
+                    </span>
+                  {{ end }}
+                  <h2 class="menu-heading">{{ .Name }}</h2>
                 </div>
-              {{ end }}
-            </div>
+                <ul>
+                  {{ range .Children }}
+                    <li>
+                      <a href="{{ .URL }}" {{ with .Params.target -}} target="{{ . | safeHTMLAttr }}" {{- end }}>{{ .Name }}</a>
+                      {{ with .Params.external }}<i class="external-icon fa-solid fa-arrow-up-right-from-square" aria-hidden="true"></i>{{ end }}
+                    </li>
+                  {{ end }}
+                </ul>
+              </div>
+            {{ end }}
+          </nav>
         </div>
+      </div>
     {{ end }}
-</div>
+  </div>
+{{ end }}

package/layouts/partials/mobile_menu.html

@@ -1,108 +1,54 @@
-{{/* 
-  Copyright (c) 2023 Eclipse Foundation, Inc.
+<!-- 
+  Copyright (c) 2025 Eclipse Foundation AISBL
 
   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.
 
-  Contributors:
-    Olivier Goulet <olivier.goulet@eclipse-foundation.org>
-
   SPDX-License-Identifier: EPL-2.0
-*/}}
+-->
 
 {{ $main_menu := .Scratch.Get "main_menu" }}
 {{ $current_page := . }}
-
-<nav class="mobile-menu hidden" aria-expanded="false">
-    <ul>
-        {{ range (index .Site.Menus $main_menu) }}
-            {{ $menu_id := .Identifier | default (lower .Name) }}
-            {{ $target_menu := printf "%s-menu" $menu_id }}
-            {{ $menu_type := "link" }}
-
-            {{/* If the desktop menu uses basic dropdowns, set menu type to "dropdown". */}}
-            {{ if .HasChildren }}
-              {{ $menu_type = "dropdown" }}
-            {{ end }}
-
-            {{/* Unless if any of the menus are 3-levels deep then we know the desktop menu type is "mega". */}}
-            {{ range .Children }}
-              {{ if .HasChildren }}
-                {{ $menu_type = "mega" }}
-              {{ end }}
-            {{ end }}
-            
-            {{ $args := dict "target_menu" $target_menu "Name" .Name "URL" .URL "Identifier" .Identifier "Children" .Children }}
-
-            {{ if eq $menu_type "link" }}
-              {{ template "mobile_menu_link" $args  }}
-            {{ else if eq $menu_type "dropdown" }}
-              {{ template "mobile_menu_dropdown" $args }} 
-            {{ else if eq $menu_type "mega" }}
-              {{ template "mobile_menu_mega" $args }} 
-            {{ end }}
-        {{ end }}
-    </ul>
-</nav>
-
-{{ define "mobile_menu_link" }}
-  <li>
-    <a class="mobile-menu-item" href="{{ .URL }}">{{ .Name }}</a>
-  </li>
-{{ end }}
-
-{{ define "mobile_menu_dropdown" }}
-  <li class="mobile-menu-dropdown">
-    <a class="mobile-menu-item mobile-menu-dropdown-toggle" data-target="{{ .target_menu }}">
-      <span>{{ .Name }}</span>
-      <i class="fa fa-chevron-down" aria-hidden="true"></i>
-    </a>
-    <div class="mobile-menu-sub-menu-wrapper">
-      <ul class="mobile-menu-sub-menu mobile-menu-links-menu hidden" id="{{ .Identifier }}-menu">
-        {{ range .Children }}
-          {{ template "mobile_menu_link" . }}
-        {{ end }}
-      </ul>
-    </div>
-  </li>
-{{ end }}
-
-{{ define "mobile_menu_mega" }}
-  <li class="mobile-menu-dropdown">
-    <a class="mobile-menu-item mobile-menu-dropdown-toggle" data-target="{{ .target_menu }}">
-      <span>{{ .Name }}</span>
-      <i class="fa fa-chevron-down" aria-hidden="true"></i>
-    </a>
-    <div class="mobile-menu-sub-menu-wrapper">
-      <ul class="mobile-menu-sub-menu hidden" id="{{ .Identifier }}-menu">
-        {{ range .Children }}
-          <li class="mobile-menu-dropdown">
-            <a 
-              data-target="{{ .Identifier }}-sub-menu"
-              class="mobile-menu-item mobile-menu-dropdown-toggle" 
-              aria-expanded="false"
-            >
-              <span>{{ .Name }}</span>
-              <i class="fa fa-chevron-down" aria-hidden="true"></i>
-            </a>
-            <div class="mobile-menu-sub-menu-wrapper">
-              <ul 
-                class="mobile-menu-sub-menu mobile-menu-links-menu hidden"
-                id="{{ .Identifier }}-sub-menu"
-              >
-                {{ range .Children }}
-                  <li>
-                    <a class="mobile-menu-item" href="{{ .URL }}">
-                      {{ .Name }}
-                    </a>
-                  </li>
-                {{ end }}
-              </ul>
-            </div>
-          </li>
+<div class="mobile-menu hidden">
+  <nav class="mobile-menu-nav">
+    {{ template "mobile_menu_list" (dict "current_page" $current_page "menu_id" nil "menu" (index .Site.Menus $main_menu)) }}
+  </nav>
+</div>
+
+{{ define "mobile_menu_list" }}
+  {{ $current_page := .current_page }}
+
+  {{ $has_parent := false }}
+  
+  <!-- Detect whether this menu is the root or not. -->
+  {{ range .menu }}
+    {{ if .Parent }}
+      {{ $has_parent = true }}
+    {{ end }}
+  {{ end }}
+
+  <ul {{ if $has_parent -}} class="collapse" id="{{ .menu_id }}" {{- end -}}>
+    {{ range .menu }}
+      {{ $menu_id := .Identifier | default (lower .Name) }}
+      {{ $target_menu := printf "mobile-menu-%s" $menu_id }}
+      <li>
+        {{ if .HasChildren }}
+          <a
+            role="button"
+            href="#{{ $target_menu }}"
+            data-toggle="collapse"
+            aria-expanded="false"
+            aria-controls="{{ $target_menu }}"
+          >
+            {{ .Name }}
+            <i class="fa-solid fa-chevron-down" aria-hidden="true"></i>
+          </a>
+          {{ template "mobile_menu_list" (dict "current_page" $current_page "menu_id" $target_menu "menu" .Children) }} 
+        {{ else }}
+          <a href="{{ .URL }}" {{ with .Params.target -}} target="{{ . | safeHTMLAttr }}" {{- end }}>{{ .Name }}</a>
         {{ end }}
-      </ul>
-    </div>
-  </li>
+      </li>
+    {{ end }}
+  </ul>
 {{ end }}