diff options
| author | Kristian Aune <kkraune@users.noreply.github.com> | 2022-12-20 18:20:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-20 18:20:51 +0100 |
| commit | 30765dc8f24708e7d54b5544dc1947e18d656117 (patch) | |
| tree | 928b5d0837da59613dbb5a695cb4ecacb28d7c8d /controller-server | |
| parent | 3226a1a406482da5354e0ea0d69425c8303cc588 (diff) | |
| parent | 79b8d5c7587d8f4727686029c53f07afa1ec177b (diff) | |
Merge pull request #25305 from vespa-engine/ogronnesby/notification-tweaks
Small notification tweaks
Diffstat (limited to 'controller-server')
3 files changed, 7 insertions, 11 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/Notifier.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/Notifier.java index 5d0e71b0727..aeae65ad9d2 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/Notifier.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/Notifier.java @@ -136,7 +136,7 @@ public class Notifier { .replace("[[NOTIFICATION_HEADER]]", content.messagePrefix()) .replace("[[NOTIFICATION_ITEMS]]", notification.messages().stream() .map(Notifier::linkify) - .map(m -> "<li>" + m + "</li>") + .map(m -> "<p>" + m + "</p>") .collect(Collectors.joining())) .replace("[[LINK_TO_NOTIFICATION]]", notificationLink(notification.source())) .replace("[[LINK_TO_ACCOUNT_NOTIFICATIONS]]", accountNotificationsUri(content.notification().source().tenant())) diff --git a/controller-server/src/main/resources/mail/mail-notification.tmpl b/controller-server/src/main/resources/mail/mail-notification.tmpl index 8c02c05723f..5bf5530b433 100644 --- a/controller-server/src/main/resources/mail/mail-notification.tmpl +++ b/controller-server/src/main/resources/mail/mail-notification.tmpl @@ -414,7 +414,7 @@ line-height: 32px; " > - Vespa cloud notifications + Vespa Cloud Notifications </h1> </div> </td> @@ -443,11 +443,9 @@ " > <p> - [[NOTIFICATION_HEADER]] + [[NOTIFICATION_HEADER]]: </p> - <ul> - [[NOTIFICATION_ITEMS]] - </ul> + [[NOTIFICATION_ITEMS]] </div> </td> </tr> diff --git a/controller-server/src/test/resources/mail/notification.txt b/controller-server/src/test/resources/mail/notification.txt index 9f1583d7674..946d9c5fd68 100644 --- a/controller-server/src/test/resources/mail/notification.txt +++ b/controller-server/src/test/resources/mail/notification.txt @@ -414,7 +414,7 @@ line-height: 32px; " > - Vespa cloud notifications + Vespa Cloud Notifications </h1> </div> </td> @@ -443,11 +443,9 @@ " > <p> - There are problems with tests for default.default + There are problems with tests for default.default: </p> - <ul> - <li>test package has production tests, but no production tests are declared in deployment.xml</li><li>see <a href="https://docs.vespa.ai/en/testing.html">https://docs.vespa.ai/en/testing.html</a> for details on how to write system tests for Vespa</li> - </ul> + <p>test package has production tests, but no production tests are declared in deployment.xml</p><p>see <a href="https://docs.vespa.ai/en/testing.html">https://docs.vespa.ai/en/testing.html</a> for details on how to write system tests for Vespa</p> </div> </td> </tr> |