eclipsefdn-hugo-solstice-theme 0.0.180 → 0.0.182

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/config.toml

@@ -28,6 +28,7 @@ baseURL = "https://webdev.eclipse.org/docs/hugo"
   hide_cfa_same_page = true
   show_collapsible_menu = true
   sidebar_layout = "default"
+  hide_deprecation_warnings = true
 
 [Author]
   name = "Christopher Guindon"

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

@@ -109,7 +109,7 @@
     name = "Meeting Minutes"
     url = "/components/meeting_minutes/"
     weight = 3
-    parent = "solstice"
+    parent = "deprecated"
 
 [[main]]
     name = "Membership"
@@ -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/components/eclipsefdn_meeting_minutes/_index.md

@@ -0,0 +1,68 @@
+---
+title: EclipseFdn Meeting Minutes
+hide_sidebar: true
+---
+
+You can add meeting minutes to a markdown file using the shortcode:
+`{{</* eclipsefdn_meeting_minutes */>}}`
+
+{{< grid/div class="alert alert-warning" isMarkdown="false" >}} This is for
+demonstration only. The only link which is expected to work is under the
+Specification Committee tab. {{</ grid/div >}}
+
+{{< eclipsefdn_meeting_minutes >}}
+
+## Parameters
+
+| Name                      | Type     | Description |
+| ------------------------- | -------- | ----------- | ------------------------------------------------------------- |
+| `tabs_class`              | `string  | nil`        | replace the default class for the navigation tabs             |
+| `yearly_sections_enabled` | `boolean | nil`        | splits meeting minutes into yearly sections if set to `true`. |
+
+### Example of `tabs_class`
+
+If your site has its own styles for navigation tabs, it may be using the
+`.solstice-tabs` class. If you want the meeting minutes tabs to look identical
+to your other tabs, pass in `solstice-tabs` or your own custom class into the
+`tabs_class` parameter.
+
+```
+{{</* eclipsefdn_meeting_minutes tabs_class="solstice-tabs" */>}}
+```
+
+### More examples of parameters
+
+- [yearly_sections_enabled example](./yearly_sections_enabled)
+
+## Setup
+
+To add meeting minutes, create a **meeting_minutes.yml** file in the data
+folder. The YAML file should have a similar shape to the following:
+
+```
+dir: '/path/to/directory/with/committees/'
+yearly_sections_enabled: true
+order:
+  - specification_committee
+  - marketing_committee
+items:
+    marketing_committee:
+        - title: August 18, 2022 (pdf)
+          url: marketing_committee/2022-08-18-marketing-minutes.pdf
+          year: 2022
+    specification_committee:
+        - title: June 28, 2018 (pdf)
+          url: https://jakarta.ee/about/meeting_minutes/steering_committee/2018-06-28-specification-minutes.pdf
+          year: 2018
+```
+
+#### Data File Properties
+
+| Property | Description                                                                                                                                                                      |
+| -------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `dir`    | is the directory for which to search for the meeting minutes.                                                                                                                    |
+| `order`  | modifies the order of the tabs. It needs to be an array of committee names corresponding to their key under `items`. If this is not set, the tabs will be alphabetically sorted. |
+| `items`  | contains the committees such as `marketing_committee` and `specification_committee`. You can give the committee any key. This committee will appear as a tab on the component.   |
+| `title`  | is the link text of a meeting minutes item.                                                                                                                                      |
+| `url`    | locates the meeting minute file. If `dir` was set, it will locate the file from `dir`.                                                                                           |
+| `year`   | is the year which the meeting was taken. This will dictate which year-section the item will appear under. This is not required if `yearly_sections_enabled` is set to `false`.   |

package/exampleSite/content/components/eclipsefdn_meeting_minutes/yearly_sections_enabled.md

@@ -0,0 +1,13 @@
+---
+title: Demonstrating yearly_sections_enabled Param
+hide_sidebar: true
+---
+
+The `yearly_sections_enabled` parameter splits meeting minutes into yearly sections if set to `true`.
+
+```
+{{</* eclipsefdn_meeting_minutes yearly_sections_enabled="true" */>}}
+```
+
+{{< eclipsefdn_meeting_minutes yearly_sections_enabled="true" >}}
+

package/exampleSite/content/components/meeting_minutes.md

@@ -0,0 +1,31 @@
+---
+title: "Meeting Minutes"
+date: 2019-04-17T15:52:13-04:00
+---
+
+{{< grid/div class="alert alert-danger" isMarkdown="false" >}}
+    The "meeting_minutes" shortcode is deprecated and will be removed in Hugo Solstice Theme v1.0.
+{{</ grid/div >}}
+
+You can add meeting minutes to a markdown file using the shortcode: **{{&lt; meeting_minutes &gt;}}**
+
+To add meeting minutes, create a **meeting_minutes.yml** file in the data folder and add the code below:
+
+~~~~
+items:
+   type_1:
+     -
+       title: Type 1 - Hugo Solstice Theme Num-1
+       url: https://gitlab.eclipse.org/eclipsefdn/it/webdev/hugo-solstice-theme
+
+   type_2:
+     -
+       title: Type 2 - Hugo Solstice Theme Num-1
+       url: https://gitlab.eclipse.org/eclipsefdn/it/webdev/hugo-solstice-theme
+~~~~
+
+**Examples:**
+
+Here is an example of the output of the meeting minutes shortcode.
+
+{{< meeting_minutes >}}

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/exampleSite/data/meeting_minutes.yml

@@ -1,5 +1,4 @@
-yearly_sections_enabled: true
-dir: '/docs/hugo/components/meeting_minutes/documents/'
+dir: '/docs/hugo/components/eclipsefdn_meeting_minutes/documents/'
 order:
    - specification_committee
    - marketing_committee
@@ -46,6 +45,6 @@ items:
           title: February 11, 2021 (pdf)
           year: 2021
    specification_committee:
-      - url: specification_committee/minutes-specification-june-18-2018.pdf
-        title: June 18, 2018 (pdf)
+      - url: specification_committee/minutes-specification-june-28-2018.pdf
+        title: June 28, 2018 (pdf)
         year: 2018

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_meeting_minutes.html

@@ -0,0 +1,138 @@
+<!-- 
+  Copyright (c) 2019, 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
+  http://www.eclipse.org/legal/epl-2.0.
+
+  Contributors:
+    Eric Poirier <eric.poirier@eclipse-foundation.org>
+    Olivier Goulet <olivier.goulet@eclipse-foundation.org>
+
+  SPDX-License-Identifier: EPL-2.0
+-->
+
+{{ $tabs_class := .Get "tabs_class" | default "meeting-minutes-tabs-default" }}
+{{ $yearly_sections_enabled := .Get "yearly_sections_enabled" | default false }}
+{{ $data := .Site.Data.meeting_minutes }}
+
+{{/* We need to create a set of years for each committee in order to know which year sections to render. */}}
+{{ $committee_years_set := dict }}
+{{ if $yearly_sections_enabled }}
+  {{ range $key, $committee := $data.items }}
+    {{ $years_set := slice }}
+    {{ range $committee }}
+      {{ if not (in $years_set .year) }}
+        {{ $years_set = $years_set | append .year }}
+      {{ end }}
+    {{ end }}
+    {{ $committee_years_set = merge $committee_years_set (dict $key $years_set) }}
+  {{ end }}
+{{ end }}
+
+{{/*
+  We need to sort the committees by the `order` field in the data file. To do this, we create an ordered slice containing
+  a dict with the committee name as the key and the committee object as value. The committee object which originally comes 
+  from `items` in the data file. If no `order` field was provided then the default behavior of YAML gets used 
+  (alphabetical).
+*/}}
+{{ $ordered_committees := slice }}
+{{ if $data.order }}
+  {{ range $committee_name := $data.order }}
+    {{ $committee := index $data.items $committee_name }}
+    {{ $ordered_committees = $ordered_committees | append (dict "committee_name" $committee_name "items" $committee) }}
+  {{ end }}
+{{ else }}
+  {{ range $committee_name, $committee := $data.items }}
+    {{ $ordered_committees = $ordered_committees | append (dict "committee_name" $committee_name "items" $committee) }}
+  {{ end }}
+{{ end }}
+
+{{ $committee_count := len $data.items }}
+
+<div class="eclipsefdn-meeting-minutes">
+  {{/* We don't need to render the nav tabs if there is only one committee */}}
+  {{ if not (eq $committee_count 1) }}
+    {{ $.Scratch.Set "counter" 0}}
+    <ul class="meeting-minutes-tab nav nav-tabs link-unstyled {{ $tabs_class }}" role="tablist">
+    {{ range $ordered_committees }}
+      {{ $index := index . "committee_name" }}
+      {{ $counter := $.Scratch.Get "counter" }}
+      {{ if eq $counter 0 }}
+        <li role="presentation" class="meeting-minutes-tab-item active"><a class="meeting-minutes-tab-item-link" href="#{{ $index }}" aria-controls="{{ $index }}" role="tab" data-toggle="tab">{{ humanize $index | title }}</a></li>
+        {{ $.Scratch.Add "counter" 1}}
+      {{ else }}
+        <li role="presentation" class="meeting-minutes-tab-item"><a class="meeting-minutes-tab-item-link" href="#{{ $index }}" aria-controls="{{ $index }}" role="tab" data-toggle="tab">{{ humanize $index | title }}</a></li>
+      {{ end }}
+    {{ end }}
+    </ul>
+  {{ end }}
+
+  {{ $.Scratch.Set "types_counter" 0}}
+  <div class="tab-content row">
+    {{ range $ordered_committees }}
+      {{ $committee_name := index . "committee_name" }}
+      {{ $items := index . "items" }}
+
+      {{ $types_counter := $.Scratch.Get "types_counter" }}
+      {{ if eq $types_counter 0 }}
+        <div role="tabpanel" class="tab-pane active" id="{{$committee_name}}">
+      {{ else }}
+        <div role="tabpanel" class="tab-pane" id="{{$committee_name}}">
+      {{ end }}
+        {{/* Creates an iterable sequence or slice. The value of the slice is equal to the year if yearly sections are enabled. */}}
+        {{ $sections := seq 1 }} 
+        {{ if $yearly_sections_enabled }}
+          {{ $sections = index $committee_years_set $committee_name }}
+        {{ end }}
+
+        {{ range $section_name := $sections }}
+
+          {{ $year := "" }}
+          {{ if $yearly_sections_enabled }}
+            {{ $year = $section_name }}
+          {{ end }}
+
+          <div class="card-container col-sm-24">
+            {{ if $yearly_sections_enabled }} <div class="glyph-highlight left-align"><div class="glyph-container text">{{ $year }}</div><div class="glyph-bottom"></div></div>{{ end }}
+            <div class="card-panel bordered panel panel-default {{ if $yearly_sections_enabled -}} with-glyph {{- end }}">
+              <div class="panel-body">
+                <ul class="meeting-minutes-list tri-col margin-bottom-0">
+                  
+                  {{/* Meeting minutes to render for current section */}}
+                  {{ $meeting_minutes := slice }}
+                  {{ if $yearly_sections_enabled }}
+                    {{ range $meeting_minute := (where $items "year" $year) }}
+                      {{ $meeting_minutes = $meeting_minutes | append $meeting_minute }}
+                    {{ end }}
+                  {{ else }}
+                    {{ $meeting_minutes = $items }}  
+                  {{ end }}
+
+                  {{ range $index, $el := $meeting_minutes }}
+
+                    {{/* Handle relative and absolute paths */}}
+                    {{ $url := "" }}
+                    {{ if and $data.dir (not (hasPrefix $el.url "http") ) }}
+                      {{ $url = (path.Join $data.dir $el.url) | absURL }}
+                    {{ else }}
+                      {{ $url = $el.url }}
+                    {{ end }}
+
+                    <li>
+                      <a class="link-unstyled" href="{{ $url }}">
+                        {{ $el.title }}
+                      </a>
+                    </li>
+
+                  {{ end }}
+                  </ul>
+              </div>
+            </div>
+          </div>
+      {{ end }}
+      </div>
+      {{ $.Scratch.Add "types_counter" 1}}
+    {{ end }}
+  </div>
+</div>

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/layouts/shortcodes/meeting_minutes.html

@@ -1,5 +1,5 @@
 <!-- 
-  Copyright (c) 2019 Eclipse Foundation, Inc.
+  Copyright (c) 2019, 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
@@ -11,127 +11,55 @@
 
   SPDX-License-Identifier: EPL-2.0
 -->
-
-{{ $data := .Site.Data.meeting_minutes }}
-{{ $yearly_sections_enabled := $data.yearly_sections_enabled | default false }}
-
-{{/* We need to create a set of years for each committee in order to know which year sections to render. */}}
-{{ $committee_years_set := dict }}
-{{ if $yearly_sections_enabled }}
-  {{ range $key, $committee := $data.items }}
-    {{ $years_set := slice }}
-    {{ range $committee }}
-      {{ if not (in $years_set .year) }}
-        {{ $years_set = $years_set | append .year }}
-      {{ end }}
-    {{ end }}
-    {{ $committee_years_set = merge $committee_years_set (dict $key $years_set) }}
-  {{ end }}
+{{ $migration_link := "https://gitlab.eclipse.org/eclipsefdn/it/webdev/hugo-solstice-theme/-/wikis/Hugo-Solstice-Theme-1.x.x/Migrating-to-1.x.x#replacing-meeting_minutes-shortcode-with-eclipsefdn_meeting_minutes" }}
+{{ if not (eq .Site.Params.hide_deprecation_warnings true) }}
+  {{ warnf "Deprecation Warning: The meeting_minutes shortcode is deprecated and will be removed in Hugo Solstice Theme 1.0. Consider using `eclipsefdn_meeting_minutes`. Find out how to migrate here: %s" $migration_link }}
 {{ end }}
 
-{{/*
-  We need to sort the committees by the `order` field in the data file. To do this, we create an ordered slice containing
-  a dict with the committee name as the key and the committee object as value. The committee object which originally comes 
-  from `items` in the data file. If no `order` field was provided then the default behavior of YAML gets used 
-  (alphabetical).
-*/}}
-{{ $ordered_committees := slice }}
-{{ if $data.order }}
-  {{ range $committee_name := $data.order }}
-    {{ $committee := index $data.items $committee_name }}
-    {{ $ordered_committees = $ordered_committees | append (dict "committee_name" $committee_name "items" $committee) }}
-  {{ end }}
-{{ else }}
-  {{ range $committee_name, $committee := $data.items }}
-    {{ $ordered_committees = $ordered_committees | append (dict "committee_name" $committee_name "items" $committee) }}
+{{ $.Scratch.Set "counter" 0}}
+<ul class="nav nav-tabs" role="tablist">
+{{ range $index, $meeting_minute_types := .Site.Data.meeting_minutes.items }}
+  {{ $counter := $.Scratch.Get "counter" }}
+  {{ if eq $counter 0 }}
+    <li role="presentation" class="active"><a href="#{{ $index }}" aria-controls="{{ $index }}" role="tab" data-toggle="tab">{{ humanize $index }}</a></li>
+    {{ $.Scratch.Add "counter" 1}}
+  {{ else }}
+    <li role="presentation"><a href="#{{ $index }}" aria-controls="{{ $index }}" role="tab" data-toggle="tab">{{ humanize $index }}</a></li>
   {{ end }}
 {{ end }}
+</ul>
 
-{{ $committee_count := len $data.items }}
 
-<div class="eclipsefdn-meeting-minutes">
-  {{/* We don't need to render the nav tabs if there is only one committee */}}
-  {{ if not (eq $committee_count 1) }}
-    {{ $.Scratch.Set "counter" 0}}
-    <ul class="nav nav-tabs solstice-tabs" role="tablist">
-    {{ range $ordered_committees }}
-      {{ $index := index . "committee_name" }}
-      {{ $counter := $.Scratch.Get "counter" }}
-      {{ if eq $counter 0 }}
-        <li role="presentation" class="active"><a href="#{{ $index }}" aria-controls="{{ $index }}" role="tab" data-toggle="tab">{{ humanize $index | title }}</a></li>
-        {{ $.Scratch.Add "counter" 1}}
-      {{ else }}
-        <li role="presentation"><a href="#{{ $index }}" aria-controls="{{ $index }}" role="tab" data-toggle="tab">{{ humanize $index | title }}</a></li>
-      {{ end }}
+{{ $.Scratch.Set "types_counter" 0}}
+<div class="tab-content">
+  {{ range $index_type, $meeting_minute_types := .Site.Data.meeting_minutes.items}}
+    {{ $types_counter := $.Scratch.Get "types_counter" }}
+    {{ if eq $types_counter 0 }}
+      <div role="tabpanel" class="tab-pane active" id="{{$index_type}}">
+    {{ else }}
+      <div role="tabpanel" class="tab-pane" id="{{$index_type}}">
     {{ end }}
-    </ul>
-  {{ end }}
-
-  {{ $.Scratch.Set "types_counter" 0}}
-  <div class="tab-content row">
-    {{ range $ordered_committees }}
-      {{ $committee_name := index . "committee_name" }}
-      {{ $items := index . "items" }}
-
-      {{ $types_counter := $.Scratch.Get "types_counter" }}
-      {{ if eq $types_counter 0 }}
-        <div role="tabpanel" class="tab-pane active" id="{{$committee_name}}">
-      {{ else }}
-        <div role="tabpanel" class="tab-pane" id="{{$committee_name}}">
-      {{ end }}
-        {{/* Creates an iterable sequence or slice. The value of the slice is equal to the year if yearly sections are enabled. */}}
-        {{ $sections := seq 1 }} 
-        {{ if $yearly_sections_enabled }}
-          {{ $sections = index $committee_years_set $committee_name }}
-        {{ end }}
-
-        {{ range $section_name := $sections }}
-
-          {{ $year := "" }}
-          {{ if $yearly_sections_enabled }}
-            {{ $year = $section_name }}
+      {{ $num_items := len $meeting_minute_types }}
+      {{ $items_per_col := math.Ceil (div $num_items 3.0) }}
+      {{ $.Scratch.Set "items_counter" 1 }}
+      {{ $.Scratch.Set "items_counter_per_row" 1 }}
+      <div class="row">
+        {{ range $meeting_minute_types }}
+          {{ $items_counter := $.Scratch.Get "items_counter" }}
+          {{ $items_counter_per_row := $.Scratch.Get "items_counter_per_row" }}
+          {{ if eq $items_counter_per_row 1}}
+            <div class="col-sm-8"><ul>
           {{ end }}
-
-          <div class="card-container col-sm-24">
-            {{ if $yearly_sections_enabled }} <div class="glyph-highlight left-align"><div class="glyph-container text">{{ $year }}</div><div class="glyph-bottom"></div></div>{{ end }}
-            <div class="card-panel bordered panel panel-default {{ if $yearly_sections_enabled -}} with-glyph {{- end }}">
-              <div class="panel-body">
-                <ul class="meeting-minutes-list tri-col margin-bottom-0">
-                  
-                  {{/* Meeting minutes to render for current section */}}
-                  {{ $meeting_minutes := slice }}
-                  {{ if $yearly_sections_enabled }}
-                    {{ range $meeting_minute := (where $items "year" $year) }}
-                      {{ $meeting_minutes = $meeting_minutes | append $meeting_minute }}
-                    {{ end }}
-                  {{ else }}
-                    {{ $meeting_minutes = $items }}  
-                  {{ end }}
-
-                  {{ range $index, $el := $meeting_minutes }}
-
-                    {{/* Handle relative and absolute paths */}}
-                    {{ $url := "" }}
-                    {{ if and $data.dir (not (hasPrefix $el.url "http") ) }}
-                      {{ $url = (path.Join $data.dir $el.url) | absURL }}
-                    {{ else }}
-                      {{ $url = $el.url }}
-                    {{ end }}
-
-                    <li>
-                      <a class="link-unstyled" href="{{ $url }}">
-                        {{ $el.title }}
-                      </a>
-                    </li>
-
-                  {{ end }}
-                  </ul>
-              </div>
-            </div>
-          </div>
-      {{ end }}
+          <li><a href="{{.url}}">{{.title}}</a></li>
+          {{ if or (eq (float $items_counter_per_row) $items_per_col) (eq $items_counter $num_items) }}
+            {{ $.Scratch.Set "items_counter_per_row" 0}}
+            </ul></div>
+          {{ end }}
+          {{ $.Scratch.Add "items_counter" 1}}
+          {{ $.Scratch.Add "items_counter_per_row" 1}}
+        {{ end }}
       </div>
-      {{ $.Scratch.Add "types_counter" 1}}
-    {{ end }}
-  </div>
+    </div>
+    {{ $.Scratch.Add "types_counter" 1}}
+  {{ end }}
 </div>

package/package.json

@@ -4,7 +4,7 @@
   "main": "webpack.min.js",
   "author": "Christopher Guindon",
   "license": "EPL-2.0",
-  "version": "0.0.180",
+  "version": "0.0.182",
   "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.215",
+    "eclipsefdn-solstice-assets": "0.0.216",
     "json2yaml": "^1.1.0",
     "toml": "^3.0.0"
   },

package/exampleSite/content/components/meeting_minutes/index.md

@@ -1,47 +0,0 @@
----
-title: Meeting Minutes
-hide_sidebar: true
----
-
-You can add meeting minutes to a markdown file using the shortcode:
-**{{< meeting_minutes >}}**
-
-{{< grid/div class="alert alert-warning" isMarkdown="false" >}} This is for
-demonstration only. The only link which is expected to work is under the
-Specification Committee tab. {{</ grid/div >}}
-
-{{< meeting_minutes >}}
-
-## Setup
-
-To add meeting minutes, create a **meeting_minutes.yml** file in the data
-folder. The YAML file should have a similar shape to the following:
-
-```
-dir: '/path/to/directory/with/committees/'
-yearly_sections_enabled: true
-order:
-  - specification_committee
-  - marketing_committee
-items:
-    marketing_committee:
-        - title: August 18, 2022 (pdf)
-          url: marketing_committee/2022-08-18-marketing-minutes.pdf
-          year: 2022
-    specification_committee:
-        - title: June 28, 2018 (pdf)
-          url: https://jakarta.ee/about/meeting_minutes/steering_committee/2018-06-28-specification-minutes.pdf
-          year: 2018
-```
-
-#### Properties
-
-| Property                  | Description                                                                                                                                                                      |
-| ------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `dir`                     | is the directory for which to search for the meeting minutes.                                                                                                                    |
-| `yearly_sections_enabled` | splits meeting minutes into yearly sections if set to `true`.                                                                                                                    |
-| `order`                   | modifies the order of the tabs. It needs to be an array of committee names corresponding to their key under `items`. If this is not set, the tabs will be alphabetically sorted. |
-| `items`                   | contains the committees such as `marketing_committee` and `specification_committee`. You can give the committee any key. This committee will appear as a tab on the component.   |
-| `title`                   | is the link text of a meeting minutes item.                                                                                                                                      |
-| `url`                     | locates the meeting minute file. If `dir` was set, it will locate the file from `dir`.                                                                                           |
-| `year`                    | is the year which the meeting was taken. This will dictate which year-section the item will appear under. This is not required if `yearly_sections_enabled` is set to `false`.   |