From 720ed0046d13092b0f62bb3ab046f526ad2b1dae Mon Sep 17 00:00:00 2001
From: Lam Nguyen <la.nguyen@f5.com>
Date: Wed, 21 May 2025 11:03:07 -0700
Subject: [PATCH 1/8] List: Added banner to list if front matter is present

---
 layouts/_default/list.html | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index badaade..8169fb8 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -31,6 +31,14 @@
       <h1>{{ .Title }}</h1>
       {{ .Content }}
 
+      {{- with .Params.banner -}}
+        {{- if .enabled -}}
+          <div class="banner banner-{{ .type }}">
+            Some banner
+          </div>
+        {{- end -}}
+      {{- end -}}
+
       {{ if  (lt .WordCount 1)  }}
       {{ range .Pages.ByWeight }}
       <h2>

From 388b669ed13f0b873c97b35006bb9e7442c02b6e Mon Sep 17 00:00:00 2001
From: Lam Nguyen <la.nguyen@f5.com>
Date: Wed, 21 May 2025 11:41:40 -0700
Subject: [PATCH 2/8] List: Updated list-main from documentation repo

---
 layouts/_default/list.html      |   2 +-
 layouts/partials/list-main.html | 117 ++++++++++++++++++++++++--------
 2 files changed, 91 insertions(+), 28 deletions(-)

diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 8169fb8..5cb23af 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -34,7 +34,7 @@ <h1>{{ .Title }}</h1>
       {{- with .Params.banner -}}
         {{- if .enabled -}}
           <div class="banner banner-{{ .type }}">
-            Some banner
+            {{ partial .md . }}
           </div>
         {{- end -}}
       {{- end -}}
diff --git a/layouts/partials/list-main.html b/layouts/partials/list-main.html
index 07d56dc..f657c0c 100644
--- a/layouts/partials/list-main.html
+++ b/layouts/partials/list-main.html
@@ -1,43 +1,106 @@
 <div class="list-page">
-    <div class="col-md-12 col-xl-12 py-md-3 pl-md-5">
+    {{ $PageTitle := .Title }}
+    <div class="col-md-12 col-xl-12 py-md-3" style="margin-left: -1.75em;">
         <div class="page-header list">
             <h1 class="bd-title">
                 {{ .Title }}
             </h1>
+            {{ if .Description }}
+                <p>
+                    {{ .Description | markdownify }}
+                </p>
+            {{ end}}
             {{ if .Content }}
-                <p class="bd-lead">
+                <p>
                     {{ .Content | markdownify }}
                 </p>
             {{ end }}
         </div>
     </div>
-    {{ if lt .WordCount 1 }}
-    <section class="col-md-12 col-xl-12 py-md-3 pl-md-5" id="section-content-list">
-        
+
+    {{- with .Params.banner -}}
+        {{- if .enabled -}}
+          <div class="banner banner-{{ .type }}">
+            {{ partial .md . }}
+          </div>
+        {{- end -}}
+      {{- end -}}
+
+    {{ if or (lt .WordCount 1) (eq $PageTitle "F5 NGINX One Console") (eq $PageTitle "F5 NGINX App Protect DoS") (eq $PageTitle "F5 NGINX Plus")  }}
+    <section>
         <div class="row">
-            <div class="card-deck">            
-                {{ range .Pages.ByWeight }}
-                <div class="col-md-5 card">
-                    <div class="card-body">
-                        <h3 class="card-title">
-                            <i class="fas fa-{{if eq .Kind "page"}}file-alt{{else}}book{{end}} fa-2x card-img-top"></i>
-                            <a href="{{ if .Params.url}}{{ .Params.url}}{{else}}{{ .Permalink }}{{end}}">{{ .Title }}</a>
-                        </h3>
+            <div class="card-deck">
+                {{ range .Pages.GroupBy "Section" }}
+                    {{ range .Pages.ByWeight }}
+                    <div class="col-md-5 card">
+                        <div class="card-body">
+                            <h3 class="card-title" style="display: flex; align-items: center; gap: 5px;">
+                                <i class="fas fa-{{if eq .Kind "page"}}file-alt{{else}}book{{end}} fa-lg card-img-top"></i>
+                                <a href="{{ if .Params.url}}{{ .Params.url}}{{else}}{{ .Permalink }}{{end}}">{{ .Title }}</a>
+                            </h3>
+                            {{ if and (eq $PageTitle "F5 NGINX One Console") (eq .Title "How-to guides") }}
+                                <ul style="padding-top: 10px;">
+                                    {{ range .Pages }}
+                                        {{ if eq .Kind "section" }}
+                                            {{ range .Pages }}
+                                                <li><a href="{{ .Permalink }}"> {{ .Title }}</a></li>
+                                            {{ end }}
+                                        {{ end }}
+                                    {{ end }}
+                                </ul>
+                            {{ end }}
+                            {{ if and (eq $PageTitle "F5 NGINX One Console") (eq .Title "API")}}
+                                <ul style="padding-top: 10px;">
+                                    {{ range .Pages }}
+                                        <li><a href="{{ .Permalink }}"> {{ .Title }}</a></li>
+                                    {{ end }}
+                                </ul>
+                            {{ end }}
+                            {{ if and (eq $PageTitle "F5 NGINX One Console") (eq .Title "Changelog") }}
+                                {{ partial "changelog-date.html" . }}
+                            {{ end }}
+                        </div>
                     </div>
-                </div>
+                    {{ end }}
+                {{ end }}
+            </div>
+            {{ if eq $PageTitle "F5 NGINX One Console" }}
+                <h1 class="bd-title" style="margin-top: 15px;">Other Products</h1>
+                {{ $nginxProducts := slice 
+                    (dict "title" "NGINX Instance Manager" "url" "/nginx-instance-manager" "imgSrc" "NGINX-Instance-Manager-product-icon" "type" "local-console-option" "description" "Track and control NGINX Open Source and NGINX Plus instances.")
+                    (dict "title" "NGINX Ingress Controller" "url" "/nginx-ingress-controller" "imgSrc" "NGINX-Ingress-Controller-product-icon" "type" "kubernetes-solutions" "description" "Kubernetes traffic management with API gateway, identity, and observability features.")
+                    (dict "title" "NGINX Gateway Fabric" "url" "/nginx-gateway-fabric" "imgSrc" "NGINX-product-icon" "type" "kubernetes-solutions" "description" "Next generation Kubernetes connectivity using the Gateway API.")
+                    (dict "title" "NGINX App Protect WAF" "url" "/nginx-app-protect-waf" "imgSrc" "NGINX-App-Protect-WAF-product-icon" "type" "security" "description" "Lightweight, high-performance, advanced protection against Layer 7 attacks on your apps and APIs.")
+                    (dict "title" "NGINX App Protect DoS" "url" "/nginx-app-protect-dos" "imgSrc" "NGINX-App-Protect-DoS-product-icon" "type" "security" "description" "Defend, adapt, and mitigate against Layer 7 denial-of-service attacks on your apps and APIs.")
+                    (dict "title" "NGINX Plus" "url" "/nginx" "imgSrc" "NGINX-Plus-product-icon-RGB" "type" "modern-app-delivery"  "description" "The all-in-one load balancer, reverse proxy, web server, content cache, and API gateway.")
+                    (dict "title" "NGINX Open Source" "url" "https://nginx.org/en/docs/" "imgSrc" "NGINX-product-icon" "type" "modern-app-delivery" "description" "The open source all-in-one load balancer, content cache, and web server")
+                }}
+                {{ $groupedProducts := dict 
+                    "local-console-option" (where $nginxProducts "type" "local-console-option")
+                    "kubernetes-solutions" (where $nginxProducts "type" "kubernetes-solutions")
+                    "security" (where $nginxProducts "type" "security")
+                    "modern-app-delivery" (where $nginxProducts "type" "modern-app-delivery")
+                }}
+                {{ range $type, $products := $groupedProducts }}
+                <div class="card-deck">
+                    <p style="margin-left: 15px; width: 100%; font-weight: bold;">{{ $type | humanize | title }}</p>
+                    {{ range $products }}
+                        <div class="card" style="margin-top: 0px; {{ if eq (len $products) 1 }}max-width: calc(50% - 30px);{{ else }}min-width: 40%;{{ end }}">
+                            <div class="card-body">
+                                <h3 class="card-title" style="display: flex; align-items: center;">
+                                    <img class="card-img-top" src="{{ .Site.BaseURL }}/images/icons/{{ .imgSrc }}.png"/>
+                                <a href="{{ if eq .title "NGINX Open Source" }}{{ .url }}{{ else }}{{ .Site.BaseURL }}{{ .url }}{{ end }}">{{ .title }}</a>
+                                </h3>
+                                <p >
+                                    {{ if .description }}{{ .description | markdownify }}{{ end }}    
+                                </p>
+                            </div>
+                        </div>
+                    {{ end }}
+                </div>            
                 {{ end }}
-            </div> 
-        </div> 
+            {{ end }} 
+        </div>  
     </section>
-    {{ end }}
-</div>
-
-
-    {{ if not .IsHome }}
-    <div class="row justify-content-center">
-        {{ partial "pagination.html" . }}
-    </div>
-    {{ end }}
-
-    
+    {{end}}
 </div>
\ No newline at end of file

From c3f2c809a48f22feb9212b83c53146b67d0950f5 Mon Sep 17 00:00:00 2001
From: Lam Nguyen <la.nguyen@f5.com>
Date: Fri, 23 May 2025 11:59:26 -0700
Subject: [PATCH 3/8] List: Updated list files + added new banner shortcode

---
 layouts/_default/list.html      | 3 ++-
 layouts/partials/list-main.html | 3 ++-
 layouts/shortcodes/banner.html  | 7 +++++++
 3 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 layouts/shortcodes/banner.html

diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 5cb23af..f3a1797 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -33,8 +33,9 @@ <h1>{{ .Title }}</h1>
 
       {{- with .Params.banner -}}
         {{- if .enabled -}}
+          {{- $bannerPage := site.GetPage .md -}}
           <div class="banner banner-{{ .type }}">
-            {{ partial .md . }}
+            {{ $bannerPage.Content }}
           </div>
         {{- end -}}
       {{- end -}}
diff --git a/layouts/partials/list-main.html b/layouts/partials/list-main.html
index f657c0c..cf9cd07 100644
--- a/layouts/partials/list-main.html
+++ b/layouts/partials/list-main.html
@@ -20,8 +20,9 @@ <h1 class="bd-title">
 
     {{- with .Params.banner -}}
         {{- if .enabled -}}
+            {{- $bannerPage := site.GetPage .md -}}
           <div class="banner banner-{{ .type }}">
-            {{ partial .md . }}
+            {{ $bannerPage.Content }}
           </div>
         {{- end -}}
       {{- end -}}
diff --git a/layouts/shortcodes/banner.html b/layouts/shortcodes/banner.html
new file mode 100644
index 0000000..75a0f98
--- /dev/null
+++ b/layouts/shortcodes/banner.html
@@ -0,0 +1,7 @@
+{{- $type := .Get 0 | default (.Get "type") | default "" -}}
+{{- $title := .Get 1 | default (.Get "title") | default "" -}}
+<blockquote class="{{ $type }}">
+    <i class="fa-solid fa-triangle-exclamation"></i><strong>{{ $title }}</strong>
+    <br>
+    {{- .Inner | markdownify -}}
+</blockquote>
\ No newline at end of file

From ab57124ccae28b10bbdccd922dd4af72630db151 Mon Sep 17 00:00:00 2001
From: Lam Nguyen <la.nguyen@f5.com>
Date: Tue, 27 May 2025 05:53:49 -0700
Subject: [PATCH 4/8] List: Added date checker + moved to partial + added
 banner to every page

---
 layouts/_default/docs.html      |  3 ++-
 layouts/_default/list.html      |  9 +--------
 layouts/partials/banner.html    | 22 ++++++++++++++++++++++
 layouts/partials/list-main.html |  9 +--------
 4 files changed, 26 insertions(+), 17 deletions(-)
 create mode 100644 layouts/partials/banner.html

diff --git a/layouts/_default/docs.html b/layouts/_default/docs.html
index 3b66e9a..8d3b4f5 100644
--- a/layouts/_default/docs.html
+++ b/layouts/_default/docs.html
@@ -66,7 +66,7 @@
   {{ else }}
   <main class="content col d-block align-top content-no-toc" role="main">
   {{ end }}
-    
+
   <section class="main-layout">
     <div class="sidebar-layout" id="sidebar-layout">
       <button class="sidebar__mobile__toggle" aria-expanded="false" data-mf="true">{{ partial "lucide" (dict "context" . "icon" "x")}}Close</button>
@@ -84,6 +84,7 @@
             {{ end }}
           {{ end }}
         </section>
+        {{ partial "banner" .}}
         <h1>{{ .Title }}</h1>
         {{ $content | safeHTML }}
         {{ if eq .Page.Draft true }}{{ partial "draft-badge.html" . }}{{ end }}
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index f3a1797..d13af58 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -31,14 +31,7 @@
       <h1>{{ .Title }}</h1>
       {{ .Content }}
 
-      {{- with .Params.banner -}}
-        {{- if .enabled -}}
-          {{- $bannerPage := site.GetPage .md -}}
-          <div class="banner banner-{{ .type }}">
-            {{ $bannerPage.Content }}
-          </div>
-        {{- end -}}
-      {{- end -}}
+      {{ partial "banner" .}}
 
       {{ if  (lt .WordCount 1)  }}
       {{ range .Pages.ByWeight }}
diff --git a/layouts/partials/banner.html b/layouts/partials/banner.html
new file mode 100644
index 0000000..48fb39a
--- /dev/null
+++ b/layouts/partials/banner.html
@@ -0,0 +1,22 @@
+{{- with .Params.banner -}}
+  {{- if .enabled -}}
+    <!-- Gather the dates and default to beginning or end of time if frontmatter is not provided -->
+    {{- $currentDate :=  now | dateFormat "2006-01-02" -}}
+    {{- $startDate := index . "start-date" | default "0001-01-01" -}}
+    {{- $endDate := index . "end-date" | default "9999-12-31" -}}
+    
+    <!-- Checks that the current date is within bounds-->
+    {{- if and (ge $currentDate $startDate) (le $currentDate $endDate) -}}
+      {{- if isset . "md" -}}
+          <!-- Show markdown if "md" is provided -->
+          {{- $bannerPage := site.GetPage .md -}}
+          <div class="banner banner-{{ .type }}">
+            {{ $bannerPage.Content }}
+          </div>
+      {{- else -}}
+          <!-- Show default banner if "md" is NOT provided -->
+        
+      {{- end -}}
+    {{- end -}}
+  {{- end -}}
+{{- end -}}
\ No newline at end of file
diff --git a/layouts/partials/list-main.html b/layouts/partials/list-main.html
index cf9cd07..7facf94 100644
--- a/layouts/partials/list-main.html
+++ b/layouts/partials/list-main.html
@@ -18,14 +18,7 @@ <h1 class="bd-title">
         </div>
     </div>
 
-    {{- with .Params.banner -}}
-        {{- if .enabled -}}
-            {{- $bannerPage := site.GetPage .md -}}
-          <div class="banner banner-{{ .type }}">
-            {{ $bannerPage.Content }}
-          </div>
-        {{- end -}}
-      {{- end -}}
+    {{ partial "banner" .}}
 
     {{ if or (lt .WordCount 1) (eq $PageTitle "F5 NGINX One Console") (eq $PageTitle "F5 NGINX App Protect DoS") (eq $PageTitle "F5 NGINX Plus")  }}
     <section>

From 52e069b5c9f8f9cbdc78bb006a6c16ac502d4896 Mon Sep 17 00:00:00 2001
From: Lam Nguyen <la.nguyen@f5.com>
Date: Tue, 27 May 2025 06:10:46 -0700
Subject: [PATCH 5/8] List: Added error to build if md is not provided

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

diff --git a/layouts/partials/banner.html b/layouts/partials/banner.html
index 48fb39a..3920ca2 100644
--- a/layouts/partials/banner.html
+++ b/layouts/partials/banner.html
@@ -14,8 +14,8 @@
             {{ $bannerPage.Content }}
           </div>
       {{- else -}}
-          <!-- Show default banner if "md" is NOT provided -->
-        
+          <!-- Show error to writers if "md" is NOT provided -->
+          {{ errorf "Required front matter parameter 'md' is missing or empty for banner." }}
       {{- end -}}
     {{- end -}}
   {{- end -}}

From 6dc69b31a90c685e1c69a12cfd7a4dba00b5c906 Mon Sep 17 00:00:00 2001
From: Lam Nguyen <la.nguyen@f5.com>
Date: Tue, 27 May 2025 08:02:16 -0700
Subject: [PATCH 6/8] List: Change to readFile

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

diff --git a/layouts/partials/banner.html b/layouts/partials/banner.html
index 3920ca2..62f9f71 100644
--- a/layouts/partials/banner.html
+++ b/layouts/partials/banner.html
@@ -9,9 +9,9 @@
     {{- if and (ge $currentDate $startDate) (le $currentDate $endDate) -}}
       {{- if isset . "md" -}}
           <!-- Show markdown if "md" is provided -->
-          {{- $bannerPage := site.GetPage .md -}}
+          {{- $bannerPage := readFile .md -}}
           <div class="banner banner-{{ .type }}">
-            {{ $bannerPage.Content }}
+            {{ $bannerPage | markdownify }}
           </div>
       {{- else -}}
           <!-- Show error to writers if "md" is NOT provided -->

From 267fb49c1dea436b6395b4714b0c81be6f2cd06f Mon Sep 17 00:00:00 2001
From: Lam Nguyen <la.nguyen@f5.com>
Date: Tue, 27 May 2025 11:12:30 -0700
Subject: [PATCH 7/8] List: Moved banner to inside page header

---
 layouts/partials/list-main.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/layouts/partials/list-main.html b/layouts/partials/list-main.html
index 7facf94..84777ad 100644
--- a/layouts/partials/list-main.html
+++ b/layouts/partials/list-main.html
@@ -15,11 +15,11 @@ <h1 class="bd-title">
                     {{ .Content | markdownify }}
                 </p>
             {{ end }}
+
+            {{ partial "banner" .}}
         </div>
     </div>
 
-    {{ partial "banner" .}}
-
     {{ if or (lt .WordCount 1) (eq $PageTitle "F5 NGINX One Console") (eq $PageTitle "F5 NGINX App Protect DoS") (eq $PageTitle "F5 NGINX Plus")  }}
     <section>
         <div class="row">

From ab547ea3ec7fb72acdc8b2225fa8f3e5aac0641c Mon Sep 17 00:00:00 2001
From: Lam Nguyen <la.nguyen@f5.com>
Date: Wed, 28 May 2025 08:00:46 -0700
Subject: [PATCH 8/8] List: Changed to use callout partial in banner partial

---
 layouts/_default/list.html     |  2 +-
 layouts/shortcodes/banner.html | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index d13af58..6164c75 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -31,7 +31,7 @@
       <h1>{{ .Title }}</h1>
       {{ .Content }}
 
-      {{ partial "banner" .}}
+      {{ partial "banner" . }}
 
       {{ if  (lt .WordCount 1)  }}
       {{ range .Pages.ByWeight }}
diff --git a/layouts/shortcodes/banner.html b/layouts/shortcodes/banner.html
index 75a0f98..5240248 100644
--- a/layouts/shortcodes/banner.html
+++ b/layouts/shortcodes/banner.html
@@ -1,7 +1,9 @@
 {{- $type := .Get 0 | default (.Get "type") | default "" -}}
 {{- $title := .Get 1 | default (.Get "title") | default "" -}}
-<blockquote class="{{ $type }}">
-    <i class="fa-solid fa-triangle-exclamation"></i><strong>{{ $title }}</strong>
-    <br>
-    {{- .Inner | markdownify -}}
-</blockquote>
\ No newline at end of file
+{{ partial "callout.html" (dict
+    "class" $type
+    "title" $title
+    "icon"  "fa-solid fa-triangle-exclamation"
+    "inline" true
+    "content" .Inner
+) }}
\ No newline at end of file