From 9427bd33985f20a3ecd0267a1fd2391aa4abe80c Mon Sep 17 00:00:00 2001
From: Ricardo Amaro <mail@ricardoamaro.com>
Date: Mon, 6 May 2024 20:33:44 +0100
Subject: [PATCH 01/43] Time-boxed entries for the banner

---
 layouts/partials/banner.md | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/layouts/partials/banner.md b/layouts/partials/banner.md
index 638780a0ff2f..d5c54f8a7895 100644
--- a/layouts/partials/banner.md
+++ b/layouts/partials/banner.md
@@ -1,19 +1,21 @@
-{{/* cSpell:ignore contribfest */ -}}
-{{ if .Params.show_banner -}}
+{{ if .Params.show_banner }}
+  {{ $currentDate := now.Format "2006-01-02" }}
+  {{ $sortedAndFiltered := slice }}
 
-<div class="o-banner">
+  {{/* Sort entries by endDate and filter out past ones */}}
+  {{ range $.Site.Data.banners }}
+    {{ if ge .endDate $currentDate }}
+      {{ $sortedAndFiltered = $sortedAndFiltered | append . }}
+    {{ end }}
+  {{ end }}
+  {{ $sortedAndFiltered = $sortedAndFiltered | sort "endDate" }}
 
-<i class="fas fa-bullhorn"></i> Join us for 
-[**OTel Community Day** on June 25th](https://sessionize.com/OTel-Community-Day/)!
+  {{/* Limit to the two entries with the closest end dates */}}
+  {{ $entriesToShow := first 2 $sortedAndFiltered }}
 
-{{/*
-
-<!-- prettier-ignore -->
-<i class="fas fa-bullhorn"></i>
-Template for a second post.
-{.pt-0}
-
-*/ -}}
-
-</div>
-{{ end -}}
+  {{ range $entriesToShow }}
+    <div class="o-banner">
+      <i class="fas fa-bullhorn"></i> <a href="{{ .url }}">{{ .message }}</a>
+    </div>
+  {{ end }}
+{{ end }}
\ No newline at end of file

From 1a209d9b2a95941970131347f8071653bd139478 Mon Sep 17 00:00:00 2001
From: Ricardo Amaro <mail@ricardoamaro.com>
Date: Mon, 6 May 2024 20:40:13 +0100
Subject: [PATCH 02/43] Add data file

---
 data/banners.yaml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 data/banners.yaml

diff --git a/data/banners.yaml b/data/banners.yaml
new file mode 100644
index 000000000000..d9172f55fc4d
--- /dev/null
+++ b/data/banners.yaml
@@ -0,0 +1,14 @@
+- title: "New Test Event"
+  url: "https://example.com/new-event"
+  message: "Join our new event until May 20th!"
+  endDate: 2024-05-20
+
+- title: "OTel Community Day"
+  url: "https://sessionize.com/OTel-Community-Day/"
+  message: "Join us for OTel Community Day on June 25th!"
+  endDate: 2023-06-25
+
+- title: "OTel and Prometheus Survey"
+  url: "https://forms.gle/bZAG9f7udoJsjZUG9"
+  message: "Help improve OTel and Prometheus interoperability: complete our survey by May 31"
+  endDate: 2023-05-31

From 59013b1ad62ff078a06738b53603418d6255b14a Mon Sep 17 00:00:00 2001
From: Ricardo Amaro <mail@ricardoamaro.com>
Date: Mon, 6 May 2024 20:45:11 +0100
Subject: [PATCH 03/43] fixed code styles

---
 data/banners.yaml | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/data/banners.yaml b/data/banners.yaml
index d9172f55fc4d..223e28d7d9c2 100644
--- a/data/banners.yaml
+++ b/data/banners.yaml
@@ -1,14 +1,16 @@
-- title: "New Test Event"
-  url: "https://example.com/new-event"
-  message: "Join our new event until May 20th!"
+- title: 'New Test Event'
+  url: 'https://example.com/new-event'
+  message: 'Join our new event until May 20th!'
   endDate: 2024-05-20
 
-- title: "OTel Community Day"
-  url: "https://sessionize.com/OTel-Community-Day/"
-  message: "Join us for OTel Community Day on June 25th!"
+- title: 'OTel Community Day'
+  url: 'https://sessionize.com/OTel-Community-Day/'
+  message: 'Join us for OTel Community Day on June 25th!'
   endDate: 2023-06-25
 
-- title: "OTel and Prometheus Survey"
-  url: "https://forms.gle/bZAG9f7udoJsjZUG9"
-  message: "Help improve OTel and Prometheus interoperability: complete our survey by May 31"
+- title: 'OTel and Prometheus Survey'
+  url: 'https://forms.gle/bZAG9f7udoJsjZUG9'
+  message:
+    'Help improve OTel and Prometheus interoperability: complete our survey by
+    May 31'
   endDate: 2023-05-31

From 54780fb9927f79be05ed0d93e3c95fbf1ffef248 Mon Sep 17 00:00:00 2001
From: Ricardo Amaro <mail@ricardoamaro.com>
Date: Mon, 6 May 2024 21:09:48 +0100
Subject: [PATCH 04/43] try remove sort

---
 layouts/partials/banner.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layouts/partials/banner.md b/layouts/partials/banner.md
index d5c54f8a7895..75bfb9fef514 100644
--- a/layouts/partials/banner.md
+++ b/layouts/partials/banner.md
@@ -8,7 +8,7 @@
       {{ $sortedAndFiltered = $sortedAndFiltered | append . }}
     {{ end }}
   {{ end }}
-  {{ $sortedAndFiltered = $sortedAndFiltered | sort "endDate" }}
+  {{/* $sortedAndFiltered = $sortedAndFiltered | sort "endDate" */}}
 
   {{/* Limit to the two entries with the closest end dates */}}
   {{ $entriesToShow := first 2 $sortedAndFiltered }}

From e424337492a26345c7161025b08036a0a597e587 Mon Sep 17 00:00:00 2001
From: Ricardo Amaro <mail@ricardoamaro.com>
Date: Mon, 6 May 2024 21:18:12 +0100
Subject: [PATCH 05/43] entriesToShow

---
 layouts/partials/banner.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layouts/partials/banner.md b/layouts/partials/banner.md
index 75bfb9fef514..ca431dd796de 100644
--- a/layouts/partials/banner.md
+++ b/layouts/partials/banner.md
@@ -13,7 +13,7 @@
   {{/* Limit to the two entries with the closest end dates */}}
   {{ $entriesToShow := first 2 $sortedAndFiltered }}
 
-  {{ range $entriesToShow }}
+  {{ range $.Site.Data.banners }}
     <div class="o-banner">
       <i class="fas fa-bullhorn"></i> <a href="{{ .url }}">{{ .message }}</a>
     </div>

From eb052cdbfff79b067673ea716cc33ec55f7b959c Mon Sep 17 00:00:00 2001
From: Ricardo Amaro <mail@ricardoamaro.com>
Date: Mon, 6 May 2024 21:29:11 +0100
Subject: [PATCH 06/43] make div

---
 layouts/partials/banner.md | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/layouts/partials/banner.md b/layouts/partials/banner.md
index ca431dd796de..58581bc5c707 100644
--- a/layouts/partials/banner.md
+++ b/layouts/partials/banner.md
@@ -1,4 +1,5 @@
-{{ if .Params.show_banner }}
+{{/* cSpell:ignore contribfest */ -}}
+{{ if .Params.show_banner -}}
   {{ $currentDate := now.Format "2006-01-02" }}
   {{ $sortedAndFiltered := slice }}
 
@@ -13,9 +14,10 @@
   {{/* Limit to the two entries with the closest end dates */}}
   {{ $entriesToShow := first 2 $sortedAndFiltered }}
 
+  <div class="o-banner">
   {{ range $.Site.Data.banners }}
-    <div class="o-banner">
-      <i class="fas fa-bullhorn"></i> <a href="{{ .url }}">{{ .message }}</a>
-    </div>
+      <i class="fas fa-bullhorn"></i>[{{ .message }}]({{ .url }})
   {{ end }}
-{{ end }}
\ No newline at end of file
+  {.pt-0}
+  </div>
+{{ end -}}
\ No newline at end of file

From 91b02be9f27341852cab0d82f6cefd15ae602b85 Mon Sep 17 00:00:00 2001
From: Ricardo Amaro <mail@ricardoamaro.com>
Date: Mon, 6 May 2024 22:04:23 +0100
Subject: [PATCH 07/43] use html

---
 layouts/partials/banner.md | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/layouts/partials/banner.md b/layouts/partials/banner.md
index 58581bc5c707..94477f472cd9 100644
--- a/layouts/partials/banner.md
+++ b/layouts/partials/banner.md
@@ -14,10 +14,16 @@
   {{/* Limit to the two entries with the closest end dates */}}
   {{ $entriesToShow := first 2 $sortedAndFiltered }}
 
-  <div class="o-banner">
+<div class="o-banner">
+
   {{ range $.Site.Data.banners }}
-      <i class="fas fa-bullhorn"></i>[{{ .message }}]({{ .url }})
+<!-- prettier-ignore -->
+
+<i class="fas fa-bullhorn"></i> 
+<a href="{{ .url }}">{{ .message }}</a>
+
   {{ end }}
-  {.pt-0}
-  </div>
-{{ end -}}
\ No newline at end of file
+{.pt-0}
+
+</div>
+{{ end -}}

From 08d510e85cd7dbd282e91c906e0f329c11ec90d1 Mon Sep 17 00:00:00 2001
From: Ricardo Amaro <mail@ricardoamaro.com>
Date: Mon, 6 May 2024 22:07:07 +0100
Subject: [PATCH 08/43] use url that works

---
 data/banners.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/banners.yaml b/data/banners.yaml
index 223e28d7d9c2..a592ac25e78a 100644
--- a/data/banners.yaml
+++ b/data/banners.yaml
@@ -1,5 +1,5 @@
 - title: 'New Test Event'
-  url: 'https://example.com/new-event'
+  url: 'https://opentelemetry.io/'
   message: 'Join our new event until May 20th!'
   endDate: 2024-05-20
 

From 9feb4a5333d700a8a54b930c09fe3324c91b3774 Mon Sep 17 00:00:00 2001
From: Ricardo Amaro <mail@ricardoamaro.com>
Date: Mon, 6 May 2024 22:21:51 +0100
Subject: [PATCH 09/43] change to message only

---
 data/banners.yaml          | 8 +++-----
 layouts/partials/banner.md | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/data/banners.yaml b/data/banners.yaml
index a592ac25e78a..71c0378f547c 100644
--- a/data/banners.yaml
+++ b/data/banners.yaml
@@ -1,16 +1,14 @@
 - title: 'New Test Event'
   url: 'https://opentelemetry.io/'
-  message: 'Join our new event until May 20th!'
+  message: '**Join** _our_ [test event](https://opentelemetry.io/) until `May` 20th!'
   endDate: 2024-05-20
 
 - title: 'OTel Community Day'
   url: 'https://sessionize.com/OTel-Community-Day/'
-  message: 'Join us for OTel Community Day on June 25th!'
+  message: '[**OTel Community Day** on June 25th](https://sessionize.com/OTel-Community-Day/)!'
   endDate: 2023-06-25
 
 - title: 'OTel and Prometheus Survey'
   url: 'https://forms.gle/bZAG9f7udoJsjZUG9'
   message:
-    'Help improve OTel and Prometheus interoperability: complete our survey by
-    May 31'
-  endDate: 2023-05-31
+    'Help improve OTel and Prometheus interoperability: [complete our survey](https://forms.gle/bZAG9f7udoJsjZUG9) by May 31'https://opentelemetry.io/
\ No newline at end of file
diff --git a/layouts/partials/banner.md b/layouts/partials/banner.md
index 94477f472cd9..99a8cf5f66ef 100644
--- a/layouts/partials/banner.md
+++ b/layouts/partials/banner.md
@@ -20,7 +20,7 @@
 <!-- prettier-ignore -->
 
 <i class="fas fa-bullhorn"></i> 
-<a href="{{ .url }}">{{ .message }}</a>
+{{ .message }}
 
   {{ end }}
 {.pt-0}

From 449680c6088bbc95f6dc5fd5de9e0dc4b14e17ce Mon Sep 17 00:00:00 2001
From: Ricardo Amaro <mail@ricardoamaro.com>
Date: Mon, 6 May 2024 22:28:04 +0100
Subject: [PATCH 10/43] fix typo

---
 data/banners.yaml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/data/banners.yaml b/data/banners.yaml
index 71c0378f547c..8e0bf42ffbcf 100644
--- a/data/banners.yaml
+++ b/data/banners.yaml
@@ -1,14 +1,18 @@
 - title: 'New Test Event'
   url: 'https://opentelemetry.io/'
-  message: '**Join** _our_ [test event](https://opentelemetry.io/) until `May` 20th!'
+  message:
+    '**Join** _our_ [test event](https://opentelemetry.io/) until `May` 20th!'
   endDate: 2024-05-20
 
 - title: 'OTel Community Day'
   url: 'https://sessionize.com/OTel-Community-Day/'
-  message: '[**OTel Community Day** on June 25th](https://sessionize.com/OTel-Community-Day/)!'
+  message:
+    '[**OTel Community Day** on June
+    25th](https://sessionize.com/OTel-Community-Day/)!'
   endDate: 2023-06-25
 
 - title: 'OTel and Prometheus Survey'
   url: 'https://forms.gle/bZAG9f7udoJsjZUG9'
   message:
-    'Help improve OTel and Prometheus interoperability: [complete our survey](https://forms.gle/bZAG9f7udoJsjZUG9) by May 31'https://opentelemetry.io/
\ No newline at end of file
+    'Help improve OTel and Prometheus interoperability: [complete our
+    survey](https://forms.gle/bZAG9f7udoJsjZUG9) by May 31'

From c529f57ea3faccdac13f042a00343eb1cc79c133 Mon Sep 17 00:00:00 2001
From: Ricardo Amaro <mail@ricardoamaro.com>
Date: Mon, 6 May 2024 22:41:19 +0100
Subject: [PATCH 11/43] debug

---
 data/banners.yaml          | 3 ---
 layouts/partials/banner.md | 6 ++++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/data/banners.yaml b/data/banners.yaml
index 8e0bf42ffbcf..517e7a752558 100644
--- a/data/banners.yaml
+++ b/data/banners.yaml
@@ -1,18 +1,15 @@
 - title: 'New Test Event'
-  url: 'https://opentelemetry.io/'
   message:
     '**Join** _our_ [test event](https://opentelemetry.io/) until `May` 20th!'
   endDate: 2024-05-20
 
 - title: 'OTel Community Day'
-  url: 'https://sessionize.com/OTel-Community-Day/'
   message:
     '[**OTel Community Day** on June
     25th](https://sessionize.com/OTel-Community-Day/)!'
   endDate: 2023-06-25
 
 - title: 'OTel and Prometheus Survey'
-  url: 'https://forms.gle/bZAG9f7udoJsjZUG9'
   message:
     'Help improve OTel and Prometheus interoperability: [complete our
     survey](https://forms.gle/bZAG9f7udoJsjZUG9) by May 31'
diff --git a/layouts/partials/banner.md b/layouts/partials/banner.md
index 99a8cf5f66ef..a217e2d9b8dd 100644
--- a/layouts/partials/banner.md
+++ b/layouts/partials/banner.md
@@ -1,6 +1,6 @@
 {{/* cSpell:ignore contribfest */ -}}
 {{ if .Params.show_banner -}}
-  {{ $currentDate := now.Format "2006-01-02" }}
+  {{ $currentDate := time.Now | time.Format "2006-01-02" }}
   {{ $sortedAndFiltered := slice }}
 
   {{/* Sort entries by endDate and filter out past ones */}}
@@ -15,12 +15,14 @@
   {{ $entriesToShow := first 2 $sortedAndFiltered }}
 
 <div class="o-banner">
+Now: {{ $currentDate }}
 
-  {{ range $.Site.Data.banners }}
+  {{ range $sortedAndFiltered }}
 <!-- prettier-ignore -->
 
 <i class="fas fa-bullhorn"></i> 
 {{ .message }}
+{{ .endDate }}
 
   {{ end }}
 {.pt-0}

From 7ad253ee04974213eb06e4a1c1c92999ed35559c Mon Sep 17 00:00:00 2001
From: Ricardo Amaro <mail@ricardoamaro.com>
Date: Mon, 6 May 2024 22:50:33 +0100
Subject: [PATCH 12/43] test ge

---
 layouts/partials/banner.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/layouts/partials/banner.md b/layouts/partials/banner.md
index a217e2d9b8dd..46ce6eaed060 100644
--- a/layouts/partials/banner.md
+++ b/layouts/partials/banner.md
@@ -6,6 +6,7 @@
   {{/* Sort entries by endDate and filter out past ones */}}
   {{ range $.Site.Data.banners }}
     {{ if ge .endDate $currentDate }}
+      {{.endDate}} greater than {{ $currentDate }}
       {{ $sortedAndFiltered = $sortedAndFiltered | append . }}
     {{ end }}
   {{ end }}
@@ -22,7 +23,7 @@ Now: {{ $currentDate }}
 
 <i class="fas fa-bullhorn"></i> 
 {{ .message }}
-{{ .endDate }}
+endDat: {{ .endDate }}
 
   {{ end }}
 {.pt-0}

From 88287fda9983c75b6d21f43b5321b96765ea064f Mon Sep 17 00:00:00 2001
From: Ricardo Amaro <mail@ricardoamaro.com>
Date: Mon, 6 May 2024 22:54:56 +0100
Subject: [PATCH 13/43] test several dates

---
 data/banners.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/data/banners.yaml b/data/banners.yaml
index 517e7a752558..cf509221f025 100644
--- a/data/banners.yaml
+++ b/data/banners.yaml
@@ -7,9 +7,11 @@
   message:
     '[**OTel Community Day** on June
     25th](https://sessionize.com/OTel-Community-Day/)!'
-  endDate: 2023-06-25
+  endDate: 2023-04-25
 
 - title: 'OTel and Prometheus Survey'
   message:
     'Help improve OTel and Prometheus interoperability: [complete our
     survey](https://forms.gle/bZAG9f7udoJsjZUG9) by May 31'
+  endDate: 2023-04-30
+  

From 1ef65aedf3e730165d16ad90e151a715f477ead3 Mon Sep 17 00:00:00 2001
From: Ricardo Amaro <mail@ricardoamaro.com>
Date: Mon, 6 May 2024 22:58:07 +0100
Subject: [PATCH 14/43] 2023 dates

---
 data/banners.yaml          | 6 +++---
 layouts/partials/banner.md | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/banners.yaml b/data/banners.yaml
index cf509221f025..dcede1dedc7b 100644
--- a/data/banners.yaml
+++ b/data/banners.yaml
@@ -7,11 +7,11 @@
   message:
     '[**OTel Community Day** on June
     25th](https://sessionize.com/OTel-Community-Day/)!'
-  endDate: 2023-04-25
+  endDate: 2023-06-25
 
 - title: 'OTel and Prometheus Survey'
   message:
     'Help improve OTel and Prometheus interoperability: [complete our
     survey](https://forms.gle/bZAG9f7udoJsjZUG9) by May 31'
-  endDate: 2023-04-30
-  
+  endDate: 2023-05-31
+
diff --git a/layouts/partials/banner.md b/layouts/partials/banner.md
index 46ce6eaed060..773736ec7a9a 100644
--- a/layouts/partials/banner.md
+++ b/layouts/partials/banner.md
@@ -23,7 +23,7 @@ Now: {{ $currentDate }}
 
 <i class="fas fa-bullhorn"></i> 
 {{ .message }}
-endDat: {{ .endDate }}
+endDate: {{ .endDate }}
 
   {{ end }}
 {.pt-0}

From c8bbd58a06087e3e998a85f199c1e18acb25e45b Mon Sep 17 00:00:00 2001
From: Ricardo Amaro <mail@ricardoamaro.com>
Date: Mon, 6 May 2024 23:04:16 +0100
Subject: [PATCH 15/43] test other dates

---
 data/banners.yaml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/data/banners.yaml b/data/banners.yaml
index dcede1dedc7b..d49d768df143 100644
--- a/data/banners.yaml
+++ b/data/banners.yaml
@@ -3,15 +3,22 @@
     '**Join** _our_ [test event](https://opentelemetry.io/) until `May` 20th!'
   endDate: 2024-05-20
 
+- title: 'Old Test Event'
+  message: 'From 2023 should not appear '
+  endDate: 2023-05-31
+
 - title: 'OTel Community Day'
   message:
     '[**OTel Community Day** on June
     25th](https://sessionize.com/OTel-Community-Day/)!'
-  endDate: 2023-06-25
+  endDate: 2024-06-25
 
 - title: 'OTel and Prometheus Survey'
   message:
     'Help improve OTel and Prometheus interoperability: [complete our
     survey](https://forms.gle/bZAG9f7udoJsjZUG9) by May 31'
-  endDate: 2023-05-31
+  endDate: 2024-05-31
 
+- title: 'Old Test Event'
+  message: 'From 2023 should not appear '
+  endDate: 2023-05-31

From 1a4f2fbb9d0ac3c6063ffd1503c96a0b181c6a54 Mon Sep 17 00:00:00 2001
From: Ricardo Amaro <mail@ricardoamaro.com>
Date: Mon, 6 May 2024 23:09:34 +0100
Subject: [PATCH 16/43] show 2 entries

---
 layouts/partials/banner.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layouts/partials/banner.md b/layouts/partials/banner.md
index 773736ec7a9a..56c0fecbf354 100644
--- a/layouts/partials/banner.md
+++ b/layouts/partials/banner.md
@@ -18,7 +18,7 @@
 <div class="o-banner">
 Now: {{ $currentDate }}
 
-  {{ range $sortedAndFiltered }}
+  {{ range $entriesToShow }}
 <!-- prettier-ignore -->
 
 <i class="fas fa-bullhorn"></i> 

From 4d2fcc1618f89c6d2f6d026b0ecfc4cd04aee445 Mon Sep 17 00:00:00 2001
From: Ricardo Amaro <mail@ricardoamaro.com>
Date: Mon, 6 May 2024 23:14:12 +0100
Subject: [PATCH 17/43] sort .endDate

---
 layouts/partials/banner.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/layouts/partials/banner.md b/layouts/partials/banner.md
index 56c0fecbf354..55b2bd64ba80 100644
--- a/layouts/partials/banner.md
+++ b/layouts/partials/banner.md
@@ -6,11 +6,10 @@
   {{/* Sort entries by endDate and filter out past ones */}}
   {{ range $.Site.Data.banners }}
     {{ if ge .endDate $currentDate }}
-      {{.endDate}} greater than {{ $currentDate }}
       {{ $sortedAndFiltered = $sortedAndFiltered | append . }}
     {{ end }}
   {{ end }}
-  {{/* $sortedAndFiltered = $sortedAndFiltered | sort "endDate" */}}
+  {{ $sortedAndFiltered = $sortedAndFiltered | sort .endDate }}
 
   {{/* Limit to the two entries with the closest end dates */}}
   {{ $entriesToShow := first 2 $sortedAndFiltered }}

From 8b442dc784e2cd8d90393065169cb88e3c3d84c3 Mon Sep 17 00:00:00 2001
From: Ricardo Amaro <mail@ricardoamaro.com>
Date: Mon, 6 May 2024 23:35:24 +0100
Subject: [PATCH 18/43] change sort logic

---
 layouts/partials/banner.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/layouts/partials/banner.md b/layouts/partials/banner.md
index 55b2bd64ba80..4b201080a5cc 100644
--- a/layouts/partials/banner.md
+++ b/layouts/partials/banner.md
@@ -4,12 +4,12 @@
   {{ $sortedAndFiltered := slice }}
 
   {{/* Sort entries by endDate and filter out past ones */}}
-  {{ range $.Site.Data.banners }}
+  {{ $sorted := sort .Site.Data.banners "endDate" }}
+  {{ range $sorted }}
     {{ if ge .endDate $currentDate }}
       {{ $sortedAndFiltered = $sortedAndFiltered | append . }}
     {{ end }}
   {{ end }}
-  {{ $sortedAndFiltered = $sortedAndFiltered | sort .endDate }}
 
   {{/* Limit to the two entries with the closest end dates */}}
   {{ $entriesToShow := first 2 $sortedAndFiltered }}

From f6c5c8d126bbd706b0e1cdc3f245158182c339ef Mon Sep 17 00:00:00 2001
From: Ricardo Amaro <mail@ricardoamaro.com>
Date: Mon, 6 May 2024 23:48:54 +0100
Subject: [PATCH 19/43] Cleanup

---
 data/banners.yaml | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/data/banners.yaml b/data/banners.yaml
index d49d768df143..4801c0ac162e 100644
--- a/data/banners.yaml
+++ b/data/banners.yaml
@@ -1,12 +1,3 @@
-- title: 'New Test Event'
-  message:
-    '**Join** _our_ [test event](https://opentelemetry.io/) until `May` 20th!'
-  endDate: 2024-05-20
-
-- title: 'Old Test Event'
-  message: 'From 2023 should not appear '
-  endDate: 2023-05-31
-
 - title: 'OTel Community Day'
   message:
     '[**OTel Community Day** on June
@@ -18,7 +9,3 @@
     'Help improve OTel and Prometheus interoperability: [complete our
     survey](https://forms.gle/bZAG9f7udoJsjZUG9) by May 31'
   endDate: 2024-05-31
-
-- title: 'Old Test Event'
-  message: 'From 2023 should not appear '
-  endDate: 2023-05-31

From 3d64c6e4b25ef95fbb4a955ed5d31db118b7833d Mon Sep 17 00:00:00 2001
From: Ricardo Amaro <mail@ricardoamaro.com>
Date: Mon, 6 May 2024 23:51:54 +0100
Subject: [PATCH 20/43] Cleanup

---
 layouts/partials/banner.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/layouts/partials/banner.md b/layouts/partials/banner.md
index 4b201080a5cc..ebca9e478995 100644
--- a/layouts/partials/banner.md
+++ b/layouts/partials/banner.md
@@ -15,14 +15,11 @@
   {{ $entriesToShow := first 2 $sortedAndFiltered }}
 
 <div class="o-banner">
-Now: {{ $currentDate }}
 
   {{ range $entriesToShow }}
-<!-- prettier-ignore -->
 
 <i class="fas fa-bullhorn"></i> 
 {{ .message }}
-endDate: {{ .endDate }}
 
   {{ end }}
 {.pt-0}

From 145c539fad1441a1d1093d0b40f9bb8cbbe2e8ed Mon Sep 17 00:00:00 2001
From: Ricardo Amaro <ricardoamaro@users.noreply.github.com>
Date: Tue, 7 May 2024 16:28:37 +0100
Subject: [PATCH 21/43] Update data/banners.yaml

Co-authored-by: Severin Neumann <severin.neumann@altmuehlnet.de>
---
 data/banners.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/data/banners.yaml b/data/banners.yaml
index 4801c0ac162e..b52de0a611c0 100644
--- a/data/banners.yaml
+++ b/data/banners.yaml
@@ -9,3 +9,7 @@
     'Help improve OTel and Prometheus interoperability: [complete our
     survey](https://forms.gle/bZAG9f7udoJsjZUG9) by May 31'
   endDate: 2024-05-31
+
+- title: Roadmap to v1 for the OpenTelemetry Collector
+  message: '[Learn about our roadmap to v1 for the OpenTelemetry Collector](/blog/2024/collector-roadmap/)'
+  endDate: 2024-05-21

From 29eec6a5ebf110013e8111b670923c05647a45fe Mon Sep 17 00:00:00 2001
From: Ricardo Amaro <ricardoamaro@users.noreply.github.com>
Date: Tue, 7 May 2024 16:29:43 +0100
Subject: [PATCH 22/43] Update data/banners.yaml

Co-authored-by: Severin Neumann <severin.neumann@altmuehlnet.de>
---
 data/banners.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/banners.yaml b/data/banners.yaml
index b52de0a611c0..77c1f1f9239a 100644
--- a/data/banners.yaml
+++ b/data/banners.yaml
@@ -1,7 +1,7 @@
 - title: 'OTel Community Day'
   message:
-    '[**OTel Community Day** on June
-    25th](https://sessionize.com/OTel-Community-Day/)!'
+    'Join us for [**OTel Community Day** on June
+    25th](https://events.linuxfoundation.org/open-telemetry-community-day/)!'
   endDate: 2024-06-25
 
 - title: 'OTel and Prometheus Survey'

From 86fceeb42743b5531411cd59e415ee0581103536 Mon Sep 17 00:00:00 2001
From: Ricardo Amaro <mail@ricardoamaro.com>
Date: Tue, 7 May 2024 16:38:46 +0100
Subject: [PATCH 23/43] Add icon support

---
 data/banners.yaml          | 6 +++++-
 layouts/partials/banner.md | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/data/banners.yaml b/data/banners.yaml
index 77c1f1f9239a..1baeea701e72 100644
--- a/data/banners.yaml
+++ b/data/banners.yaml
@@ -3,6 +3,7 @@
     'Join us for [**OTel Community Day** on June
     25th](https://events.linuxfoundation.org/open-telemetry-community-day/)!'
   endDate: 2024-06-25
+  icon: 'fas fa-bullhorn'
 
 - title: 'OTel and Prometheus Survey'
   message:
@@ -11,5 +12,8 @@
   endDate: 2024-05-31
 
 - title: Roadmap to v1 for the OpenTelemetry Collector
-  message: '[Learn about our roadmap to v1 for the OpenTelemetry Collector](/blog/2024/collector-roadmap/)'
+  message: 
+    '[Learn about our roadmap to v1 for the OpenTelemetry Collector](/blog/2024/collector-roadmap/)'
   endDate: 2024-05-21
+  icon: 'fa fa-envelope'
+
diff --git a/layouts/partials/banner.md b/layouts/partials/banner.md
index ebca9e478995..563abdf86839 100644
--- a/layouts/partials/banner.md
+++ b/layouts/partials/banner.md
@@ -18,7 +18,7 @@
 
   {{ range $entriesToShow }}
 
-<i class="fas fa-bullhorn"></i> 
+<i class="{{ .icon | default 'fas fa-bullhorn' }}"></i> 
 {{ .message }}
 
   {{ end }}

From 6c8ac7dcdf88a04988a78972d8630b3a70966272 Mon Sep 17 00:00:00 2001
From: Ricardo Amaro <mail@ricardoamaro.com>
Date: Tue, 7 May 2024 16:59:45 +0100
Subject: [PATCH 24/43] use backticks

---
 data/banners.yaml          | 6 +++---
 layouts/partials/banner.md | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/banners.yaml b/data/banners.yaml
index 1baeea701e72..8a6f120fbf4b 100644
--- a/data/banners.yaml
+++ b/data/banners.yaml
@@ -12,8 +12,8 @@
   endDate: 2024-05-31
 
 - title: Roadmap to v1 for the OpenTelemetry Collector
-  message: 
-    '[Learn about our roadmap to v1 for the OpenTelemetry Collector](/blog/2024/collector-roadmap/)'
+  message:
+    '[Learn about our roadmap to v1 for the OpenTelemetry
+    Collector](/blog/2024/collector-roadmap/)'
   endDate: 2024-05-21
   icon: 'fa fa-envelope'
-
diff --git a/layouts/partials/banner.md b/layouts/partials/banner.md
index 563abdf86839..a94ea991ec62 100644
--- a/layouts/partials/banner.md
+++ b/layouts/partials/banner.md
@@ -18,7 +18,7 @@
 
   {{ range $entriesToShow }}
 
-<i class="{{ .icon | default 'fas fa-bullhorn' }}"></i> 
+<i class="{{ .icon | default `fas fa-bullhorn` }}"></i> 
 {{ .message }}
 
   {{ end }}

From 4ee2c595facca6472db54fd85d6576f02222fa5f Mon Sep 17 00:00:00 2001
From: Ricardo Amaro <mail@ricardoamaro.com>
Date: Wed, 8 May 2024 19:09:00 +0100
Subject: [PATCH 25/43] Try new approach

---
 content-modules/opentelemetry-proto |  2 +-
 content/en/_index.md                | 25 +++++++++++++++++++
 data/banners.yaml                   | 19 ---------------
 layouts/partials/banner.md          | 38 +++++++++--------------------
 4 files changed, 38 insertions(+), 46 deletions(-)
 delete mode 100644 data/banners.yaml

diff --git a/content-modules/opentelemetry-proto b/content-modules/opentelemetry-proto
index b3060d2104df..39339ef17721 160000
--- a/content-modules/opentelemetry-proto
+++ b/content-modules/opentelemetry-proto
@@ -1 +1 @@
-Subproject commit b3060d2104df364136d75a35779e6bd48bac449a
+Subproject commit 39339ef177218cc965b8cf863d761775ec668858
diff --git a/content/en/_index.md b/content/en/_index.md
index 05e045a23de4..4c5d3c85d451 100644
--- a/content/en/_index.md
+++ b/content/en/_index.md
@@ -7,6 +7,31 @@ show_banner: true
 developer_note:
   The blocks/cover shortcode (used below) will use as a background image any
   image file containing "background" in its name.
+
+banners:
+  - text: 'Welcome to our site! Check out our <a href="/events">events</a>.'
+    from: 2024-01-01
+    to: 2024-12-31
+  - text: 'Join our mailing list for updates.'
+    from: 2024-01-01
+    to: 2024-03-01
+  - text:
+      'Join us for [**OTel Community Day** on June
+      25th](https://events.linuxfoundation.org/open-telemetry-community-day/)!'
+    from: 2024-01-01  
+    to: 2024-06-25
+    icon: 'fas fa-bullhorn'
+  - text:
+      'Help improve OTel and Prometheus interoperability: [complete our
+      survey](https://forms.gle/bZAG9f7udoJsjZUG9) by May 31'
+    from: 2024-01-01  
+    to: 2024-05-31
+  - text:
+      '[Learn about our roadmap to v1 for the OpenTelemetry
+      Collector](/blog/2024/collector-roadmap/)'
+    from: 2024-01-01  
+    to: 2024-05-21
+    icon: 'fa fa-envelope'
 ---
 
 <div class="d-none"><a rel="me" href="https://fosstodon.org/@opentelemetry"></a></div>
diff --git a/data/banners.yaml b/data/banners.yaml
deleted file mode 100644
index 8a6f120fbf4b..000000000000
--- a/data/banners.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-- title: 'OTel Community Day'
-  message:
-    'Join us for [**OTel Community Day** on June
-    25th](https://events.linuxfoundation.org/open-telemetry-community-day/)!'
-  endDate: 2024-06-25
-  icon: 'fas fa-bullhorn'
-
-- title: 'OTel and Prometheus Survey'
-  message:
-    'Help improve OTel and Prometheus interoperability: [complete our
-    survey](https://forms.gle/bZAG9f7udoJsjZUG9) by May 31'
-  endDate: 2024-05-31
-
-- title: Roadmap to v1 for the OpenTelemetry Collector
-  message:
-    '[Learn about our roadmap to v1 for the OpenTelemetry
-    Collector](/blog/2024/collector-roadmap/)'
-  endDate: 2024-05-21
-  icon: 'fa fa-envelope'
diff --git a/layouts/partials/banner.md b/layouts/partials/banner.md
index a94ea991ec62..00b39de3e955 100644
--- a/layouts/partials/banner.md
+++ b/layouts/partials/banner.md
@@ -1,28 +1,14 @@
 {{/* cSpell:ignore contribfest */ -}}
-{{ if .Params.show_banner -}}
-  {{ $currentDate := time.Now | time.Format "2006-01-02" }}
-  {{ $sortedAndFiltered := slice }}
-
-  {{/* Sort entries by endDate and filter out past ones */}}
-  {{ $sorted := sort .Site.Data.banners "endDate" }}
-  {{ range $sorted }}
-    {{ if ge .endDate $currentDate }}
-      {{ $sortedAndFiltered = $sortedAndFiltered | append . }}
+{{ with .Params.banners }}
+  {{ $currentDate := now.Format "2006-01-02" }}
+  <div class="o-banners">
+    {{ range . }}
+      {{ if and (or (not .from) (ge $currentDate .from)) (or (not .to) (le $currentDate .to)) }}
+        <div class="o-banner">
+          <i class="{{ .icon | default `fas fa-bullhorn` }}"></i> 
+          {{ .text | markdownify }}
+        </div>
+      {{ end }}
     {{ end }}
-  {{ end }}
-
-  {{/* Limit to the two entries with the closest end dates */}}
-  {{ $entriesToShow := first 2 $sortedAndFiltered }}
-
-<div class="o-banner">
-
-  {{ range $entriesToShow }}
-
-<i class="{{ .icon | default `fas fa-bullhorn` }}"></i> 
-{{ .message }}
-
-  {{ end }}
-{.pt-0}
-
-</div>
-{{ end -}}
+  </div>
+{{ end }}
\ No newline at end of file

From c2a32d3f8c747cf64867e59b686eec91b9c1c2d3 Mon Sep 17 00:00:00 2001
From: Ricardo Amaro <mail@ricardoamaro.com>
Date: Wed, 8 May 2024 19:11:07 +0100
Subject: [PATCH 26/43] keep previous elements

---
 layouts/partials/banner.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/layouts/partials/banner.md b/layouts/partials/banner.md
index 00b39de3e955..1da4957e18c8 100644
--- a/layouts/partials/banner.md
+++ b/layouts/partials/banner.md
@@ -5,10 +5,12 @@
     {{ range . }}
       {{ if and (or (not .from) (ge $currentDate .from)) (or (not .to) (le $currentDate .to)) }}
         <div class="o-banner">
+          <!-- prettier-ignore -->
           <i class="{{ .icon | default `fas fa-bullhorn` }}"></i> 
           {{ .text | markdownify }}
         </div>
       {{ end }}
     {{ end }}
+  {.pt-0}  
   </div>
 {{ end }}
\ No newline at end of file

From 600711c9714f8ac96a87f4f47573648ceedae73b Mon Sep 17 00:00:00 2001
From: Ricardo Amaro <mail@ricardoamaro.com>
Date: Wed, 8 May 2024 20:18:58 +0100
Subject: [PATCH 27/43] fix styles

---
 content/en/_index.md       |  6 +++---
 layouts/partials/banner.md | 14 ++++++--------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/content/en/_index.md b/content/en/_index.md
index 4c5d3c85d451..91493dd7fd79 100644
--- a/content/en/_index.md
+++ b/content/en/_index.md
@@ -18,18 +18,18 @@ banners:
   - text:
       'Join us for [**OTel Community Day** on June
       25th](https://events.linuxfoundation.org/open-telemetry-community-day/)!'
-    from: 2024-01-01  
+    from: 2024-01-01
     to: 2024-06-25
     icon: 'fas fa-bullhorn'
   - text:
       'Help improve OTel and Prometheus interoperability: [complete our
       survey](https://forms.gle/bZAG9f7udoJsjZUG9) by May 31'
-    from: 2024-01-01  
+    from: 2024-01-01
     to: 2024-05-31
   - text:
       '[Learn about our roadmap to v1 for the OpenTelemetry
       Collector](/blog/2024/collector-roadmap/)'
-    from: 2024-01-01  
+    from: 2024-01-01
     to: 2024-05-21
     icon: 'fa fa-envelope'
 ---
diff --git a/layouts/partials/banner.md b/layouts/partials/banner.md
index 1da4957e18c8..1ca0b8822ab3 100644
--- a/layouts/partials/banner.md
+++ b/layouts/partials/banner.md
@@ -1,16 +1,14 @@
 {{/* cSpell:ignore contribfest */ -}}
 {{ with .Params.banners }}
   {{ $currentDate := now.Format "2006-01-02" }}
-  <div class="o-banners">
+<div class="o-banner">
     {{ range . }}
       {{ if and (or (not .from) (ge $currentDate .from)) (or (not .to) (le $currentDate .to)) }}
-        <div class="o-banner">
-          <!-- prettier-ignore -->
-          <i class="{{ .icon | default `fas fa-bullhorn` }}"></i> 
-          {{ .text | markdownify }}
-        </div>
+<!-- prettier-ignore -->
+<i class="{{ .icon | default `fas fa-bullhorn` }}"></i> 
+{{ .text | markdownify }}
       {{ end }}
     {{ end }}
-  {.pt-0}  
-  </div>
+{.pt-0}  
+</div>
 {{ end }}
\ No newline at end of file

From 6aa66385ed4de8c189c6758db6cbc3bf21adbaf8 Mon Sep 17 00:00:00 2001
From: Ricardo Amaro <mail@ricardoamaro.com>
Date: Wed, 8 May 2024 20:31:05 +0100
Subject: [PATCH 28/43] Sort by end date .to

---
 layouts/partials/banner.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/layouts/partials/banner.md b/layouts/partials/banner.md
index 1ca0b8822ab3..056451020ef8 100644
--- a/layouts/partials/banner.md
+++ b/layouts/partials/banner.md
@@ -1,5 +1,6 @@
 {{/* cSpell:ignore contribfest */ -}}
-{{ with .Params.banners }}
+{{ $sorted := sort .Params.banners "to" }}
+{{ with $sorted }}
   {{ $currentDate := now.Format "2006-01-02" }}
 <div class="o-banner">
     {{ range . }}

From 799cf063fbe5cfa719e1204fd03ab98297589081 Mon Sep 17 00:00:00 2001
From: Ricardo Amaro <mail@ricardoamaro.com>
Date: Wed, 8 May 2024 20:35:54 +0100
Subject: [PATCH 29/43] Add 'markdownify' to cspell dictionary

---
 .cspell.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.cspell.yml b/.cspell.yml
index d1cbfd8c7f7c..d4488b5c2c02 100644
--- a/.cspell.yml
+++ b/.cspell.yml
@@ -172,3 +172,4 @@ words:
   - zend
   - zipkin
   - Chronosphere
+  - markdownify

From 0c47fbab97744a526fa4473a707e648ff4d6a6db Mon Sep 17 00:00:00 2001
From: Ricardo Amaro <mail@ricardoamaro.com>
Date: Wed, 8 May 2024 20:43:35 +0100
Subject: [PATCH 30/43] Add to the file itself

---
 .cspell.yml                | 1 -
 content/en/_index.md       | 3 +--
 layouts/partials/banner.md | 4 +++-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.cspell.yml b/.cspell.yml
index d4488b5c2c02..d1cbfd8c7f7c 100644
--- a/.cspell.yml
+++ b/.cspell.yml
@@ -172,4 +172,3 @@ words:
   - zend
   - zipkin
   - Chronosphere
-  - markdownify
diff --git a/content/en/_index.md b/content/en/_index.md
index 91493dd7fd79..54d9a33b78ab 100644
--- a/content/en/_index.md
+++ b/content/en/_index.md
@@ -3,11 +3,10 @@ title: OpenTelemetry
 description: >-
   High-quality, ubiquitous, and portable telemetry to enable effective
   observability
-show_banner: true
 developer_note:
   The blocks/cover shortcode (used below) will use as a background image any
   image file containing "background" in its name.
-
+show_banner: true
 banners:
   - text: 'Welcome to our site! Check out our <a href="/events">events</a>.'
     from: 2024-01-01
diff --git a/layouts/partials/banner.md b/layouts/partials/banner.md
index 056451020ef8..524aaf7d8ad7 100644
--- a/layouts/partials/banner.md
+++ b/layouts/partials/banner.md
@@ -1,4 +1,5 @@
-{{/* cSpell:ignore contribfest */ -}}
+<!-- cSpell:ignore contribfest markdownify -->
+{{ if .Params.show_banner }}
 {{ $sorted := sort .Params.banners "to" }}
 {{ with $sorted }}
   {{ $currentDate := now.Format "2006-01-02" }}
@@ -12,4 +13,5 @@
     {{ end }}
 {.pt-0}  
 </div>
+{{ end }}
 {{ end }}
\ No newline at end of file

From cc027a8bb778b311e9b95f69b3d8f9c9c0bdd1e9 Mon Sep 17 00:00:00 2001
From: Ricardo Amaro <mail@ricardoamaro.com>
Date: Wed, 8 May 2024 20:47:55 +0100
Subject: [PATCH 31/43] fix target does not exist --- index.html --> /events

---
 content/en/_index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/en/_index.md b/content/en/_index.md
index 54d9a33b78ab..def5b3a3a978 100644
--- a/content/en/_index.md
+++ b/content/en/_index.md
@@ -8,7 +8,7 @@ developer_note:
   image file containing "background" in its name.
 show_banner: true
 banners:
-  - text: 'Welcome to our site! Check out our <a href="/events">events</a>.'
+  - text: 'Welcome to our site! Check out our <a href="/events/">events</a>.'
     from: 2024-01-01
     to: 2024-12-31
   - text: 'Join our mailing list for updates.'

From 4542a38f8546b7d37a8173d8f03f3f0f1d337c7c Mon Sep 17 00:00:00 2001
From: Ricardo Amaro <mail@ricardoamaro.com>
Date: Wed, 8 May 2024 20:52:52 +0100
Subject: [PATCH 32/43] use a page that exists

---
 content/en/_index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/en/_index.md b/content/en/_index.md
index def5b3a3a978..7e3e9c62fcb2 100644
--- a/content/en/_index.md
+++ b/content/en/_index.md
@@ -8,7 +8,7 @@ developer_note:
   image file containing "background" in its name.
 show_banner: true
 banners:
-  - text: 'Welcome to our site! Check out our <a href="/events/">events</a>.'
+  - text: 'Welcome to our site! Check out our <a href="/blog/">blog</a>.'
     from: 2024-01-01
     to: 2024-12-31
   - text: 'Join our mailing list for updates.'

From 0489f0430d2b5fd4b36c18337386d73ef409b19c Mon Sep 17 00:00:00 2001
From: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com>
Date: Thu, 9 May 2024 15:26:46 +0000
Subject: [PATCH 33/43] Results from /fix:all

---
 content-modules/opentelemetry-proto | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content-modules/opentelemetry-proto b/content-modules/opentelemetry-proto
index 39339ef17721..b3060d2104df 160000
--- a/content-modules/opentelemetry-proto
+++ b/content-modules/opentelemetry-proto
@@ -1 +1 @@
-Subproject commit 39339ef177218cc965b8cf863d761775ec668858
+Subproject commit b3060d2104df364136d75a35779e6bd48bac449a

From 1e3599dc87d092c71ce2c006ddd9fca5a40d2ae1 Mon Sep 17 00:00:00 2001
From: Ricardo Amaro <mail@ricardoamaro.com>
Date: Thu, 9 May 2024 21:58:52 +0100
Subject: [PATCH 34/43] remove test banners

---
 content/en/_index.md | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/content/en/_index.md b/content/en/_index.md
index 7e3e9c62fcb2..3b07116821dd 100644
--- a/content/en/_index.md
+++ b/content/en/_index.md
@@ -8,12 +8,6 @@ developer_note:
   image file containing "background" in its name.
 show_banner: true
 banners:
-  - text: 'Welcome to our site! Check out our <a href="/blog/">blog</a>.'
-    from: 2024-01-01
-    to: 2024-12-31
-  - text: 'Join our mailing list for updates.'
-    from: 2024-01-01
-    to: 2024-03-01
   - text:
       'Join us for [**OTel Community Day** on June
       25th](https://events.linuxfoundation.org/open-telemetry-community-day/)!'

From 1e593eff20594268004bcbbd078960ac0f6e8e3a Mon Sep 17 00:00:00 2001
From: Ricardo Amaro <mail@ricardoamaro.com>
Date: Sat, 11 May 2024 22:53:47 +0100
Subject: [PATCH 35/43] limit 2 by default

---
 content-modules/opentelemetry-proto         |  2 +-
 content-modules/opentelemetry-specification |  2 +-
 content/en/_index.md                        |  1 +
 layouts/partials/banner.md                  | 18 +++++++++++-------
 themes/docsy                                |  2 +-
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/content-modules/opentelemetry-proto b/content-modules/opentelemetry-proto
index b3060d2104df..39339ef17721 160000
--- a/content-modules/opentelemetry-proto
+++ b/content-modules/opentelemetry-proto
@@ -1 +1 @@
-Subproject commit b3060d2104df364136d75a35779e6bd48bac449a
+Subproject commit 39339ef177218cc965b8cf863d761775ec668858
diff --git a/content-modules/opentelemetry-specification b/content-modules/opentelemetry-specification
index a7bb6473769d..93ddb3ac0e14 160000
--- a/content-modules/opentelemetry-specification
+++ b/content-modules/opentelemetry-specification
@@ -1 +1 @@
-Subproject commit a7bb6473769d93ddbe063071c94729a242a2cdb2
+Subproject commit 93ddb3ac0e144d0b90f04654a1759936663af008
diff --git a/content/en/_index.md b/content/en/_index.md
index 98972a210ea9..edc1bacb9761 100644
--- a/content/en/_index.md
+++ b/content/en/_index.md
@@ -10,6 +10,7 @@ developer_note:
   The blocks/cover shortcode (used below) will use as a background image any
   image file containing "background" in its name.
 show_banner: true
+limit_banner: 2 # Default to 2, adjust as needed
 banners:
   - text:
       'Join us for [**OTel Community Day** on June
diff --git a/layouts/partials/banner.md b/layouts/partials/banner.md
index 524aaf7d8ad7..a5e5f27e45d0 100644
--- a/layouts/partials/banner.md
+++ b/layouts/partials/banner.md
@@ -1,17 +1,21 @@
 <!-- cSpell:ignore contribfest markdownify -->
 {{ if .Params.show_banner }}
-{{ $sorted := sort .Params.banners "to" }}
-{{ with $sorted }}
+  {{ $limit := .Params.limit_banner | default 2 }}
+  {{ $sorted := sort .Params.banners "to" }}
   {{ $currentDate := now.Format "2006-01-02" }}
+  {{ $filtered := slice }}
+  {{ range $sorted }}
+    {{ if and (or (not .from) (ge $currentDate .from)) (or (not .to) (le $currentDate .to)) }}
+      {{ if lt (len $filtered) $limit }}
+        {{ $filtered = $filtered | append . }}
+      {{ end }}
+    {{ end }}
+  {{ end }}
 <div class="o-banner">
-    {{ range . }}
-      {{ if and (or (not .from) (ge $currentDate .from)) (or (not .to) (le $currentDate .to)) }}
+    {{ range $filtered }}
 <!-- prettier-ignore -->
 <i class="{{ .icon | default `fas fa-bullhorn` }}"></i> 
 {{ .text | markdownify }}
-      {{ end }}
     {{ end }}
-{.pt-0}  
 </div>
-{{ end }}
 {{ end }}
\ No newline at end of file
diff --git a/themes/docsy b/themes/docsy
index 6f7e81d34ca7..712aa05897c1 160000
--- a/themes/docsy
+++ b/themes/docsy
@@ -1 +1 @@
-Subproject commit 6f7e81d34ca7c75558c5bc969969c96202a059ea
+Subproject commit 712aa05897c1abe239786522131e83d69e5e1b4e

From bf2ea0dfbda92d692b1d1d66c8f1d16689cc2fe3 Mon Sep 17 00:00:00 2001
From: Ricardo Amaro <mail@ricardoamaro.com>
Date: Sat, 11 May 2024 23:01:38 +0100
Subject: [PATCH 36/43] fix error

---
 layouts/partials/banner.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/layouts/partials/banner.md b/layouts/partials/banner.md
index a5e5f27e45d0..521ca52316c5 100644
--- a/layouts/partials/banner.md
+++ b/layouts/partials/banner.md
@@ -1,5 +1,5 @@
 <!-- cSpell:ignore contribfest markdownify -->
-{{ if .Params.show_banner }}
+{{ if and .Params.show_banner (isset .Params "banners") (gt (len .Params.banners) 0) }}
   {{ $limit := .Params.limit_banner | default 2 }}
   {{ $sorted := sort .Params.banners "to" }}
   {{ $currentDate := now.Format "2006-01-02" }}
@@ -14,7 +14,7 @@
 <div class="o-banner">
     {{ range $filtered }}
 <!-- prettier-ignore -->
-<i class="{{ .icon | default `fas fa-bullhorn` }}"></i> 
+<i class="{{ .icon | default `fas fa-bullhorn` }}"></i>
 {{ .text | markdownify }}
     {{ end }}
 </div>

From 1daa134bc11f961f00351753b88ccc88ed72a958 Mon Sep 17 00:00:00 2001
From: Ricardo Amaro <mail@ricardoamaro.com>
Date: Sat, 11 May 2024 23:05:23 +0100
Subject: [PATCH 37/43] add isset to cSpell

---
 layouts/partials/banner.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layouts/partials/banner.md b/layouts/partials/banner.md
index 521ca52316c5..e67d4584446b 100644
--- a/layouts/partials/banner.md
+++ b/layouts/partials/banner.md
@@ -1,4 +1,4 @@
-<!-- cSpell:ignore contribfest markdownify -->
+<!-- cSpell:ignore contribfest markdownify isset -->
 {{ if and .Params.show_banner (isset .Params "banners") (gt (len .Params.banners) 0) }}
   {{ $limit := .Params.limit_banner | default 2 }}
   {{ $sorted := sort .Params.banners "to" }}

From b6f63c2b638dec4efce58274e88282ddc14f70fe Mon Sep 17 00:00:00 2001
From: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com>
Date: Sat, 11 May 2024 22:13:00 +0000
Subject: [PATCH 38/43] Results from /fix:all

---
 content-modules/opentelemetry-proto         | 2 +-
 content-modules/opentelemetry-specification | 2 +-
 themes/docsy                                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/content-modules/opentelemetry-proto b/content-modules/opentelemetry-proto
index 39339ef17721..b3060d2104df 160000
--- a/content-modules/opentelemetry-proto
+++ b/content-modules/opentelemetry-proto
@@ -1 +1 @@
-Subproject commit 39339ef177218cc965b8cf863d761775ec668858
+Subproject commit b3060d2104df364136d75a35779e6bd48bac449a
diff --git a/content-modules/opentelemetry-specification b/content-modules/opentelemetry-specification
index 93ddb3ac0e14..a7bb6473769d 160000
--- a/content-modules/opentelemetry-specification
+++ b/content-modules/opentelemetry-specification
@@ -1 +1 @@
-Subproject commit 93ddb3ac0e144d0b90f04654a1759936663af008
+Subproject commit a7bb6473769d93ddbe063071c94729a242a2cdb2
diff --git a/themes/docsy b/themes/docsy
index 712aa05897c1..6f7e81d34ca7 160000
--- a/themes/docsy
+++ b/themes/docsy
@@ -1 +1 @@
-Subproject commit 712aa05897c1abe239786522131e83d69e5e1b4e
+Subproject commit 6f7e81d34ca7c75558c5bc969969c96202a059ea

From a4069c6b02a6b09436568a62d99e2565c8c7bed9 Mon Sep 17 00:00:00 2001
From: Ricardo Amaro <ricardoamaro@users.noreply.github.com>
Date: Tue, 14 May 2024 20:08:18 +0100
Subject: [PATCH 39/43] Update layouts/partials/banner.md

Co-authored-by: Patrice Chalin <chalin@users.noreply.github.com>
---
 layouts/partials/banner.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layouts/partials/banner.md b/layouts/partials/banner.md
index e67d4584446b..fc3287ea204e 100644
--- a/layouts/partials/banner.md
+++ b/layouts/partials/banner.md
@@ -18,4 +18,4 @@
 {{ .text | markdownify }}
     {{ end }}
 </div>
-{{ end }}
\ No newline at end of file
+{{ end -}}
\ No newline at end of file

From df3a2e81a37d0e6983df51d3d9e970f689ca07c2 Mon Sep 17 00:00:00 2001
From: Ricardo Amaro <mail@ricardoamaro.com>
Date: Tue, 14 May 2024 20:42:59 +0100
Subject: [PATCH 40/43] Address all feedback

---
 content-modules/opentelemetry-proto         |  2 +-
 content-modules/opentelemetry-specification |  2 +-
 content/en/_index.md                        | 17 ++---------------
 layouts/partials/banner.md                  |  9 ++++-----
 themes/docsy                                |  2 +-
 5 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/content-modules/opentelemetry-proto b/content-modules/opentelemetry-proto
index b3060d2104df..39339ef17721 160000
--- a/content-modules/opentelemetry-proto
+++ b/content-modules/opentelemetry-proto
@@ -1 +1 @@
-Subproject commit b3060d2104df364136d75a35779e6bd48bac449a
+Subproject commit 39339ef177218cc965b8cf863d761775ec668858
diff --git a/content-modules/opentelemetry-specification b/content-modules/opentelemetry-specification
index a7bb6473769d..93ddb3ac0e14 160000
--- a/content-modules/opentelemetry-specification
+++ b/content-modules/opentelemetry-specification
@@ -1 +1 @@
-Subproject commit a7bb6473769d93ddbe063071c94729a242a2cdb2
+Subproject commit 93ddb3ac0e144d0b90f04654a1759936663af008
diff --git a/content/en/_index.md b/content/en/_index.md
index edc1bacb9761..5452f12a0661 100644
--- a/content/en/_index.md
+++ b/content/en/_index.md
@@ -12,23 +12,10 @@ developer_note:
 show_banner: true
 limit_banner: 2 # Default to 2, adjust as needed
 banners:
-  - text:
-      'Join us for [**OTel Community Day** on June
-      25th](https://events.linuxfoundation.org/open-telemetry-community-day/)!'
-    from: 2024-01-01
+  - message: '<i class="fas fa-bullhorn"></i> Join us for [**OTel Community Day** on June 25th](https://events.linuxfoundation.org/open-telemetry-community-day/)!'
     to: 2024-06-25
-    icon: 'fas fa-bullhorn'
-  - text:
-      'Help improve OTel and Prometheus interoperability: [complete our
-      survey](https://forms.gle/bZAG9f7udoJsjZUG9) by May 31'
-    from: 2024-01-01
+  - message: '<i class="fas fa-bullhorn"></i> Help improve OTel and Prometheus interoperability: [complete our survey](https://forms.gle/bZAG9f7udoJsjZUG9) by May 31'
     to: 2024-05-31
-  - text:
-      '[Learn about our roadmap to v1 for the OpenTelemetry
-      Collector](/blog/2024/collector-roadmap/)'
-    from: 2024-01-01
-    to: 2024-05-21
-    icon: 'fa fa-envelope'
 ---
 
 <div class="d-none"><a rel="me" href="https://fosstodon.org/@opentelemetry"></a></div>
diff --git a/layouts/partials/banner.md b/layouts/partials/banner.md
index fc3287ea204e..444e22a98206 100644
--- a/layouts/partials/banner.md
+++ b/layouts/partials/banner.md
@@ -1,11 +1,11 @@
-<!-- cSpell:ignore contribfest markdownify isset -->
-{{ if and .Params.show_banner (isset .Params "banners") (gt (len .Params.banners) 0) }}
+<!-- cSpell:ignore contribfest markdownify -->
+{{ if and .Params.show_banner (.Params.banners) (gt (len .Params.banners) 0) }}
   {{ $limit := .Params.limit_banner | default 2 }}
   {{ $sorted := sort .Params.banners "to" }}
   {{ $currentDate := now.Format "2006-01-02" }}
   {{ $filtered := slice }}
   {{ range $sorted }}
-    {{ if and (or (not .from) (ge $currentDate .from)) (or (not .to) (le $currentDate .to)) }}
+    {{ if and (ge $currentDate .to) }}
       {{ if lt (len $filtered) $limit }}
         {{ $filtered = $filtered | append . }}
       {{ end }}
@@ -14,8 +14,7 @@
 <div class="o-banner">
     {{ range $filtered }}
 <!-- prettier-ignore -->
-<i class="{{ .icon | default `fas fa-bullhorn` }}"></i>
-{{ .text | markdownify }}
+{{ .message | markdownify }}
     {{ end }}
 </div>
 {{ end -}}
\ No newline at end of file
diff --git a/themes/docsy b/themes/docsy
index 6f7e81d34ca7..712aa05897c1 160000
--- a/themes/docsy
+++ b/themes/docsy
@@ -1 +1 @@
-Subproject commit 6f7e81d34ca7c75558c5bc969969c96202a059ea
+Subproject commit 712aa05897c1abe239786522131e83d69e5e1b4e

From 97e8b4b25040099a1c757cdc1a1e39b194d39491 Mon Sep 17 00:00:00 2001
From: Ricardo Amaro <mail@ricardoamaro.com>
Date: Tue, 14 May 2024 20:48:32 +0100
Subject: [PATCH 41/43] fix styles

---
 content/en/_index.md       | 10 ++++++++--
 layouts/partials/banner.md |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/content/en/_index.md b/content/en/_index.md
index 5452f12a0661..34faed7154cf 100644
--- a/content/en/_index.md
+++ b/content/en/_index.md
@@ -12,9 +12,15 @@ developer_note:
 show_banner: true
 limit_banner: 2 # Default to 2, adjust as needed
 banners:
-  - message: '<i class="fas fa-bullhorn"></i> Join us for [**OTel Community Day** on June 25th](https://events.linuxfoundation.org/open-telemetry-community-day/)!'
+  - message:
+      '<i class="fas fa-bullhorn"></i> Join us for [**OTel Community Day** on
+      June
+      25th](https://events.linuxfoundation.org/open-telemetry-community-day/)!'
     to: 2024-06-25
-  - message: '<i class="fas fa-bullhorn"></i> Help improve OTel and Prometheus interoperability: [complete our survey](https://forms.gle/bZAG9f7udoJsjZUG9) by May 31'
+  - message:
+      '<i class="fas fa-bullhorn"></i> Help improve OTel and Prometheus
+      interoperability: [complete our
+      survey](https://forms.gle/bZAG9f7udoJsjZUG9) by May 31'
     to: 2024-05-31
 ---
 
diff --git a/layouts/partials/banner.md b/layouts/partials/banner.md
index 444e22a98206..710f0841c2cb 100644
--- a/layouts/partials/banner.md
+++ b/layouts/partials/banner.md
@@ -1,5 +1,5 @@
 <!-- cSpell:ignore contribfest markdownify -->
-{{ if and .Params.show_banner (.Params.banners) (gt (len .Params.banners) 0) }}
+{{ if and .Params.show_banner (gt (len .Params.banners) 0) }}
   {{ $limit := .Params.limit_banner | default 2 }}
   {{ $sorted := sort .Params.banners "to" }}
   {{ $currentDate := now.Format "2006-01-02" }}

From 964be4aebb48cb6ac800186c1b2f2639c8768c30 Mon Sep 17 00:00:00 2001
From: Ricardo Amaro <mail@ricardoamaro.com>
Date: Tue, 14 May 2024 21:59:19 +0100
Subject: [PATCH 42/43] fix code

---
 layouts/partials/banner.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/layouts/partials/banner.md b/layouts/partials/banner.md
index 710f0841c2cb..11439c7851dc 100644
--- a/layouts/partials/banner.md
+++ b/layouts/partials/banner.md
@@ -1,11 +1,11 @@
-<!-- cSpell:ignore contribfest markdownify -->
-{{ if and .Params.show_banner (gt (len .Params.banners) 0) }}
+{{/* cSpell:ignore markdownify */ -}}
+{{ if and .Params.show_banner (gt (len (.Params.banners | default slice)) 0) }}
   {{ $limit := .Params.limit_banner | default 2 }}
   {{ $sorted := sort .Params.banners "to" }}
   {{ $currentDate := now.Format "2006-01-02" }}
   {{ $filtered := slice }}
   {{ range $sorted }}
-    {{ if and (ge $currentDate .to) }}
+    {{ if le $currentDate .to }}
       {{ if lt (len $filtered) $limit }}
         {{ $filtered = $filtered | append . }}
       {{ end }}

From 7f8a0465c7352b82ce0c296af2dfa86aae39488e Mon Sep 17 00:00:00 2001
From: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com>
Date: Tue, 14 May 2024 21:07:16 +0000
Subject: [PATCH 43/43] Results from /fix:all

---
 content-modules/opentelemetry-proto         | 2 +-
 content-modules/opentelemetry-specification | 2 +-
 themes/docsy                                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/content-modules/opentelemetry-proto b/content-modules/opentelemetry-proto
index 39339ef17721..b3060d2104df 160000
--- a/content-modules/opentelemetry-proto
+++ b/content-modules/opentelemetry-proto
@@ -1 +1 @@
-Subproject commit 39339ef177218cc965b8cf863d761775ec668858
+Subproject commit b3060d2104df364136d75a35779e6bd48bac449a
diff --git a/content-modules/opentelemetry-specification b/content-modules/opentelemetry-specification
index 93ddb3ac0e14..a7bb6473769d 160000
--- a/content-modules/opentelemetry-specification
+++ b/content-modules/opentelemetry-specification
@@ -1 +1 @@
-Subproject commit 93ddb3ac0e144d0b90f04654a1759936663af008
+Subproject commit a7bb6473769d93ddbe063071c94729a242a2cdb2
diff --git a/themes/docsy b/themes/docsy
index 712aa05897c1..6f7e81d34ca7 160000
--- a/themes/docsy
+++ b/themes/docsy
@@ -1 +1 @@
-Subproject commit 712aa05897c1abe239786522131e83d69e5e1b4e
+Subproject commit 6f7e81d34ca7c75558c5bc969969c96202a059ea