eclipsefdn-hugo-solstice-theme 2.1.0 → 3.0.1

package/layouts/partials/nav.html

@@ -1,82 +1,69 @@
-{{/* 
-  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
-*/}}
+-->
 
 {{ if .Page.Params.main_menu }}
   {{ .Scratch.Set "main_menu" .Page.Params.main_menu }}
 {{ else if (index .Site.Menus "main") }}
   {{ .Scratch.Set "main_menu" "main" }}
 {{ else }}
-  {{ .Scratch.Set "main_menu" "astro" }}
+  {{ .Scratch.Set "main_menu" "neptune" }}
 {{ end }}
 
+
 {{ $main_menu := .Scratch.Get "main_menu" }}
 {{ $current_page := . }}
 
-<nav class="header-navbar-nav">
-    <ul class="header-navbar-nav-links">
-        {{ range (index .Site.Menus $main_menu) }}
-            {{ $menu_id := .Identifier | default (lower .Name) }}
-            {{ $target_menu := printf "%s-menu" $menu_id }}   
-            {{ $active_class := "" }}
-            {{ $menu_type := "link" }}
+<nav class="navigation-bar-nav hidden-xs hidden-sm">
+  <ul>
+    {{ range (index .Site.Menus $main_menu) }}
+      {{ $menu_id := .Identifier | default (lower .Name) }}
+      {{ $target_menu := printf "%s-menu" $menu_id }}   
+      {{ $active_class := "" }}
+      {{ $menu_type := "link" }}
 
-            {{ if $current_page.IsMenuCurrent $main_menu . }}
-                {{ $active_class = "active" }}
-            {{ end }}
-            
-            {{/* If the menu has children, we will show a dropdown */}}
-            {{ if .HasChildren }}
-              {{ $menu_type = "dropdown" }}
-            {{ end }}
+      {{ if $current_page.IsMenuCurrent $main_menu . }}
+        {{ $active_class = "active" }}
+      {{ end }}
 
-            {{/* Unless if any of the menus are 3-levels deep then we will show a mega menu. */}}
-            {{ range .Children }}
-              {{ if .HasChildren }}
-                {{ $menu_type = "mega" }}
-              {{ end }}
-            {{ end }}
+      {{/* If the menu has children, we will show a dropdown */}}
+      {{ if .HasChildren }}
+        {{ $menu_type = "dropdown" }}
+      {{ end }}
 
-            <li class="navbar-nav-links-item {{ $active_class }}">
-                {{ if eq $menu_type "link" }}
-                <a class="link-unstyled" href="{{ .URL }}">{{ .Name }}</a>
-                {{ else if eq $menu_type "dropdown" }}
-                  <div class="dropdown">
-                    <button class="btn-link link-unstyled" id="{{ $menu_id }}" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                      {{ .Name }}
-                      <i class="fa fa-caret-down" aria-hidden="true"></i>
-                    </button>
-                    <ul class="dropdown-menu" aria-labelledby="{{ $menu_id }}">
-                      {{ range .Children }}
-                        <li>
-                          <a class="link-unstyled" href="{{ .URL }}" {{ with .Params.target -}} target="{{ . | safeHTMLAttr }}" {{- end }}>
-                            {{ .Name }}
-                            {{ with .Params.external }}<i class="external-icon fa-solid fa-arrow-up-right-from-square" aria-hidden="true"></i>{{ end }}
-                          </a>
-                        </li>
-                      {{ end }}
-                    </ul>
-                  </div>
-                {{ else }}
-                  <button 
-                      class="nav-link-js btn-link link-unstyled" 
-                      type="button"
-                      aria-expanded="true" 
-                      data-menu-target="{{ $target_menu }}"
-                  >
-                      {{ .Name }}
-                  </button>
-                {{ end }}
-            </li>
+      {{/* Unless if any of the menus are 3-levels deep then we will show a mega menu. */}}
+      {{ range .Children }}
+        {{ if .HasChildren }}
+          {{ $menu_type = "mega" }}
         {{ end }}
-    </ul>
+      {{ end }}
+
+      {{ if eq $menu_type "link" }}
+        <li>
+          <a href="{{ .URL }}">{{ .Name }}</a>
+        </li>
+      {{ else if eq $menu_type "dropdown" }}
+        <li class="dropdown">
+          <button
+            class="dropdown-toggle btn btn-link"
+            data-toggle="dropdown"
+            aria-haspopup="true"
+            aria-expanded="false"
+          >
+            {{ .Name }}
+          </button>
+        </li>
+      {{ else if eq $menu_type "mega" }}
+        <li>
+          <button type="button" class="btn btn-link" data-target="{{ $target_menu }}">{{ .Name }}</button>
+        </li>
+      {{ end }}
+    {{ end }}
+  </ul>
 </nav>

package/layouts/partials/navbar.html

@@ -1,17 +1,14 @@
-{{/* 
-  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
-*/}}
+-->
 
-{{ $logo := .Site.Params.logo | default "https://www.eclipse.org/eclipse.org-common/themes/solstice/public/images/logo/eclipse-foundation-grey-orange.svg" }}
+{{ $logo := .Site.Params.logo | default "https://www.eclipse.org/eclipse.org-common/themes/solstice/public/images/logo/eclipse-foundation-white-orange.svg" }}
 {{ $logo_width := .Site.Params.logo_width | default "150" }}
 {{ $logo_title := .Site.Params.logo_title | default $.Site.Title }}
 
@@ -22,30 +19,112 @@
 
 {{ $hide_cfa := .Site.Params.hide_call_for_action | default .Page.Params.hide_call_for_action | default false }}
 
-<div class="header-navbar-wrapper">
-    <div class="container">
-        <div class="header-navbar">
-            <div class="header-navbar-brand">
-                <a class="logo-wrapper" href="/" title="{{ $logo_title }}">
-                    <img src="{{ $logo }}" alt="" width="{{ $logo_width }}" />
-                </a>
-            </div>
-            {{ partial "nav.html" . }}
-            <div class="header-navbar-end">
-                {{ if not $hide_cfa }}
+<div class="navigation-bar dark">
+  <div class="container">
+    <div class="navigation-bar-inner">
+      <div class="navigation-bar-left">
+        <a class="focus-highlight focus-inverse" href="/">
+          <img
+            class="navigation-bar-brand"
+            src="{{ $logo }}"
+            alt="{{ $logo_title }}"
+          />
+        </a>
+      </div>
+      {{ partial "nav.html" . }}
+      <div class="navigation-bar-right">
+        <!-- Navbar controls -->
+        <div class="navigation-bar-controls hidden-xs hidden-sm">
+          <ul>
+            <li class="dropdown">
+              <a
+                class="dropdown-toggle link-unstyled focus-highlight"
+                tabindex="0"
+                id="search-dropdown-toggle"
+                data-toggle="dropdown"
+                href="#"
+                aria-label="Search"
+              >
+                <i class="fa-solid fa-magnifying-glass" aria-hidden="true"></i>
+              </a>
+              <form
+                class="search-bar dropdown-menu dropdown-menu-right"
+                aria-labelledby="search-dropdown-toggle"
+                action="https://www.eclipse.org/home/search/"
+                method="get"
+              >
+                <input class="search-bar-input" name="q" placeholder="Search" />
+                <button class="btn btn-link" type="submit">
+                  <i class="fa-solid fa-arrow-right"></i>
+                </button>
+              </form>
+            </li>
+            <li class="dropdown">
+              <a
+                class="dropdown-toggle focus-highlight"
+                id="user-menu"
+                href="#"
+                data-toggle="dropdown"
+                aria-haspopup="true"
+                aria-expanded="false"
+                tabindex="0"
+              >
+                <i class="fa-regular fa-user" aria-hidden="true"></i>
+              </a>
+              <ul
+                class="dropdown-menu dropdown-menu-right"
+                aria-labelledby="user-menu"
+              >
+                <li>
+                  <a href="https://accounts.eclipse.org/user">
+                    <i
+                      class="fa-solid fa-user margin-right-10"
+                      aria-hidden="true"
+                    ></i>
+                    View my account
+                  </a>
+                </li>
+                <li>
+                  <a href="https://accounts.eclipse.org/user/edit">
+                    <i
+                      class="fa-solid fa-edit margin-right-10"
+                      aria-hidden="true"
+                    ></i>
+                    Edit my account
+                  </a>
+                </li>
+                <li>
+                  <a role="link" class="toolbar-manage-cookies" href="#" tabindex="0">
+                    <i
+                      class="fa-solid fa-wrench margin-right-10"
+                      aria-hidden=""
+                    ></i>
+                    Manage cookies
+                  </a>
+                </li>
+              </ul>
+            </li>
+          </ul>
+        </div>
+        <!-- Navbar controls end -->
+        {{ if not $hide_cfa }}
+          <div class="navigation-bar-ctas hidden-xs hidden-sm">
+            <ul>
+              <li>
                 <a 
-                  class="header-navbar-end-download-btn btn btn-primary" 
-                  href="{{ $call_for_action_url }}" 
-                  {{ with $call_for_action_id -}} id="{{ . }}" {{- end }}
+                  class="btn btn-outline-primary" 
+                  {{ with $call_for_action_id -}} id="{{ . }}" {{- end }} 
+                  href="{{ $call_for_action_url }}"
                 >
-                  <i class="fa {{ $call_for_action_icon }}" aria-hidden="true"></i>
                   {{ $call_for_action_text }}
-                  </a>
-                {{ end }}
-                <button class="mobile-menu-btn" aria-label="Toggle mobile navigation menu" aria-expanded="false">
-                    <i class="fa fa-bars fa-xl"></i>
-                </button>
-            </div>
-        </div>
+                </a>
+              </li>
+            </ul>
+          </div>
+        {{ end }}
+        <a class="mobile-menu-toggle visible-xs visible-sm" aria-expanded="false">
+        </a>
+      </div>
     </div>
+  </div>
 </div>

package/layouts/partials/sidebar.html

@@ -1,15 +1,12 @@
-{{/* 
-  Copyright (c) 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:
-    Olivier Goulet <olivier.goulet@eclipse-foundation.org>
-    Zachary Sabourin <zachary.sabourin@eclipse-foundation.org>
-
   SPDX-License-Identifier: EPL-2.0
-*/}}
+-->
 
 {{ if isset .Site.Menus "sidebar" }}
   {{ $identifiers := slice "home" }}
@@ -23,57 +20,54 @@
   {{ $menu_sections := where .Site.Menus.sidebar "Identifier" "in" $identifiers}}
 
   {{ with $menu_sections }}
-    <aside class="main-sidebar-default-margin" id="main-sidebar">
-      {{ range . }}
-        {{ if .HasChildren }}
-          <ul class="ul-left-nav" id="leftnav" role="tablist" aria-multiselectable="true">
-            <li class="main-sidebar-main-item main-sidebar-item-indented separator">
-              {{ if .URL }}
-                <a class="main-sidebar-heading link-unstyled" href="{{ .URL }}">
-                  {{ .Name }}
-                </a>
-              {{ else }}
-                <p class="main-sidebar-heading">
-                  {{ .Name }}
-                </p>
-              {{ end }}
-            </li>
-            {{ range .Children }}
-              <li class="main-sidebar-item main-sidebar-item-indented">
-                {{ if .HasChildren }}
-                  <li class="main-sidebar-item main-sidebar-item-indented">
-                    <a class="link-unstyled" role="button" data-toggle="collapse" href="#{{ .Identifier }}" aria-expanded="false" aria-controls="{{ .Identifier }}">
-                      <span>{{ .Name }}</span>
-                      <i class="main-sidebar-item-icon fa fa-chevron-down" aria-hidden="true"></i>
-                    </a>
-                    <div class="collapse" id="{{ .Identifier }}">
-                      <ul class="main-sidebar-item-submenu list-unstyled">
+    <aside class="sidebar">
+      <a 
+        class="sidebar-toggle sidebar-toggle-open" 
+        type="button" 
+        href="#sidebar-open"
+      >
+        <i class="fa-solid fa-bars" aria-hidden="true"></i>
+      </a>
+      <a 
+        class="sidebar-toggle sidebar-toggle-close" 
+        type="button" 
+        href="#sidebar-close"
+      >
+        <i class="fa-solid fa-close" aria-hidden="true"></i>
+      </a>
+      <nav>
+        <ul class="sidebar-menu">
+          {{ range $index, $menu := . }}
+            <li class="menu-group">
+              <!-- bootstrap 3 collapse -->
+              <a href="#{{ $menu.Identifier }}" data-toggle="collapse" aria-expanded="{{ if eq $index 0 -}} true {{- else -}} false {{- end}}" class="dropdown-toggle">
+                {{ $menu.Name }}
+              </a>
+              <ul class="collapse {{ if eq $index 0 -}} in {{- end }}" id="{{ $menu.Identifier }}">
+                {{ range $menu.Children }}
+                  {{ if .HasChildren }}
+                    <li class="menu-subgroup">
+                      <a href="#{{ .Identifier }}" data-toggle="collapse" aria-expanded="false" class="dropdown-toggle">
+                        {{ .Name }}
+                      </a>
+                      <ul class="collapse" id="{{ .Identifier }}">
                         {{ range .Children }}
-                        <li class="submenu-item">
-                          {{ .Pre }}
-                          <a class="link-unstyled" href="{{ .URL | relURL }}" target="_self">{{ .Name }}</a>
-                        </li>
+                          <li><a href="{{ .URL }}">{{ .Name }}</a></li>
                         {{ end }}
                       </ul>
-                    </div>
-                  </li>
-                {{ else }}
-                  <li class="main-sidebar-item main-sidebar-item-indented">
-                    <a class="link-unstyled" href="{{ .URL | relURL }}">
-                      <div>
-                        <span class="main-sidebar-item-pre" aria-hidden="true">
-                          {{ .Pre }}
-                        </span>
-                        {{ .Name }}
-                      </div>
-                    </a>
-                  </li>
+                    </li>
+                  {{ else }}
+                    <li>
+                      <a href="{{ .URL }}">{{ .Name }}</a>
+                    </li>
+                  {{ end }}
                 {{ end }}
-              </li>
-            {{ end }}
-          </ul>
-        {{ end }}
-      {{ end }}
+              </ul>
+            </li>
+          {{ end }}
+        </ul>
+      </nav>
     </aside>
   {{ end }}
 {{ end }}
+

package/layouts/partials/socials.html

@@ -1,97 +1,22 @@
-{{/* 
-  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
-*/}}
-
-{{ $twitter_url := $.Site.Params.twitter_url }}
-{{ $facebook_url := $.Site.Params.facebook_url }}
-{{ $instagram_url := $.Site.Params.instagram_url }}
-{{ $youtube_url := $.Site.Params.youtube_url }}
-{{ $linkedin_url := $.Site.Params.linkedin_url }}
-{{ $bluesky_url := $.Site.Params.bluesky_url }}
+-->
 
-{{/* To support the legacy "socialmedia_url" params */}}
-{{ $socials := slice }}
-{{ $using_legacy_socials := cond (or (ne $facebook_url nil) (ne $twitter_url nil) (ne $instagram_url nil) (ne $youtube_url nil) (ne $linkedin_url nil) (ne $bluesky_url nil)) true false }}
-
-{{ if $using_legacy_socials }}
-  {{ with $twitter_url }}
-    {{ $x := (dict 
-      "name" "X"
-      "url" .
-      "icon" "fa-brands fa-x-twitter"
-    ) }}
-    {{ $socials = $socials | append $x }}
-  {{ end }}
-  {{ with $facebook_url }}
-    {{ $facebook := (dict 
-      "name" "Facebook"
-      "url" .
-      "icon" "fa-brands fa-facebook-f"
-    ) }}
-    {{ $socials = $socials | append $facebook }}
+<ul class="social-media-list">
+  {{ range $.Site.Params.socials }}
+    <li>
+      <a href="{{ .url }}" aria-label="{{ .name }}">
+        <span class="fa-stack">
+          <i class="fa-solid fa-circle fa-stack-2x" aria-hidden="true"></i>
+          <i class="{{ .icon }} fa-stack-1x fa-inverse" aria-hidden="true"></i>
+        </span>
+      </a>
+    </li>
   {{ end }}
-  {{ with $instagram_url }}
-    {{ $instagram := (dict
-      "name" "Instagram"
-      "url" .
-      "icon" "fa-brands fa-instagram"
-    ) }}
-    {{ $socials = $socials | append $instagram }}
-  {{ end }}
-  {{ with $youtube_url }}
-    {{ $youtube := (dict
-      "name" "YouTube"
-      "url" .
-      "icon" "fa-brands fa-youtube"
-    ) }}
-    {{ $socials = $socials | append $youtube }}
-  {{ end }}
-  {{ with $linkedin_url }}
-    {{ $linkedin := (dict
-      "name" "LinkedIn"
-      "url" .
-      "icon" "fa-brands fa-linkedin-in"
-    ) }}
-    {{ $socials = $socials | append $linkedin }}
-  {{ end }}
-  {{ with $bluesky_url }}
-    {{ $bluesky := (dict
-      "name" "Bluesky"
-      "url" .
-      "icon" "fa-brands fa-bluesky"
-    ) }}
-    {{ $socials = $socials | append $bluesky }}
-  {{ end }}
-{{ else }}
-  {{ $socials = $.Site.Params.socials }}
-{{ end }}
-
-<div class="footer-end-social">
-  <p class="footer-end-social-text hidden-xs">Follow Us:</p>
-  <ul class="footer-end-social-links list-unstyled">
-    {{ range $socials }}
-      {{ $text := i18n "footer-sr-social-account" .name | default (printf "%s account" .name) }}
-      <li>
-        <a 
-          class="link-unstyled" 
-          href="{{ .url }}" 
-          title="{{ $text }}"
-        >
-          <span class="fa-stack">
-            <i class="fa-solid fa-circle fa-stack-2x" aria-hidden="true"></i>
-            <i class="{{ .icon }} fa-stack-1x fa-inverse" aria-hidden="true"></i>
-            <span class="sr-only">{{ $text }}</span>
-          </span>
-        </a>
-      </li>
-    {{ end }}
-  </ul>
-</div>
+</ul>

package/layouts/partials/toolbar.html

@@ -1,77 +1,11 @@
-{{/* 
-  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
-*/}}
+-->
 
-<div class="header-toolbar">
-    <div class="container">
-        <div class="header-toolbar-row">
-            <div class="toolbar-btn toolbar-search-btn dropdown">
-                <button 
-                    class="dropdown-toggle" 
-                    id="toolbar-search" 
-                    type="button" 
-                    data-toggle="dropdown"
-                    tabindex="0"
-                    aria-label="Search"
-                >
-                    <i class="fa fa-search fa-lg" aria-role="none"></i>
-                </button>
-                <div 
-                    class="toolbar-search-bar-wrapper dropdown-menu dropdown-menu-right"
-                    aria-labelledby="toolbar-search"
-                >
-                      <form action="https://www.eclipse.org/home/search" method="get">
-                    <div class="search-bar">
-                        <input class="search-bar-input" name="q" placeholder="Search" />
-                        <button>
-                            <i class="fa fa-search" type="submit"></i>
-                        </button>
-                    </div>
-                      </form>
-                </div>
-            </div>
-            <div class="toolbar-btn toolbar-user-menu-btn dropdown">
-                <button 
-                    class="dropdown-toggle" 
-                    id="toolbar-user-menu" 
-                    type="button" 
-                    data-toggle="dropdown"
-                    tabindex="0"
-                    aria-label="User Menu"
-                >
-                    <i class="fa fa-user fa-lg"></i>
-                </button>
-                <ul class="toolbar-user-menu dropdown-menu dropdown-menu-right text-center"
-                    aria-labelledby="toolbar-user-menu">
-                    <li>
-                        <a href="https://accounts.eclipse.org/user">
-                            <i class="fa fa-user"></i>
-                            View My Account
-                        </a>
-                    </li>
-                    <li>
-                        <a href="https://accounts.eclipse.org/user/edit">
-                            <i class="fa fa-edit"></i>
-                            Edit My Account
-                        </a>
-                    </li>
-                    <li>
-                        <a class="toolbar-manage-cookies">
-                            <i class="fa fa-wrench"></i>
-                            Manage Cookies
-                        </a>
-                    </li>
-                </ul>
-            </div>
-        </div>
-    </div>
-</div>
+<!-- Neptune has no toolbar, so this file is intentionally left blank -->

package/package.json

@@ -4,7 +4,7 @@
   "main": "webpack.min.js",
   "author": "Christopher Guindon",
   "license": "EPL-2.0",
-  "version": "2.1.0",
+  "version": "3.0.1",
   "bugs": {
     "url": "https://gitlab.eclipse.org/eclipsefdn/it/webdev/hugo-solstice-theme/-/issues"
   },
@@ -18,7 +18,8 @@
     "hot": "NODE_ENV=development webpack-dev-server --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
     "production": "NODE_ENV=production webpack --progress --config=node_modules/laravel-mix/setup/webpack.config.js",
     "fetch_project": "node bin/projects/index.js -l exampleSite/data",
-    "build": "npm run production && npm run fetch_project"
+    "build": "npm run production && npm run fetch_project",
+    "changeset": "changeset"
   },
   "readmeFilename": "README.md",
   "dependencies": {
@@ -27,8 +28,10 @@
     "toml": "^3.0.0"
   },
   "browserslist": "last 5 version, > 0.2%, not dead, IE 11",
-  "devDependencies": {},
+  "devDependencies": {
+    "@changesets/cli": "^2.31.0"
+  },
   "peerDependencies": {
-    "@eclipsefdn/solstice-components": "~0.7.0"
+    "@eclipsefdn/solstice-components": ">=0.7.0 <1.0.0"
   }
 }

package/webpack.mix.js

@@ -20,13 +20,13 @@ mix.setPublicPath('static');
 mix.setResourceRoot('../');
 
 mix.less(
-  './node_modules/eclipsefdn-solstice-assets/less/astro/main.less', 
-  'static/css/astro.css'
+  './node_modules/eclipsefdn-solstice-assets/less/neptune/main.less', 
+  'static/css/neptune.css'
 );
 
 mix.js(
-  ['./node_modules/eclipsefdn-solstice-assets/js/astro.js'],
-  './static/js/astro.js'
+  ['./node_modules/eclipsefdn-solstice-assets/js/neptune.js'],
+  './static/js/neptune.js'
 );
 
 mix.js(['./node_modules/eclipsefdn-solstice-assets/js/solstice/eclipsefdn.projects.ts'], './static/js/eclipsefdn.projects.js');