eclipsefdn-hugo-solstice-theme 0.1.18 → 0.1.20

package/exampleSite/config/_default/config.toml

@@ -7,6 +7,7 @@ googleAnalytics = ""
 baseURL = "https://webdev.eclipse.org/docs/hugo"
 
 [Params]
+  format_title = false
   google_tag_manager = "GTM-5WLCZXC"
   description = "Eclipse Foundation: Solstice theme for Hugo."
   subtitle = "Eclipse Foundation"

package/exampleSite/data/doc_params.yml

@@ -157,3 +157,7 @@ items:
     description: Add classes to the body element.
     values:
       - Any string value
+    name: format_title
+    description: Formats the page title in headings and breadcrumbs to title case. If there is no value set, will default to true.
+    values:
+      - "false"

package/layouts/partials/astro/jumbotron.html

@@ -31,7 +31,7 @@
           <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 false }}
+                {{ if eq (.Page.Params.format_title | default .Site.Params.format_title) false }}
                   {{ .Page.Params.headline | safeHTML }}
                 {{ else }}
                   {{ .Page.Params.headline | title | safeHTML }}

package/layouts/partials/astro/main_prefix.html

@@ -30,7 +30,7 @@
 
     {{ if ne .Page.Params.hide_page_title true }}
       <h1>
-        {{ if eq .Page.Params.format_title false }}
+        {{ if eq (.Page.Params.format_title | default .Site.Params.format_title) false }}
           {{ .Title | safeHTML }}
         {{ else }}
           {{ .Title | safeHTML | title }}

package/layouts/partials/breadcrumbs.html

@@ -26,16 +26,16 @@
     <div class="row">
       <div class="col-sm-24">
         <ol aria-label="Breadcrumb" class="breadcrumb">
-          {{ template "breadcrumbnav" (dict "p1" . "p2" .) }}
+          {{ template "breadcrumbnav" (dict "p1" . "p2" . "site_params" $.Site.Params) }}
           </ol>
           {{ define "breadcrumbnav" }}
             {{ if .p1.Parent }}
-              {{ template "breadcrumbnav" (dict "p1" .p1.Parent "p2" .p2 )  }}
+              {{ template "breadcrumbnav" (dict "p1" .p1.Parent "p2" .p2 "site_params" .site_params)  }}
             {{ else if not .p1.IsHome }}
-              {{ template "breadcrumbnav" (dict "p1" .p1.Site.Home "p2" .p2 )  }}
+              {{ template "breadcrumbnav" (dict "p1" .p1.Site.Home "p2" .p2 "site_params" .site_params)  }}
             {{ end }}
             <li {{ if eq .p1 .p2 }} class="active" aria-current="page"{{ end }}>
-              <a href="{{ .p1.Permalink }}">{{ if eq .p1.Params.format_title false }}{{ .p1.Title | safeHTML }}{{ else }}{{ .p1.Title | safeHTML | title }}{{ end }}</a>
+              <a href="{{ .p1.Permalink }}">{{ if eq (.p1.Params.format_title | default .site_params.format_title) false }}{{ .p1.Title | safeHTML }}{{ else }}{{ .p1.Title | safeHTML | title }}{{ end }}</a>
             </li>
           {{ end }}
         </div>

package/layouts/shortcodes/events/agenda.html

@@ -62,36 +62,18 @@ span.eclipsefdn-agenda-legend-icon-{{ urlize .id }}::after {
   {{ if $multiSet }}
     {{ $agendaItemsBase = $agendabase.sets }}
 
-  <div class="row content-nav-tab-toggle margin-top-0">
-    <div class="visible-xs">
-      <div class="vertical-align">
-        <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-agenda">
-          <p class="nav-label"><strong>{{ .Get "navLabel" | default "Session tracks" }}</strong></p>
-          <div class="hamburger-wrapper">
-            <span class="sr-only">Toggle navigation</span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-          </div>
-        </button>
-      </div>
-    </div>
-  </div>
-
-  <div class="row">
-    <div class="navbar-collapse collapse" id="navbar-agenda">
-      <ul class="nav nav-tabs solstice-tabs content-nav-tab" role="tablist">
+  <div id="navbar-agenda">
+    <ul class="nav nav-tabs solstice-tabs content-nav-tab" role="tablist">
       {{ range $index,$set := $agendabase.sets }}
         <li role="presentation" {{- if eq $index 0 }}class="active"{{ end -}}>
-          <a href="#agenda-sessions-{{ $index }}" data-toggle="tab" aria-controls="agenda-sessions-{{ $index }}" role="tab">
+          <a href="#agenda-sessions-{{ $set.name | urlize }}" data-toggle="tab" aria-controls="agenda-sessions-{{ $set.name | urlize }}" role="tab">
             {{ .name }}
           </a>
         </li>
       {{ end }}
-      </ul>
-    </div>
+    </ul>
   </div>
-  <div class="content-nav-tab-body tab-content no-gutters-mobile padding-40 margin-bottom-30" id="tabs-content">
+  <div class="content-nav-tab-body tab-content no-gutters-mobile margin-bottom-30" id="tabs-content">
   {{ end }}
 
   {{ $hasOrgs := false }}
@@ -128,7 +110,7 @@ span.eclipsefdn-agenda-legend-icon-{{ urlize .id }}::after {
 
     <!-- Check if multiple session sets  -->
     {{ if $multiSet }}
-      <div role="tabpanel" class="tab-pane tab-pane{{ if eq $index 0}} active{{ end }}" id="agenda-sessions-{{ $index }}">
+      <div role="tabpanel" class="tab-pane{{ if eq $index 0}} active{{ end }}" id="agenda-sessions-{{ $set.name | urlize }}">
     {{ end }}
   <div class="eclipsefdn-agenda-schedule">
     <table class="table">
@@ -248,3 +230,26 @@ span.eclipsefdn-agenda-legend-icon-{{ urlize .id }}::after {
     </div>
   {{ end }}
 </div>
+
+<script>
+// Since bootstrap default tabs behaviour prevents scrolling to the anchor
+// we need to handle this ourselves. We also allow for a custom scroll target
+// to be set via the shortcode parameter "scroll_target". If not set we default
+// to "navbar-agenda" which is the id of the tab navigation bar.
+
+document.addEventListener('DOMContentLoaded', function() {
+  const hash = window.location.hash;
+  if (hash && hash.startsWith('#agenda-session')) {
+    const targetId = '{{ .Get "scroll_target" | default "navbar-agenda" }}';
+    let element = document.getElementById(targetId);
+    if (!element) {
+      element = document.getElementById('navbar-agenda');
+    }
+    if (element) {
+      setTimeout(() => {
+        element.scrollIntoView({ behavior: 'smooth', block: 'start' });
+      }, 150);
+    }
+  }
+});
+</script>

package/package.json

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