eclipsefdn-hugo-solstice-theme 0.0.172 → 0.0.174

package/Jenkinsfile

@@ -0,0 +1,13 @@
+@Library('releng-pipeline') _
+
+hugo (
+  appName: 'webdev.eclipse.org-docs-hugo',
+  productionDomain: 'webdev.eclipse.org',
+  build: [
+    containerImage: 'eclipsefdn/hugo-node:h0.76.5-n12.22.1',
+    script: 'bin/build.sh'
+  ],
+  deployment: [
+    locationPath: '/docs/hugo'
+  ]
+)

package/README.md

@@ -67,7 +67,7 @@ Versions of Hugo 0.60 and beyond do not support raw HTML in markdown files by de
 
 ## Documentation
 
-- <https://eclipsefdn-hugo-solstice-theme.netlify.com/>
+- <https://webdev.eclipse.org/docs/hugo>
 
 ## Bugs and Feature Requests
 

package/bin/build.sh

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+# ===========================================================================
+# Copyright (c) 2021 Eclipse Foundation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#    Christopher Guindon (Eclipse Foundation)
+# ==========================================================================
+
+set -euo pipefail
+
+yarn install --frozen-lockfile;
+yarn run build
+hugo --source exampleSite --theme "${PWD##*/}" --themesDir ../../ --gc --minify --destination ."${1}" --baseURL "${2}"

package/exampleSite/config/_default/config.toml

@@ -4,6 +4,7 @@ theme = "hugo-solstice-theme"
 metaDataFormat = "yaml"
 googleAnalytics = ""
 #disableKinds = ["taxonomy", "taxonomyTerm"]
+baseURL = "https://webdev.eclipse.org/docs/hugo"
 
 [Params]
   google_tag_manager = "GTM-5WLCZXC"

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

@@ -257,7 +257,7 @@
 
 [[sidebar]]
     name = "Component list"
-    url = "/components"
+    url = "/components/"
     weight = 1
     parent = "home"
     pre = "<i class=\"fa fa-chevron-right fa-fw\"></i>"
@@ -272,33 +272,33 @@
 
 [[sidebar]]
     name = "Translation Guide"
-    url = "/translations"
+    url = "/translations/"
     weight = 3
     parent = "home"
     identifier = "translation-guide"
 
 [[sidebar]]
     name = "Translation Guide 1"
-    url = "/translations"
+    url = "/translations/"
     weight = 1
     parent = "translation-guide"
 
 [[sidebar]]
     name = "Translation Guide 2"
-    url = "/translations"
+    url = "/translations/"
     weight = 1
     parent = "translation-guide"
 
 [[sidebar]]
     name = "Third parent"
-    url = "/third-parent"
+    url = "/third-parent/"
     weight = 2
     pre = "<i class=\"sidebar-menu-icon\" data-feather=\"github\"></i>"
     identifier = "third-parent"
 
 [[sidebar]]
     name = "Test Children"
-    url = "/third-parent/test-children"
+    url = "/third-parent/test-children/"
     weight = 1
     parent = "third-parent"
     pre = "<i class=\"fa fa-chevron-right fa-fw\"></i>"
@@ -306,7 +306,7 @@
 
 [[sidebar]]
     name = "Test Children 2"
-    url = "/third-parent/test-children-2"
+    url = "/third-parent/test-children-2/"
     weight = 1
     parent = "third-parent"
     pre = "<i class=\"fa fa-chevron-right fa-fw\"></i>"
@@ -314,13 +314,13 @@
 
 [[sidebar]]
     name = "Test Children Children 1"
-    url = "/third-parent/test-children/test-children-children"
+    url = "/third-parent/test-children/test-children-children/"
     weight = 1
     parent = "test-children"
 
 [[sidebar]]
     name = "Test Children Children 2"
-    url = "/third-parent/test-children/test-children-children-2"
+    url = "/third-parent/test-children/test-children-children-2/"
     weight = 2
     parent = "test-children"
 

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

@@ -233,7 +233,7 @@
 
 [[sidebar]]
     name = "Component list"
-    url = "/components"
+    url = "/components/"
     weight = 1
     parent = "home"
     pre = "<i class=\"fa fa-chevron-right fa-fw\"></i>"
@@ -248,33 +248,33 @@
 
 [[sidebar]]
     name = "Translation Guide"
-    url = "/translations"
+    url = "/translations/"
     weight = 3
     parent = "home"
     identifier = "translation-guide"
 
 [[sidebar]]
     name = "Translation Guide 1"
-    url = "/translations"
+    url = "/translations/"
     weight = 1
     parent = "translation-guide"
 
 [[sidebar]]
     name = "Translation Guide 2"
-    url = "/translations"
+    url = "/translations/"
     weight = 1
     parent = "translation-guide"
 
 [[sidebar]]
     name = "Third parent"
-    url = "/third-parent"
+    url = "/third-parent/"
     weight = 2
     pre = "<i class=\"sidebar-menu-icon\" data-feather=\"github\"></i>"
     identifier = "third-parent"
 
 [[sidebar]]
     name = "Test Children"
-    url = "/third-parent/test-children"
+    url = "/third-parent/test-children/"
     weight = 1
     parent = "third-parent"
     pre = "<i class=\"fa fa-chevron-right fa-fw\"></i>"
@@ -282,7 +282,7 @@
 
 [[sidebar]]
     name = "Test Children 2"
-    url = "/third-parent/test-children-2"
+    url = "/third-parent/test-children-2/"
     weight = 1
     parent = "third-parent"
     pre = "<i class=\"fa fa-chevron-right fa-fw\"></i>"
@@ -290,13 +290,13 @@
 
 [[sidebar]]
     name = "Test Children Children 1"
-    url = "/third-parent/test-children/test-children-children"
+    url = "/third-parent/test-children/test-children-children/"
     weight = 1
     parent = "test-children"
 
 [[sidebar]]
     name = "Test Children Children 2"
-    url = "/third-parent/test-children/test-children-children-2"
+    url = "/third-parent/test-children/test-children-children-2/"
     weight = 2
     parent = "test-children"
 

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

@@ -234,7 +234,7 @@
 
 [[sidebar]]
     name = "Liste des composantes"
-    url = "/components"
+    url = "/components/"
     weight = 1
     parent = "home"
     pre = "<i class=\"fa fa-chevron-right fa-fw\"></i>"
@@ -249,32 +249,32 @@
 
 [[sidebar]]
     name = "Translation Guide"
-    url = "/translations"
+    url = "/translations/"
     weight = 3
     parent = "home"
 
 [[sidebar]]
     name = "Translation Guide 1"
-    url = "/translations"
+    url = "/translations/"
     weight = 1
     parent = "translation-guide"
 
 [[sidebar]]
     name = "Translation Guide 2"
-    url = "/translations"
+    url = "/translations/"
     weight = 1
     parent = "translation-guide"
 
 [[sidebar]]
     name = "Third parent"
-    url = "/third-parent"
+    url = "/third-parent/"
     weight = 2
     pre = "<i class=\"sidebar-menu-icon\" data-feather=\"github\"></i>"
     identifier = "third-parent"
 
 [[sidebar]]
     name = "Test Children"
-    url = "/third-parent/test-children"
+    url = "/third-parent/test-children/"
     weight = 1
     parent = "third-parent"
     pre = "<i class=\"fa fa-chevron-right fa-fw\"></i>"
@@ -282,7 +282,7 @@
 
 [[sidebar]]
     name = "Test Children 2"
-    url = "/third-parent/test-children-2"
+    url = "/third-parent/test-children-2/"
     weight = 1
     parent = "third-parent"
     pre = "<i class=\"fa fa-chevron-right fa-fw\"></i>"
@@ -290,13 +290,13 @@
 
 [[sidebar]]
     name = "Test Children Children 1"
-    url = "/third-parent/test-children/test-children-children"
+    url = "/third-parent/test-children/test-children-children/"
     weight = 1
     parent = "test-children"
 
 [[sidebar]]
     name = "Test Children Children 2"
-    url = "/third-parent/test-children/test-children-children-2"
+    url = "/third-parent/test-children/test-children-children-2/"
     weight = 2
     parent = "test-children"
 

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

@@ -233,7 +233,7 @@
 
 [[sidebar]]
     name = "Component list"
-    url = "/components"
+    url = "/components/"
     weight = 1
     parent = "home"
     pre = "<i class=\"fa fa-chevron-right fa-fw\"></i>"
@@ -248,33 +248,33 @@
 
 [[sidebar]]
     name = "Translation Guide"
-    url = "/translations"
+    url = "/translations/"
     weight = 3
     parent = "home"
     identifier = "translation-guide"
 
 [[sidebar]]
     name = "Translation Guide 1"
-    url = "/translations"
+    url = "/translations/"
     weight = 1
     parent = "translation-guide"
 
 [[sidebar]]
     name = "Translation Guide 2"
-    url = "/translations"
+    url = "/translations/"
     weight = 1
     parent = "translation-guide"
 
 [[sidebar]]
     name = "Third parent"
-    url = "/third-parent"
+    url = "/third-parent/"
     weight = 2
     pre = "<i class=\"sidebar-menu-icon\" data-feather=\"github\"></i>"
     identifier = "third-parent"
 
 [[sidebar]]
     name = "Test Children"
-    url = "/third-parent/test-children"
+    url = "/third-parent/test-children/"
     weight = 1
     parent = "third-parent"
     pre = "<i class=\"fa fa-chevron-right fa-fw\"></i>"
@@ -282,7 +282,7 @@
 
 [[sidebar]]
     name = "Test Children 2"
-    url = "/third-parent/test-children-2"
+    url = "/third-parent/test-children-2/"
     weight = 1
     parent = "third-parent"
     pre = "<i class=\"fa fa-chevron-right fa-fw\"></i>"
@@ -290,13 +290,13 @@
 
 [[sidebar]]
     name = "Test Children Children 1"
-    url = "/third-parent/test-children/test-children-children"
+    url = "/third-parent/test-children/test-children-children/"
     weight = 1
     parent = "test-children"
 
 [[sidebar]]
     name = "Test Children Children 2"
-    url = "/third-parent/test-children/test-children-children-2"
+    url = "/third-parent/test-children/test-children-children-2/"
     weight = 2
     parent = "test-children"
 

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

@@ -233,7 +233,7 @@
 
 [[sidebar]]
     name = "Component list"
-    url = "/components"
+    url = "/components/"
     weight = 1
     parent = "home"
     pre = "<i class=\"fa fa-chevron-right fa-fw\"></i>"
@@ -248,33 +248,33 @@
 
 [[sidebar]]
     name = "Translation Guide"
-    url = "/translations"
+    url = "/translations/"
     weight = 3
     parent = "home"
     identifier = "translation-guide"
 
 [[sidebar]]
     name = "Translation Guide 1"
-    url = "/translations"
+    url = "/translations/"
     weight = 1
     parent = "translation-guide"
 
 [[sidebar]]
     name = "Translation Guide 2"
-    url = "/translations"
+    url = "/translations/"
     weight = 1
     parent = "translation-guide"
 
 [[sidebar]]
     name = "Third parent"
-    url = "/third-parent"
+    url = "/third-parent/"
     weight = 2
     pre = "<i class=\"sidebar-menu-icon\" data-feather=\"github\"></i>"
     identifier = "third-parent"
 
 [[sidebar]]
     name = "Test Children"
-    url = "/third-parent/test-children"
+    url = "/third-parent/test-children/"
     weight = 1
     parent = "third-parent"
     pre = "<i class=\"fa fa-chevron-right fa-fw\"></i>"
@@ -282,7 +282,7 @@
 
 [[sidebar]]
     name = "Test Children 2"
-    url = "/third-parent/test-children-2"
+    url = "/third-parent/test-children-2/"
     weight = 1
     parent = "third-parent"
     pre = "<i class=\"fa fa-chevron-right fa-fw\"></i>"
@@ -290,13 +290,13 @@
 
 [[sidebar]]
     name = "Test Children Children 1"
-    url = "/third-parent/test-children/test-children-children"
+    url = "/third-parent/test-children/test-children-children/"
     weight = 1
     parent = "test-children"
 
 [[sidebar]]
     name = "Test Children Children 2"
-    url = "/third-parent/test-children/test-children-children-2"
+    url = "/third-parent/test-children/test-children-children-2/"
     weight = 2
     parent = "test-children"
 

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

@@ -233,7 +233,7 @@
 
 [[sidebar]]
     name = "Component list"
-    url = "/components"
+    url = "/components/"
     weight = 1
     parent = "home"
     pre = "<i class=\"fa fa-chevron-right fa-fw\"></i>"
@@ -248,33 +248,33 @@
 
 [[sidebar]]
     name = "Translation Guide"
-    url = "/translations"
+    url = "/translations/"
     weight = 3
     parent = "home"
     identifier = "translation-guide"
 
 [[sidebar]]
     name = "Translation Guide 1"
-    url = "/translations"
+    url = "/translations/"
     weight = 1
     parent = "translation-guide"
 
 [[sidebar]]
     name = "Translation Guide 2"
-    url = "/translations"
+    url = "/translations/"
     weight = 1
     parent = "translation-guide"
 
 [[sidebar]]
     name = "Third parent"
-    url = "/third-parent"
+    url = "/third-parent/"
     weight = 2
     pre = "<i class=\"sidebar-menu-icon\" data-feather=\"github\"></i>"
     identifier = "third-parent"
 
 [[sidebar]]
     name = "Test Children"
-    url = "/third-parent/test-children"
+    url = "/third-parent/test-children/"
     weight = 1
     parent = "third-parent"
     pre = "<i class=\"fa fa-chevron-right fa-fw\"></i>"
@@ -282,7 +282,7 @@
 
 [[sidebar]]
     name = "Test Children 2"
-    url = "/third-parent/test-children-2"
+    url = "/third-parent/test-children-2/"
     weight = 1
     parent = "third-parent"
     pre = "<i class=\"fa fa-chevron-right fa-fw\"></i>"
@@ -290,13 +290,13 @@
 
 [[sidebar]]
     name = "Test Children Children 1"
-    url = "/third-parent/test-children/test-children-children"
+    url = "/third-parent/test-children/test-children-children/"
     weight = 1
     parent = "test-children"
 
 [[sidebar]]
     name = "Test Children Children 2"
-    url = "/third-parent/test-children/test-children-children-2"
+    url = "/third-parent/test-children/test-children-children-2/"
     weight = 2
     parent = "test-children"
 

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

@@ -233,7 +233,7 @@
 
 [[sidebar]]
     name = "Component list"
-    url = "/components"
+    url = "/components/"
     weight = 1
     parent = "home"
     pre = "<i class=\"fa fa-chevron-right fa-fw\"></i>"
@@ -248,33 +248,33 @@
 
 [[sidebar]]
     name = "Translation Guide"
-    url = "/translations"
+    url = "/translations/"
     weight = 3
     parent = "home"
     identifier = "translation-guide"
 
 [[sidebar]]
     name = "Translation Guide 1"
-    url = "/translations"
+    url = "/translations/"
     weight = 1
     parent = "translation-guide"
 
 [[sidebar]]
     name = "Translation Guide 2"
-    url = "/translations"
+    url = "/translations/"
     weight = 1
     parent = "translation-guide"
 
 [[sidebar]]
     name = "Third parent"
-    url = "/third-parent"
+    url = "/third-parent/"
     weight = 2
     pre = "<i class=\"sidebar-menu-icon\" data-feather=\"github\"></i>"
     identifier = "third-parent"
 
 [[sidebar]]
     name = "Test Children"
-    url = "/third-parent/test-children"
+    url = "/third-parent/test-children/"
     weight = 1
     parent = "third-parent"
     pre = "<i class=\"fa fa-chevron-right fa-fw\"></i>"
@@ -282,7 +282,7 @@
 
 [[sidebar]]
     name = "Test Children 2"
-    url = "/third-parent/test-children-2"
+    url = "/third-parent/test-children-2/"
     weight = 1
     parent = "third-parent"
     pre = "<i class=\"fa fa-chevron-right fa-fw\"></i>"
@@ -290,13 +290,13 @@
 
 [[sidebar]]
     name = "Test Children Children 1"
-    url = "/third-parent/test-children/test-children-children"
+    url = "/third-parent/test-children/test-children-children/"
     weight = 1
     parent = "test-children"
 
 [[sidebar]]
     name = "Test Children Children 2"
-    url = "/third-parent/test-children/test-children-children-2"
+    url = "/third-parent/test-children/test-children-children-2/"
     weight = 2
     parent = "test-children"
 

package/layouts/partials/sidebar-block.html

@@ -1,4 +1,4 @@
-<!-- 
+<!--
   Copyright (c) 2018 Eclipse Foundation, Inc.
 
   This program and the accompanying materials are made available under the
@@ -24,7 +24,7 @@
         {{ range .Children }}
           {{ if .HasChildren }}
             <div class="row sidebar-block-item{{ if eq $currentPage.Title .Name }} active{{ end }}">
-              <a href="{{ .URL }}" {{ if eq $currentPage.Title .Name }}class="active"{{ end }}>
+              <a href="{{ .URL | absURL }}" {{ if eq $currentPage.Title .Name }}class="active"{{ end }}>
                 <div class="col-xs-6">{{ .Pre }}</div>
                 <div class="col-xs-18 sidebar-block-text">{{ .Name }}</div>
               </a>
@@ -32,7 +32,7 @@
             <div class="row sidebar-block-sub-items margin-bottom-20">
               {{ range .Children }}
                 <div class="row sidebar-block-sub-item{{ if eq $currentPage.Title .Name }} active{{ end }}">
-                  <a href="{{ .URL }}" {{ if eq $currentPage.Title .Name }}class="active"{{ end }}>
+                  <a href="{{ .URL | absURL }}" {{ if eq $currentPage.Title .Name }}class="active"{{ end }}>
                     <div class="col-xs-18 col-xs-offset-6 sidebar-block-text">{{ .Name }}</div>
                   </a>
                 </div>
@@ -40,7 +40,7 @@
             </div>
           {{ else if or (eq $parentItem.Identifier $currentSection) (eq .Parent $currentSection) }}
             <div class="row sidebar-block-item{{ if eq $currentPage.Title .Name }} active{{ end }}">
-              <a href="{{ .URL }}" {{ if eq $currentPage.Title .Name }}class="active"{{ end }}>
+              <a href="{{ .URL | absURL }}" {{ if eq $currentPage.Title .Name }}class="active"{{ end }}>
                 <div class="col-xs-6">{{ .Pre }}</div>
                 <div class="col-xs-18 sidebar-block-text">{{ .Name }}</div>
               </a>

package/layouts/partials/sidebar.html

@@ -1,4 +1,4 @@
-<!-- 
+<!--
   Copyright (c) 2018 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
@@ -15,23 +15,23 @@
   {{ if $currentPage.Section }}
     {{ .Scratch.Set "currentSection" $currentPage.Section }}
   {{ end }}
-  
+
   {{$currentSection := .Scratch.Get "currentSection" }}
 
   {{ range .Site.Menus.sidebar }}
     {{$parentItem := . }}
-    
+
       {{ if and (.HasChildren) (eq $currentSection $parentItem.Identifier) }}
         <aside id="main-sidebar" class="subpage-sidebar">
         <ul id="leftnav" class="ul-left-nav fa-ul hidden-print">
         <li class="separator">
-          <a class="separator" href="{{ .URL }}">{{ $parentItem.Name }}</a>
+          <a class="separator" href="{{ .URL | absURL }}">{{ $parentItem.Name }}</a>
         </li>
         {{ range .Children }}
           {{ if or (eq $parentItem.Identifier $currentSection) (eq .Parent $currentSection) }}
             <li{{if $currentPage.IsMenuCurrent "main" . }} class="active"{{end}}>
               {{ .Pre }}
-              <a href="{{ .URL }}" target="_self">{{ .Name }}</a>
+              <a href="{{ .URL | absURL }}" target="_self">{{ .Name }}</a>
             </li>
           {{ end }}
         {{ end }}

package/layouts/partials/toolbar.html

@@ -16,12 +16,12 @@
     <div class="text-right toolbar-row row hidden-print">
       <div class="col-md-24 row-toolbar-col">
         <ul class="list-inline">
-          <li><a href="https://accounts.eclipse.org/user/edit" class="" data-tab-destination="tab-profile"><i class="fa fa-edit fa-fw"></i> {{ i18n "navbar-edit-acccount-label" }}</a></li>
-          <li><a class="toolbar-link toolbar-manage-cookies dropdown-toggle"><i class="fa fa-wrench"></i> {{ i18n "navbar-manage-cookies-label" }}</a></li>
+          <li><a href="https://accounts.eclipse.org/user/edit" class="" data-tab-destination="tab-profile"><i class="fa fa-edit fa-fw"></i>&nbsp;{{ i18n "navbar-edit-acccount-label" }}</a></li>
+          <li><a class="toolbar-link toolbar-manage-cookies dropdown-toggle"><i class="fa fa-wrench"></i>&nbsp;{{ i18n "navbar-manage-cookies-label" }}</a></li>
           {{ if gt (len .AllTranslations) 1 }}
           <li class="language-selector dropdown">
             <a href="#" data-toggle="dropdown" class="dropdown-toggle">
-              <i class="fa fa-globe"></i>
+              <i class="fa fa-globe"></i>&nbsp;
               <span> {{ .Language.LanguageName }}</span>
               <b class="caret"></b>
             </a>

package/package.json

@@ -4,7 +4,7 @@
   "main": "webpack.min.js",
   "author": "Christopher Guindon",
   "license": "EPL-2.0",
-  "version": "0.0.172",
+  "version": "0.0.174",
   "bugs": {
     "url": "https://gitlab.eclipse.org/eclipsefdn/it/webdev/hugo-solstice-theme/-/issues"
   },
@@ -18,13 +18,12 @@
     "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 fetch_project && webpack --progress --config=node_modules/laravel-mix/setup/webpack.config.js",
-    "prepare_release": "rm -rf node_modules && rm package-lock.json && npm install && npm run production && git add . && git commit -m \"prepare new release\" -s"
+    "build": "npm run production && npm run fetch_project"
   },
   "readmeFilename": "README.md",
   "dependencies": {
     "axios": "^0.21.1",
-    "eclipsefdn-solstice-assets": "^0.0.210",
+    "eclipsefdn-solstice-assets": "^0.0.212",
     "json2yaml": "^1.1.0",
     "toml": "^3.0.0"
   },

package/netlify.toml

@@ -1,18 +0,0 @@
-[build]
-  command = "npm run build && hugo --gc --minify -b $URL --themesDir ../../ --source exampleSite"
-  publish = "exampleSite/public"
-
-[build.environment]
-  HUGO_THEME = "repo"
-  HUGO_VERSION = "0.76.5"
-  HUGO_ENABLEGITINFO = "true"
-  NODE_VERSION = "12.18.3"
-
-[context.production.environment]
-  HUGO_ENV = "production"
-
-[context.deploy-preview]
-  command = "npm run build && hugo --gc --minify --buildFuture -b $DEPLOY_PRIME_URL --themesDir ../../ --source exampleSite"
-
-[context.branch-deploy]
-  command = "npm run build && hugo --gc --minify -b $DEPLOY_PRIME_URL --themesDir ../../ --source exampleSite"