From 66b1f089fc4c65867fe3b40928052b601dde0b91 Mon Sep 17 00:00:00 2001
From: Nicholas Fogal <nfogal.misc@gmail.com>
Date: Tue, 14 Mar 2023 14:45:23 -0400
Subject: [PATCH 1/9] Update alert.njk

Fix alert nunjunks template to handle title and message as HTML
---
 modules/default/alert/templates/alert.njk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/default/alert/templates/alert.njk b/modules/default/alert/templates/alert.njk
index 0a49df8a23..7349a7ae3d 100644
--- a/modules/default/alert/templates/alert.njk
+++ b/modules/default/alert/templates/alert.njk
@@ -8,11 +8,11 @@
   <br/>
 {% endif %}
 {% if title %}
-  <span class="thin dimmed medium">{{ title }}</span>
+  <span class="thin dimmed medium">{{ title if titleType == 'text' else title | safe }}</span>
 {% endif %}
 {% if message %}
   {% if title %}
     <br/>
   {% endif %}
-  <span class="light bright small">{{ message | safe }}</span>
+  <span class="light bright small">{{ message if messageType == 'text' else message | safe }}</span>
 {% endif %}

From 50968e33ff7ff147664caee3e30640b390d5edd9 Mon Sep 17 00:00:00 2001
From: Nicholas Fogal <nfogal.misc@gmail.com>
Date: Tue, 14 Mar 2023 14:46:21 -0400
Subject: [PATCH 2/9] Update notification.njk

Fix nunjucks notification template to handle title and message as HTML
---
 modules/default/alert/templates/notification.njk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/default/alert/templates/notification.njk b/modules/default/alert/templates/notification.njk
index af3adf26ce..1594ad4866 100644
--- a/modules/default/alert/templates/notification.njk
+++ b/modules/default/alert/templates/notification.njk
@@ -1,9 +1,9 @@
 {% if title %}
-  <span class="thin dimmed medium">{{ title }}</span>
+  <span class="thin dimmed medium">{{ title if titleType == 'text' else title | safe }}</span>
 {% endif %}
 {% if message %}
   {% if title %}
     <br/>
   {% endif %}
-  <span class="light bright small">{{ message | safe }}</span>
+  <span class="light bright small">{{ message if messageType == 'text' else message | safe }}</span>
 {% endif %}

From a705636c7d774fd5134f5c90bb63df8d1cb80c23 Mon Sep 17 00:00:00 2001
From: Nicholas Fogal <nfogal.misc@gmail.com>
Date: Tue, 14 Mar 2023 14:54:51 -0400
Subject: [PATCH 3/9] Update CHANGELOG.md

Fix default alert module to render HTML for title and message
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e0e9305a44..8b1cff8280 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -55,6 +55,7 @@ _This release is scheduled to be released on 2023-04-01._
 - Fix wrong vertical alignment of calendar title column when wrapEvents is true (#3053)
 - Fix empty news feed stopping the reload forever
 - Fix e2e tests (failed after async changes) by running calendar and newsfeed tests last
+- Fix default alert module to render HTML for title and message
 
 ## [2.22.0] - 2023-01-01
 

From 59d6d3fcffe81c066986ac8e610924ed45ea61c0 Mon Sep 17 00:00:00 2001
From: Nicholas Fogal <nfogal.misc@gmail.com>
Date: Tue, 14 Mar 2023 15:13:57 -0400
Subject: [PATCH 4/9] Update alert.njk

Default to using html if 'titleType' and 'messageType' are null
---
 modules/default/alert/templates/alert.njk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/default/alert/templates/alert.njk b/modules/default/alert/templates/alert.njk
index 7349a7ae3d..c293567c0c 100644
--- a/modules/default/alert/templates/alert.njk
+++ b/modules/default/alert/templates/alert.njk
@@ -8,11 +8,11 @@
   <br/>
 {% endif %}
 {% if title %}
-  <span class="thin dimmed medium">{{ title if titleType == 'text' else title | safe }}</span>
+  <span class="thin dimmed medium">{{ title | safe if (titleType == null || titleType == 'html') else title }}</span>
 {% endif %}
 {% if message %}
   {% if title %}
     <br/>
   {% endif %}
-  <span class="light bright small">{{ message if messageType == 'text' else message | safe }}</span>
+  <span class="light bright small">{{ message | safe if (messageType == null || messageType == 'html') else message }}</span>
 {% endif %}

From 041f5ef3309f79bd49ad0615d1d9ace601ce650f Mon Sep 17 00:00:00 2001
From: Nicholas Fogal <nfogal.misc@gmail.com>
Date: Tue, 14 Mar 2023 15:15:00 -0400
Subject: [PATCH 5/9] Update notification.njk

Default to using html if 'titleType' and 'messageType' are null
---
 modules/default/alert/templates/notification.njk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/default/alert/templates/notification.njk b/modules/default/alert/templates/notification.njk
index 1594ad4866..3f2cae81e6 100644
--- a/modules/default/alert/templates/notification.njk
+++ b/modules/default/alert/templates/notification.njk
@@ -1,9 +1,9 @@
 {% if title %}
-  <span class="thin dimmed medium">{{ title if titleType == 'text' else title | safe }}</span>
+  <span class="thin dimmed medium">{{ title | safe if (titleType == null || titleType == 'html') else title }}</span>
 {% endif %}
 {% if message %}
   {% if title %}
     <br/>
   {% endif %}
-  <span class="light bright small">{{ message if messageType == 'text' else message | safe }}</span>
+  <span class="light bright small">{{ message | safe if (messageType == null || messageType == 'text') else message }}</span>
 {% endif %}

From 2b2a67a6d2dae6d0fbd82cbb159dad8a2b3c82cb Mon Sep 17 00:00:00 2001
From: Nicholas Fogal <nfogal.misc@gmail.com>
Date: Tue, 14 Mar 2023 15:42:26 -0400
Subject: [PATCH 6/9] Update alert.njk

Change '|' to use 'or'
---
 modules/default/alert/templates/alert.njk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/default/alert/templates/alert.njk b/modules/default/alert/templates/alert.njk
index c293567c0c..d2df89f78d 100644
--- a/modules/default/alert/templates/alert.njk
+++ b/modules/default/alert/templates/alert.njk
@@ -8,11 +8,11 @@
   <br/>
 {% endif %}
 {% if title %}
-  <span class="thin dimmed medium">{{ title | safe if (titleType == null || titleType == 'html') else title }}</span>
+  <span class="thin dimmed medium">{{ title | safe if (titleType == null or titleType == 'html') else title }}</span>
 {% endif %}
 {% if message %}
   {% if title %}
     <br/>
   {% endif %}
-  <span class="light bright small">{{ message | safe if (messageType == null || messageType == 'html') else message }}</span>
+  <span class="light bright small">{{ message | safe if (messageType == null or messageType == 'html') else message }}</span>
 {% endif %}

From 6752f00b7d420221d5335285d13a1e63739e667f Mon Sep 17 00:00:00 2001
From: Nicholas Fogal <nfogal.misc@gmail.com>
Date: Tue, 14 Mar 2023 15:42:42 -0400
Subject: [PATCH 7/9] Update notification.njk

Change '|' to use 'or'
---
 modules/default/alert/templates/notification.njk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/default/alert/templates/notification.njk b/modules/default/alert/templates/notification.njk
index 3f2cae81e6..5544a8edc9 100644
--- a/modules/default/alert/templates/notification.njk
+++ b/modules/default/alert/templates/notification.njk
@@ -1,9 +1,9 @@
 {% if title %}
-  <span class="thin dimmed medium">{{ title | safe if (titleType == null || titleType == 'html') else title }}</span>
+  <span class="thin dimmed medium">{{ title | safe if (titleType == null or titleType == 'html') else title }}</span>
 {% endif %}
 {% if message %}
   {% if title %}
     <br/>
   {% endif %}
-  <span class="light bright small">{{ message | safe if (messageType == null || messageType == 'text') else message }}</span>
+  <span class="light bright small">{{ message | safe if (messageType == null or messageType == 'text') else message }}</span>
 {% endif %}

From 60f29ee4e29baa7b060957b12ae56f988028ef93 Mon Sep 17 00:00:00 2001
From: Nicholas Fogal <nfogal.misc@gmail.com>
Date: Tue, 14 Mar 2023 15:47:34 -0400
Subject: [PATCH 8/9] Update alert.njk

Reversing logic to always render HTML unless type is set to 'text'
---
 modules/default/alert/templates/alert.njk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/default/alert/templates/alert.njk b/modules/default/alert/templates/alert.njk
index d2df89f78d..7349a7ae3d 100644
--- a/modules/default/alert/templates/alert.njk
+++ b/modules/default/alert/templates/alert.njk
@@ -8,11 +8,11 @@
   <br/>
 {% endif %}
 {% if title %}
-  <span class="thin dimmed medium">{{ title | safe if (titleType == null or titleType == 'html') else title }}</span>
+  <span class="thin dimmed medium">{{ title if titleType == 'text' else title | safe }}</span>
 {% endif %}
 {% if message %}
   {% if title %}
     <br/>
   {% endif %}
-  <span class="light bright small">{{ message | safe if (messageType == null or messageType == 'html') else message }}</span>
+  <span class="light bright small">{{ message if messageType == 'text' else message | safe }}</span>
 {% endif %}

From e0dacb11a77abfdfea458e3bc6ab2a00956b5191 Mon Sep 17 00:00:00 2001
From: Nicholas Fogal <nfogal.misc@gmail.com>
Date: Tue, 14 Mar 2023 15:48:20 -0400
Subject: [PATCH 9/9] Update notification.njk

Reversing logic to always render HTML unless type is set to 'text'
---
 modules/default/alert/templates/notification.njk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/default/alert/templates/notification.njk b/modules/default/alert/templates/notification.njk
index 5544a8edc9..1594ad4866 100644
--- a/modules/default/alert/templates/notification.njk
+++ b/modules/default/alert/templates/notification.njk
@@ -1,9 +1,9 @@
 {% if title %}
-  <span class="thin dimmed medium">{{ title | safe if (titleType == null or titleType == 'html') else title }}</span>
+  <span class="thin dimmed medium">{{ title if titleType == 'text' else title | safe }}</span>
 {% endif %}
 {% if message %}
   {% if title %}
     <br/>
   {% endif %}
-  <span class="light bright small">{{ message | safe if (messageType == null or messageType == 'text') else message }}</span>
+  <span class="light bright small">{{ message if messageType == 'text' else message | safe }}</span>
 {% endif %}