From 6550b1171f00c4c4e0b5d4b5e7483cc474ed6143 Mon Sep 17 00:00:00 2001
From: Lam Nguyen <la.nguyen@f5.com>
Date: Wed, 2 Jul 2025 14:51:57 -0700
Subject: [PATCH 1/2] Callouts: Fixed partially styled call-outs

---
 exampleSite/_banners/test-product-intro.md |  6 +++++
 exampleSite/content/test-product/_index.md |  5 ++++
 layouts/partials/callout.html              | 27 +++++++++++-----------
 layouts/shortcodes/banner.html             |  3 ++-
 layouts/shortcodes/call-out.html           | 15 ++----------
 5 files changed, 28 insertions(+), 28 deletions(-)
 create mode 100644 exampleSite/_banners/test-product-intro.md

diff --git a/exampleSite/_banners/test-product-intro.md b/exampleSite/_banners/test-product-intro.md
new file mode 100644
index 00000000..cc6c4675
--- /dev/null
+++ b/exampleSite/_banners/test-product-intro.md
@@ -0,0 +1,6 @@
+{{<banner "caution" "Under development">}}
+  <br>
+  This product on our example site is under development and changes are being added frequently. 
+  <br>
+  Please reach out to <strong>#friends-of-the-docs</strong> on Slack to ask questions.
+{{</banner>}}
\ No newline at end of file
diff --git a/exampleSite/content/test-product/_index.md b/exampleSite/content/test-product/_index.md
index df11ae20..0a681ba0 100644
--- a/exampleSite/content/test-product/_index.md
+++ b/exampleSite/content/test-product/_index.md
@@ -3,6 +3,11 @@ description: Test pages for nginx-hugo-theme
 title: Test pages
 weight: 100
 nd-landing-page: true
+cascade:
+  nd-banner:
+    enabled: true
+    start-date: 2025-01-01
+    md: /_banners/test-product-intro.md
 ---
 {{<card-layout>}}
   {{<card-section showAsCards="true">}}
diff --git a/layouts/partials/callout.html b/layouts/partials/callout.html
index 616bfe04..11a842ae 100644
--- a/layouts/partials/callout.html
+++ b/layouts/partials/callout.html
@@ -34,6 +34,7 @@
 
 
 {{/*  Render a different block, if "loud" callouts are used  */}}
+{{ $type := (index (split $class " ") 0) | strings.FirstUpper }}
 {{ $specialTitles := slice "Caution" "Warning" "Deprecated" "Important" }}
 {{ $specialTitleIcons := dict
   "Caution"    "alert-triangle"
@@ -41,24 +42,22 @@
   "Deprecated" "alert-octagon"
   "Important"  "arrow-right-circle"
 }}
-{{ $icon := index $specialTitleIcons $title | default "" }}
+{{ $icon := index $specialTitleIcons $type | default "" }}
 
-{{ $isSpecialTitle := in $specialTitles $title }}
+{{ $isSpecialTitle := in $specialTitles $type }}
 {{ if $isSpecialTitle }}
-  {{/*  Loud callouts  */}}
+{{/*  Loud callouts  */}}
+<blockquote class="{{ $class }}" data-mf="true" style="display: none;">
   <div>
-  <blockquote class="{{ $class }}" data-mf="true" style="display: none;">
-    <div>
-      <div class="call-out-type">
-        {{ partial "feather" (dict "context" . "icon" $icon) .}}
-       {{ $title }}
-      </div>
-      <div class="callout-content">
-        {{ .content | markdownify }}
-      </div>
+    <div class="call-out-type">
+      {{ partial "feather" (dict "context" . "icon" $icon) .}}
+      {{ $title }}
     </div>
-  </blockquote>
-</div>
+    <div class="callout-content">
+      {{ .content | markdownify }}
+    </div>
+  </div>
+</blockquote>
 
 {{ else }}
 
diff --git a/layouts/shortcodes/banner.html b/layouts/shortcodes/banner.html
index 5240248b..374e53d4 100644
--- a/layouts/shortcodes/banner.html
+++ b/layouts/shortcodes/banner.html
@@ -1,9 +1,10 @@
 {{- $type := .Get 0 | default (.Get "type") | default "" -}}
 {{- $title := .Get 1 | default (.Get "title") | default "" -}}
 {{ partial "callout.html" (dict
-    "class" $type
+    "class" (printf "%s %s" $type "call-out")
     "title" $title
     "icon"  "fa-solid fa-triangle-exclamation"
     "inline" true
+    "type" ($type | strings.FirstUpper)
     "content" .Inner
 ) }}
\ No newline at end of file
diff --git a/layouts/shortcodes/call-out.html b/layouts/shortcodes/call-out.html
index fe0b3872..397dc1c6 100644
--- a/layouts/shortcodes/call-out.html
+++ b/layouts/shortcodes/call-out.html
@@ -25,21 +25,10 @@
   {{ warnf "The '<call-out>' Shortcode parameter 'inline' must be 'true' or 'false', but got: '%s'. This will now default to 'false'" $inlineParam}}
 {{ end }}
 
-{{ $inline := eq $inlineParam "true" }}
-
-{{ $sideOption := "side-callout" }}
-{{ $inlineOption := "inline-callout" }}
-
-{{ if $inline }}
-  {{ $class = printf "%s %s" $class $inlineOption }}
-{{ else }}
-  {{ $class = printf "%s %s" $class $sideOption }}
-{{ end }}
-
 {{ partial "callout.html" (dict
-    "class" $class
+    "class" (printf "%s %s" $class "call-out")
     "title" $title
     "icon"  $icon
-    "inline" $inline
+    "inline" $inlineParam
     "content" .Inner
 ) }}
\ No newline at end of file

From a1da30d9560c386a868af5926c6cd42665b59a5a Mon Sep 17 00:00:00 2001
From: Lam Nguyen <la.nguyen@f5.com>
Date: Wed, 2 Jul 2025 15:03:50 -0700
Subject: [PATCH 2/2] Callouts: Refactored inline param to be sideline param
 instead

---
 .../test-product/call-out/call-out-param-types.md  | 10 +++++-----
 .../content/test-product/call-out/call-out-side.md |  2 +-
 layouts/partials/callout.html                      | 10 +++++-----
 layouts/shortcodes/banner.html                     |  2 +-
 layouts/shortcodes/before-you-begin.html           |  2 +-
 layouts/shortcodes/call-out.html                   | 14 +++++++-------
 layouts/shortcodes/caution.html                    |  2 +-
 layouts/shortcodes/deprecated.html                 |  2 +-
 layouts/shortcodes/important.html                  |  2 +-
 layouts/shortcodes/note.html                       |  2 +-
 layouts/shortcodes/see-also.html                   |  2 +-
 layouts/shortcodes/tip.html                        |  2 +-
 layouts/shortcodes/warning.html                    |  2 +-
 13 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/exampleSite/content/test-product/call-out/call-out-param-types.md b/exampleSite/content/test-product/call-out/call-out-param-types.md
index 86e694c3..1433d835 100644
--- a/exampleSite/content/test-product/call-out/call-out-param-types.md
+++ b/exampleSite/content/test-product/call-out/call-out-param-types.md
@@ -13,20 +13,20 @@ The callout shortcode aims to support both, but **not** in the same shortcode in
 ## The two callouts below using **unnamed** params
 
 {{<call-out "" "Custom title" "fa fa-check-circle" "true">}}
-This callout uses the icon check-circle. **This should be an inline callout.**
+This callout uses the icon check-circle. **This should be an sideline callout.**
 {{</call-out>}}
 
 {{<call-out "" "Custom title" "fa fa-check-circle" "false">}}
-This callout uses the icon check-circle. **This should be an sideline callout.**
+This callout uses the icon check-circle. **This should be an inline callout.**
 {{</call-out>}}
 
 ## The two callouts below using **named** params
 This should work exactly the same as the two callouts above
 
-{{<call-out title="Custom title" icon="fa fa-check-circle" inline="true">}}
-This callout uses the icon check-circle. **This should be an inline callout.**
+{{<call-out title="Custom title" icon="fa fa-check-circle" sideline="true">}}
+This callout uses the icon check-circle. **This should be an sideline callout.**
 {{</call-out>}}
 
-{{<call-out title="Custom title" icon="fa fa-check-circle" inline="asdas">}}
+{{<call-out title="Custom title" icon="fa fa-check-circle" sideline="true">}}
 This callout uses the icon check-circle. **This should be an sideline callout.**
 {{</call-out>}}
diff --git a/exampleSite/content/test-product/call-out/call-out-side.md b/exampleSite/content/test-product/call-out/call-out-side.md
index 497d318d..b3b41ef8 100644
--- a/exampleSite/content/test-product/call-out/call-out-side.md
+++ b/exampleSite/content/test-product/call-out/call-out-side.md
@@ -46,6 +46,6 @@ This assumes the callout text is shorter than the text in the callout.
 If the text in the paragraph is shorter than the callout, it's likely
 the content needs to be re-written.
 
-{{<call-out "tip inline-callout" "Tip for Automated Reporting" >}}
+{{<call-out "tip" "Tip for Automated Reporting" >}}
 I am some call out text. Look at me go!
 {{</call-out>}}
\ No newline at end of file
diff --git a/layouts/partials/callout.html b/layouts/partials/callout.html
index 11a842ae..aab0433e 100644
--- a/layouts/partials/callout.html
+++ b/layouts/partials/callout.html
@@ -2,18 +2,18 @@
 {{ $class := .class | default "" }}
 {{ $title := .title | default "" }}
 {{ $icon  := .icon  | default "" }}
-{{ $inlineParam := .inline | default "false" | lower }}
+{{ $sidelineParam := .sideline | default "false" | lower }}
 
-{{ if not (in (slice "true" "false") $inlineParam) }}
-  {{ errorf "Invalid parameter 'inline'='%s' passed to blockquote partial from '%s'. Allowed values: true, false" $inlineParam .Page.Path }}
+{{ if not (in (slice "true" "false") $sidelineParam) }}
+  {{ errorf "Invalid parameter 'sideline'='%s' passed to blockquote partial from '%s'. Allowed values: true, false" $sidelineParam .Page.Path }}
 {{ end }}
 
 {{/*  Figure out inline/side and set class accordingly  */}}
-{{ $inline := eq $inlineParam "true" }}
+{{ $sideline := eq $sidelineParam "true" }}
 {{ $sideOption := "side-callout" }}
 {{ $inlineOption := "inline-callout" }}
 
-{{ if $inline }}
+{{ if $sideline }}
   {{ $class = printf "%s %s" $class $sideOption }}
 {{ else }}
   {{ $class = printf "%s %s" $class $inlineOption }}
diff --git a/layouts/shortcodes/banner.html b/layouts/shortcodes/banner.html
index 374e53d4..3d4b50dd 100644
--- a/layouts/shortcodes/banner.html
+++ b/layouts/shortcodes/banner.html
@@ -4,7 +4,7 @@
     "class" (printf "%s %s" $type "call-out")
     "title" $title
     "icon"  "fa-solid fa-triangle-exclamation"
-    "inline" true
+    "sideline" true
     "type" ($type | strings.FirstUpper)
     "content" .Inner
 ) }}
\ No newline at end of file
diff --git a/layouts/shortcodes/before-you-begin.html b/layouts/shortcodes/before-you-begin.html
index e3c14fba..a69efa02 100644
--- a/layouts/shortcodes/before-you-begin.html
+++ b/layouts/shortcodes/before-you-begin.html
@@ -2,7 +2,7 @@
  "class" "tip"
  "title" "Before you begin:"
  "icon"  ""
- "inline" "false"
+ "sideline" "false"
  "content" .Inner
 ) }}
 {{ warnf "'<before-you-begin></before-you-begin>' is being deprecated. Use generic 'call-out' shortcode instead."}}
\ No newline at end of file
diff --git a/layouts/shortcodes/call-out.html b/layouts/shortcodes/call-out.html
index 397dc1c6..d25266e9 100644
--- a/layouts/shortcodes/call-out.html
+++ b/layouts/shortcodes/call-out.html
@@ -1,13 +1,13 @@
 {{/*  
 
 Usage:
-{{<call-out title="Custom title" icon="fa fa-check-circle" inline="true">}}
-This callout uses the icon check-circle. **This should be an inline callout.**
+{{<call-out title="Custom title" icon="fa fa-check-circle" sideline="true">}}
+This callout uses the icon check-circle. **This should be an sideline callout.**
 {{</call-out>}}
 
 Backwards compatibility usage:
 {{<call-out "warning" "Custom title" "fa fa-check-circle" "true">}}
-This callout uses the icon check-circle. **This should be an inline callout.**
+This callout uses the icon check-circle. **This should be an sideline callout.**
 {{</call-out>}}
 
 Depends on `callout.html` partial.
@@ -19,16 +19,16 @@
 {{ $icon := .Get 2 | default (.Get "icon") | default "" }}
 
 {{/*  Handle different versions of booleans  */}}
-{{ $inlineParam := (.Get 3) | default (.Get "inline") | default "false" | lower }}
+{{ $sidelineParam := (.Get 3) | default (.Get "sideline") | default "false" | lower }}
 {{- /* Validate the parameter strictly */ -}}
-{{ if not (in (slice "true" "false") $inlineParam) }}
-  {{ warnf "The '<call-out>' Shortcode parameter 'inline' must be 'true' or 'false', but got: '%s'. This will now default to 'false'" $inlineParam}}
+{{ if not (in (slice "true" "false") $sidelineParam) }}
+  {{ warnf "The '<call-out>' Shortcode parameter 'sideline' must be 'true' or 'false', but got: '%s'. This will now default to 'false'" $sidelineParam}}
 {{ end }}
 
 {{ partial "callout.html" (dict
     "class" (printf "%s %s" $class "call-out")
     "title" $title
     "icon"  $icon
-    "inline" $inlineParam
+    "sideline" $sidelineParam
     "content" .Inner
 ) }}
\ No newline at end of file
diff --git a/layouts/shortcodes/caution.html b/layouts/shortcodes/caution.html
index 866fba3b..ffbbd124 100644
--- a/layouts/shortcodes/caution.html
+++ b/layouts/shortcodes/caution.html
@@ -2,6 +2,6 @@
 "class" "caution call-out"
 "title" "Caution"
 "icon"  ""
-"inline" "false"
+"sideline" "false"
 "content" .Inner
 ) }}
\ No newline at end of file
diff --git a/layouts/shortcodes/deprecated.html b/layouts/shortcodes/deprecated.html
index 512092d5..f4b5b6e5 100644
--- a/layouts/shortcodes/deprecated.html
+++ b/layouts/shortcodes/deprecated.html
@@ -2,6 +2,6 @@
 "class" "warning call-out"
 "title" "Deprecated"
 "icon"  ""
-"inline" "false"
+"sideline" "false"
 "content" .Inner
 ) }}
\ No newline at end of file
diff --git a/layouts/shortcodes/important.html b/layouts/shortcodes/important.html
index ee48cd7b..b65fb3c9 100644
--- a/layouts/shortcodes/important.html
+++ b/layouts/shortcodes/important.html
@@ -2,6 +2,6 @@
 "class" "important call-out"
 "title" "Important"
 "icon"  ""
-"inline" "false"
+"sideline" "false"
 "content" .Inner
 ) }}
\ No newline at end of file
diff --git a/layouts/shortcodes/note.html b/layouts/shortcodes/note.html
index 08f1209d..53a71230 100644
--- a/layouts/shortcodes/note.html
+++ b/layouts/shortcodes/note.html
@@ -2,7 +2,7 @@
 "class" "note"
 "title" "Note:"
 "icon"  ""
-"inline" "false"
+"sideline" "false"
 "content" .Inner
 ) }}
 {{ warnf "'<note></note>' is being deprecated. Use generic 'call-out' shortcode instead."}}
\ No newline at end of file
diff --git a/layouts/shortcodes/see-also.html b/layouts/shortcodes/see-also.html
index 505f94dc..259381ef 100644
--- a/layouts/shortcodes/see-also.html
+++ b/layouts/shortcodes/see-also.html
@@ -2,7 +2,7 @@
 "class" "tip"
 "title" "See Also:"
 "icon"  ""
-"inline" "false"
+"sideline" "false"
 "content" .Inner
 ) }}
 {{ warnf "'<see-also></see-also>' is being deprecated. Use generic 'call-out' shortcode instead."}}
\ No newline at end of file
diff --git a/layouts/shortcodes/tip.html b/layouts/shortcodes/tip.html
index a0659e9d..d1034d46 100644
--- a/layouts/shortcodes/tip.html
+++ b/layouts/shortcodes/tip.html
@@ -2,7 +2,7 @@
 "class" "tip"
 "title" "Tip:"
 "icon"  ""
-"inline" "false"
+"sideline" "false"
 "content" .Inner
 ) }}
 {{ warnf "'<tip></tip>' is being deprecated. Use generic 'call-out' shortcode instead."}}
\ No newline at end of file
diff --git a/layouts/shortcodes/warning.html b/layouts/shortcodes/warning.html
index ca08971f..5be3aff6 100644
--- a/layouts/shortcodes/warning.html
+++ b/layouts/shortcodes/warning.html
@@ -2,6 +2,6 @@
 "class" "warning call-out"
 "title" "Warning"
 "icon"  ""
-"inline" "false"
+"sideline" "false"
 "content" .Inner
 ) }}
\ No newline at end of file